Skip to content

Commit dd50534

Browse files
committed
Fix duplicate color picker saveColor method
1 parent 7f61a5e commit dd50534

1 file changed

Lines changed: 16 additions & 17 deletions

File tree

lib/vue/src/components/input/CInputColorPicker.vue

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,10 @@
4848
/>
4949
</svg>
5050
</b-button>
51-
<span v-if="showText" class="ml-2">
51+
<span
52+
v-if="showText"
53+
class="ml-2"
54+
>
5255
{{ value }}
5356
</span>
5457
</div>
@@ -147,16 +150,17 @@ export default {
147150
148151
translations: {
149152
type: Object,
153+
default: () => ({}),
150154
},
151155
152156
width: {
153157
type: String,
154-
default: "32px",
158+
default: '32px',
155159
},
156160
157161
height: {
158162
type: String,
159-
default: "32px",
163+
default: '32px',
160164
},
161165
162166
showText: {
@@ -166,7 +170,7 @@ export default {
166170
167171
themeSettings: {
168172
type: Array,
169-
default: [],
173+
default: () => [],
170174
},
171175
172176
themeVariables: {
@@ -205,7 +209,7 @@ export default {
205209
label: 'Extra light',
206210
},
207211
],
208-
}
212+
},
209213
},
210214
211215
data () {
@@ -218,13 +222,13 @@ export default {
218222
computed: {
219223
themes () {
220224
return this.themeSettings
221-
.filter((theme) => theme.id !== 'general') // remove general theme
222-
.map((theme) => {
223-
return {
224-
id: theme.id,
225-
values: JSON.parse(theme.values),
226-
}
227-
})
225+
.filter((theme) => theme.id !== 'general') // remove general theme
226+
.map((theme) => {
227+
return {
228+
id: theme.id,
229+
values: JSON.parse(theme.values),
230+
}
231+
})
228232
},
229233
},
230234
@@ -259,11 +263,6 @@ export default {
259263
}
260264
},
261265
262-
saveColor () {
263-
this.$emit('input', this.currentColor || this.value)
264-
this.closeMenu()
265-
},
266-
267266
openMenu () {
268267
this.showModal = true
269268
},

0 commit comments

Comments
 (0)