Skip to content

Commit 601eef0

Browse files
rstoenescurstoenescu
committed
refactor: "default-selection" -> "default-value" for consistency
1 parent 1ccdf3c commit 601eef0

File tree

10 files changed

+31
-31
lines changed

10 files changed

+31
-31
lines changed

‎dev/components/form/all.vue‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<div>
3-
<div class="layout-padding column" style="height: 100vh;" :class="dark ? 'text-orange bg-grey-8' : null">
3+
<div class="layout-padding column" style="height: 100vh;" :class="dark ? 'text-orange bg-black' : null">
44
<div class="col-auto">
55
<q-checkbox toggleIndeterminate :dark="dark" v-model="dark" label="Dark mode" />
66
<q-toggle :dark="dark" v-model="disable" label="Disabled" />
@@ -154,8 +154,8 @@
154154
<p class="q-subtitle">Color selected: {{ JSON.stringify(color) }}</p>
155155
<q-color :dark="dark" :disable="disable" :readonly="readonly" :clearable="clearable" class="q-ma-sm" @change="onChange" @input="onInput" @clear="onClear" v-model="color" float-label="Color (RGBA)" type="rgba" />
156156
<q-color :dark="dark" :color="dark === false ? 'white' : 'primary'" :disable="disable" :readonly="readonly" inverted :clearable="clearable" class="q-ma-sm" @change="val => { color = val; onChange(val) }" @input="onInput" @clear="onClear" :value="color" float-label="Color (onChange)" />
157-
<q-color :dark="dark" :disable="disable" :readonly="readonly" :clearable="clearable" class="q-ma-sm" @change="onChange" @input="onInput" @clear="onClear" v-model="color" :default-selection="defaultColor" :float-label="`Color (default ${defaultColor})`" />
158-
<q-color :dark="dark" :color="dark === false ? 'white' : 'primary'" :disable="disable" :readonly="readonly" inverted :clearable="clearable" class="q-ma-sm" @change="val => { color = val; onChange(val) }" @input="onInput" @clear="onClear" :value="color" :default-selection="defaultColor" :float-label="`Color (default ${defaultColor}, onChange)`" />
157+
<q-color :dark="dark" :disable="disable" :readonly="readonly" :clearable="clearable" class="q-ma-sm" @change="onChange" @input="onInput" @clear="onClear" v-model="color" :default-value="defaultColor" :float-label="`Color (default ${defaultColor})`" />
158+
<q-color :dark="dark" :color="dark === false ? 'white' : 'primary'" :disable="disable" :readonly="readonly" inverted :clearable="clearable" class="q-ma-sm" @change="val => { color = val; onChange(val) }" @input="onInput" @clear="onClear" :value="color" :default-value="defaultColor" :float-label="`Color (default ${defaultColor}, onChange)`" />
159159

160160
<p class="q-subtitle">Color selected: {{ JSON.stringify(colorP) }}</p>
161161
<div class="row gutter-sm">
@@ -169,19 +169,19 @@
169169
</div>
170170
<div>
171171
<div>Color (default {{defaultColor}})</div>
172-
<q-color-picker :dark="dark" :disable="disable" :readonly="readonly" @change="onChange" @input="onInput" @clear="onClear" v-model="colorP" :default-selection="defaultColor" />
172+
<q-color-picker :dark="dark" :disable="disable" :readonly="readonly" @change="onChange" @input="onInput" @clear="onClear" v-model="colorP" :default-value="defaultColor" />
173173
</div>
174174
<div>
175175
<div>Color (default {{defaultColor}}, onChange)</div>
176-
<q-color-picker :dark="dark" :disable="disable" :readonly="readonly" @change="val => { colorP = val; onChange(val) }" @input="onInput" @clear="onClear" :value="colorP" :default-selection="defaultColor" />
176+
<q-color-picker :dark="dark" :disable="disable" :readonly="readonly" @change="val => { colorP = val; onChange(val) }" @input="onInput" @clear="onClear" :value="colorP" :default-value="defaultColor" />
177177
</div>
178178
</div>
179179

180180
<p class="q-subtitle">Date selected: {{ JSON.stringify(date) }}</p>
181181
<q-datetime :dark="dark" :disable="disable" :readonly="readonly" type="date" formatModel="date" :clearable="clearable" class="q-ma-sm" @change="onChange" @input="onInput" @clear="onClear" v-model="date" float-label="Date" />
182182
<q-datetime :dark="dark" :color="dark === false ? 'white' : 'primary'" :disable="disable" :readonly="readonly" type="date" formatModel="date" inverted :clearable="clearable" class="q-ma-sm" @change="val => { date = val; onChange(val) }" @input="onInput" @clear="onClear" :value="date" float-label="Date (onChange)" />
183-
<q-datetime :dark="dark" :disable="disable" :readonly="readonly" type="date" formatModel="date" :clearable="clearable" class="q-ma-sm" @change="onChange" @input="onInput" @clear="onClear" v-model="date" :default-selection="defaultDate" :float-label="`Date (default ${defaultDate})`" />
184-
<q-datetime :dark="dark" :color="dark === false ? 'white' : 'orange'" :disable="disable" :readonly="readonly" type="datetime" formatModel="date" inverted :clearable="clearable" class="q-ma-sm" @change="val => { date = val; onChange(val) }" @input="onInput" @clear="onClear" :value="date" :default-selection="defaultDate" :float-label="`Datetime (default ${defaultDate}, onChange)`" />
183+
<q-datetime :dark="dark" :disable="disable" :readonly="readonly" type="date" formatModel="date" :clearable="clearable" class="q-ma-sm" @change="onChange" @input="onInput" @clear="onClear" v-model="date" :default-value="defaultDate" :float-label="`Date (default ${defaultDate})`" />
184+
<q-datetime :dark="dark" :color="dark === false ? 'white' : 'orange'" :disable="disable" :readonly="readonly" type="datetime" formatModel="date" inverted :clearable="clearable" class="q-ma-sm" @change="val => { date = val; onChange(val) }" @input="onInput" @clear="onClear" :value="date" :default-value="defaultDate" :float-label="`Datetime (default ${defaultDate}, onChange)`" />
185185

186186
<p class="q-subtitle">Date selected: {{ JSON.stringify(date) }}</p>
187187
<div class="row gutter-sm">
@@ -195,11 +195,11 @@
195195
</div>
196196
<div>
197197
<div>Date (default {{defaultDate}})</div>
198-
<q-datetime-picker :dark="dark" color="secondary" :disable="disable" :readonly="readonly" type="date" formatModel="date" @change="onChange" @input="onInput" @clear="onClear" v-model="date" :default-selection="defaultDate" />
198+
<q-datetime-picker :dark="dark" color="secondary" :disable="disable" :readonly="readonly" type="date" formatModel="date" @change="onChange" @input="onInput" @clear="onClear" v-model="date" :default-value="defaultDate" />
199199
</div>
200200
<div>
201201
<div>Date (default {{defaultDate}}, onChange)</div>
202-
<q-datetime-picker :dark="dark" color="dark" :disable="disable" :readonly="readonly" type="date" formatModel="date" @change="val => { date = val; onChange(val) }" @input="onInput" @clear="onClear" :value="date" :default-selection="defaultDate" />
202+
<q-datetime-picker :dark="dark" color="dark" :disable="disable" :readonly="readonly" type="date" formatModel="date" @change="val => { date = val; onChange(val) }" @input="onInput" @clear="onClear" :value="date" :default-value="defaultDate" />
203203
</div>
204204
<div>
205205
<div>Datetime</div>

‎dev/components/form/color-picker.vue‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
<p>Immediate</p>
77
<q-color v-model="inputModelRgb" stack-label="simple" />
88
<q-color v-model="inputModelRgb" clearable stack-label="clearable" />
9-
<q-color v-model="inputModelRgb" default-selection="#ccc" stack-label="default-selection" />
10-
<q-color v-model="inputModelRgb" default-selection="#ccc" clearable stack-label="default-selection, clearable" />
9+
<q-color v-model="inputModelRgb" default-value="#ccc" stack-label="default-value" />
10+
<q-color v-model="inputModelRgb" default-value="#ccc" clearable stack-label="default-value, clearable" />
1111
<p>Lazy</p>
1212
<q-color :value="inputModelRgb" @change="val => inputModelRgb = val" stack-label="simple" />
1313
<q-color :value="inputModelRgb" @change="val => inputModelRgb = val" clearable stack-label="clearable" />
14-
<q-color :value="inputModelRgb" @change="val => inputModelRgb = val" default-selection="#ccc" stack-label="default-selection" />
15-
<q-color :value="inputModelRgb" @change="val => inputModelRgb = val" default-selection="#ccc" clearable stack-label="default-selection, clearable" />
14+
<q-color :value="inputModelRgb" @change="val => inputModelRgb = val" default-value="#ccc" stack-label="default-value" />
15+
<q-color :value="inputModelRgb" @change="val => inputModelRgb = val" default-value="#ccc" clearable stack-label="default-value, clearable" />
1616

1717
<br><br>
1818
<q-btn color="primary" label="Set to yellow" @click="setToYellow"/>
@@ -61,7 +61,7 @@
6161
</div>
6262

6363
<h4>Input</h4>
64-
<q-color v-model="inputModelHex" clearable default-selection="#ffffff" @input="value => log('@input', value)" @change="value => log('@change', value)" />
64+
<q-color v-model="inputModelHex" clearable default-value="#ffffff" @input="value => log('@input', value)" @change="value => log('@change', value)" />
6565
<q-color v-model="inputModelHex" inverted readonly float-label="Readonly" />
6666
<q-color v-model="inputModelRgb" float-label="RGB" />
6767
<q-color v-model="inputModelRgb" inverted disable float-label="Disable" />

‎dev/components/form/datetime.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@
9191
<q-datetime @change="value => log('@change', value)" v-model="model" type="datetime" />
9292

9393
<p class="caption">Default Selection</p>
94-
<q-datetime v-model="model" :default-selection="defaultSelection" type="datetime" />
95-
<q-datetime v-model="model" :default-selection="defaultSelection" type="time" />
94+
<q-datetime v-model="model" :default-value="defaultValue" type="datetime" />
95+
<q-datetime v-model="model" :default-value="defaultValue" type="time" />
9696

9797
<p class="caption">With explicit popover</p>
9898
<q-datetime v-model="model" popover type="date" float-label="Pick Date" />
@@ -219,7 +219,7 @@ export default {
219219
model: undefined,
220220
modelVar: undefined,
221221
// model: 0,
222-
defaultSelection: '2016-09-18T10:45:00.000Z',
222+
defaultValue: '2016-09-18T10:45:00.000Z',
223223
224224
format: 'MMMM D, YYYY [at] h:mm [[]a[\\]]',
225225

‎src/components/color/QColor.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export default {
3333
type: String,
3434
default: 'primary'
3535
},
36-
defaultSelection: {
36+
defaultValue: {
3737
type: [String, Object],
3838
default: null
3939
},
@@ -52,7 +52,7 @@ export default {
5252
transition: __THEME__ === 'ios' ? 'q-modal-bottom' : 'q-modal'
5353
}
5454
data.focused = false
55-
data.model = clone(this.value || this.defaultSelection)
55+
data.model = clone(this.value || this.defaultValue)
5656
return data
5757
},
5858
computed: {
@@ -78,7 +78,7 @@ export default {
7878
show () {
7979
if (!this.disable) {
8080
if (!this.focused) {
81-
this.__setModel(this.value || this.defaultSelection)
81+
this.__setModel(this.value || this.defaultValue)
8282
}
8383
return this.$refs.popup.show()
8484
}
@@ -104,7 +104,7 @@ export default {
104104
if (this.disable || this.focused) {
105105
return
106106
}
107-
this.__setModel(this.value || this.defaultSelection)
107+
this.__setModel(this.value || this.defaultValue)
108108
this.focused = true
109109
this.$emit('focus')
110110
},

‎src/components/color/QColorPicker.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export default {
1616
},
1717
props: {
1818
value: [String, Object],
19-
defaultSelection: {
19+
defaultValue: {
2020
type: [String, Object],
2121
default: '#000'
2222
},
@@ -32,7 +32,7 @@ export default {
3232
data () {
3333
return {
3434
view: !this.value || typeof this.value === 'string' ? 'hex' : 'rgb',
35-
model: this.__parseModel(this.value || this.defaultSelection),
35+
model: this.__parseModel(this.value || this.defaultValue),
3636
inputError: {
3737
hex: false,
3838
r: false,
@@ -44,7 +44,7 @@ export default {
4444
watch: {
4545
value: {
4646
handler (v) {
47-
const model = this.__parseModel(v || this.defaultSelection)
47+
const model = this.__parseModel(v || this.defaultValue)
4848
if (model.hex !== this.model.hex) {
4949
this.model = model
5050
}

‎src/components/datetime/QDatetime.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export default {
3535
transition: __THEME__ === 'ios' ? 'q-modal-bottom' : 'q-modal'
3636
}
3737
data.focused = false
38-
data.model = clone(isValid(this.value) ? this.value : this.defaultSelection)
38+
data.model = clone(isValid(this.value) ? this.value : this.defaultValue)
3939
return data
4040
},
4141
computed: {
@@ -72,7 +72,7 @@ export default {
7272
show () {
7373
if (!this.disable) {
7474
if (!this.focused) {
75-
this.__setModel(isValid(this.value) ? this.value : this.defaultSelection)
75+
this.__setModel(isValid(this.value) ? this.value : this.defaultValue)
7676
}
7777
return this.$refs.popup.show()
7878
}
@@ -107,7 +107,7 @@ export default {
107107
target.__scrollView()
108108
}
109109
}
110-
this.__setModel(isValid(this.value) ? this.value : this.defaultSelection)
110+
this.__setModel(isValid(this.value) ? this.value : this.defaultValue)
111111
this.focused = true
112112
this.$emit('focus')
113113
},

‎src/components/datetime/QDatetimePicker.ios.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ export default {
105105
TouchPan
106106
},
107107
props: {
108-
defaultSelection: [String, Number, Date],
108+
defaultValue: [String, Number, Date],
109109
disable: Boolean,
110110
readonly: Boolean
111111
},

‎src/components/datetime/QDatetimePicker.mat.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ export default {
251251
name: 'q-datetime-picker',
252252
mixins: [DateMixin, FieldParentMixin],
253253
props: {
254-
defaultSelection: [String, Number, Date],
254+
defaultValue: [String, Number, Date],
255255
disable: Boolean,
256256
readonly: Boolean
257257
},

‎src/components/datetime/datetime-mixin.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export default {
1616
get () {
1717
let date = isValid(this.value)
1818
? new Date(this.value)
19-
: (this.defaultSelection ? new Date(this.defaultSelection) : startOfDate(new Date(), 'day'))
19+
: (this.defaultValue ? new Date(this.defaultValue) : startOfDate(new Date(), 'day'))
2020

2121
return getDateBetween(
2222
date,

‎src/components/datetime/datetime-props.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export const inline = {
1414
validator: modelValidator,
1515
required: true
1616
},
17-
defaultSelection: {
17+
defaultValue: {
1818
type: [String, Number, Date],
1919
default: null
2020
},

0 commit comments

Comments
 (0)