Skip to content

Commit 4a018ce

Browse files
committed
refactor: [vue2] Coerce
1 parent 474d6e3 commit 4a018ce

File tree

15 files changed

+37
-57
lines changed

15 files changed

+37
-57
lines changed

src/vue-components/context-menu/context-menu-desktop.vue

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ export default {
1313
props: {
1414
disable: {
1515
type: Boolean,
16-
default: false,
17-
coerce: Boolean
16+
default: false
1817
}
1918
},
2019
methods: {

src/vue-components/context-menu/context-menu-mobile.vue

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ export default {
1616
props: {
1717
disable: {
1818
type: Boolean,
19-
default: false,
20-
coerce: Boolean
19+
default: false
2120
}
2221
},
2322
methods: {

src/vue-components/datetime/input-datetime-desktop.vue

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ export default {
3838
},
3939
disable: {
4040
type: Boolean,
41-
default: false,
42-
coerce: Boolean
41+
default: false
4342
}
4443
},
4544
computed: {

src/vue-components/datetime/input-datetime-mobile.vue

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@ export default {
3535
},
3636
disable: {
3737
type: Boolean,
38-
default: false,
39-
coerce: Boolean
38+
default: false
4039
}
4140
},
4241
computed: {

src/vue-components/datetime/ios-inline-datetime.vue

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,7 @@ export default {
132132
},
133133
disable: {
134134
type: Boolean,
135-
default: false,
136-
coerce: Boolean
135+
default: false
137136
}
138137
},
139138
data () {

src/vue-components/datetime/mat-inline-datetime.vue

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,8 +217,7 @@ export default {
217217
},
218218
disable: {
219219
type: Boolean,
220-
default: false,
221-
coerce: Boolean
220+
default: false
222221
}
223222
},
224223
data () {

src/vue-components/drawer/drawer.vue

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,13 +79,11 @@ export default {
7979
props: {
8080
'right-side': {
8181
type: Boolean,
82-
default: false,
83-
coerce: Boolean
82+
default: false
8483
},
8584
'swipe-only': {
8685
type: Boolean,
87-
default: false,
88-
coerce: Boolean
86+
default: false
8987
}
9088
},
9189
data () {

src/vue-components/fab/fab.vue

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
:class="{opened: opened, 'with-backdrop': click || backdrop}"
55
>
66
<div v-if="click || backdrop" class="backdrop" @click="toggle(true)"></div>
7-
<button class="circular raised" @click="toggle()" :class="type">
7+
<button class="circular raised" @click="toggle()" :class="className">
88
<i class="quasar-fab-icon">{{icon}}</i>
99
<i class="quasar-fab-active-icon">{{activeIcon}}</i>
1010
</button>
@@ -21,9 +21,6 @@ export default {
2121
type: Array,
2222
default () {
2323
return ['primary']
24-
},
25-
coerce (value) {
26-
return Array.isArray(value) || typeof value === 'undefined' ? value : value.split(' ')
2724
}
2825
},
2926
icon: {
@@ -38,19 +35,19 @@ export default {
3835
type: String,
3936
default: 'right'
4037
},
41-
click: {
42-
type: Function
43-
},
44-
backdrop: {
45-
type: Boolean,
46-
coerce: Boolean
47-
}
38+
click: Function.
39+
backdrop: Boolean
4840
},
4941
data () {
5042
return {
5143
opened: false
5244
}
5345
},
46+
computed: {
47+
className () {
48+
return Array.isArray(this.type) || typeof this.type === 'undefined' ? this.type : this.type.split(' ')
49+
}
50+
},
5451
methods: {
5552
toggle (fromBackdrop) {
5653
this.opened = !this.opened

src/vue-components/grid/grid.vue

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
<quasar-grid-table
33
ref="table"
44
class="quasar-grid"
5-
:data="data | gridShowSelected showOnlySelected selectionMode singleSelection | filterBy searchQuery"
5+
:data="data | gridShowSelected showOnlySelected computedSelectionMode singleSelection | filterBy searchQuery"
66
:columns="columns"
77
:rows-per-page="rowsPerPage"
88
:sortable="sortable"
9-
:selection-mode="selectionMode"
9+
:selection-mode="computedSelectionMode"
1010
:selection-actions="selectionActions"
1111
:no-data-label="noDataLabel"
1212
:id-property="idProperty"
@@ -30,8 +30,7 @@ export default {
3030
},
3131
sortable: {
3232
type: Boolean,
33-
default: true,
34-
coerce: Boolean
33+
default: true
3534
},
3635
noDataLabel: {
3736
type: String,
@@ -40,13 +39,16 @@ export default {
4039
idProperty: String,
4140
selectionMode: {
4241
type: String,
43-
default: 'none',
44-
coerce: value => {
45-
return value === 'single' || value === 'multiple' ? value : 'none'
46-
}
42+
default: 'none'
4743
},
4844
selectionActions: Array
4945
},
46+
computed: {
47+
computedSelectionMode () {
48+
let value = this.selectionMode
49+
return value === 'single' || value === 'multiple' ? value : 'none'
50+
}
51+
},
5052
data () {
5153
return {
5254
searchQuery: '',

src/vue-components/knob/knob.vue

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,7 @@ export default {
5050
},
5151
disable: {
5252
type: Boolean,
53-
default: false,
54-
coerce: Boolean
53+
default: false
5554
},
5655
min: {
5756
type: Number,

0 commit comments

Comments
 (0)