Skip to content

Commit dc243cd

Browse files
committed
fix: QRadio issueing @change two times instead of once
1 parent 760b7e1 commit dc243cd

File tree

4 files changed

+8
-21
lines changed

4 files changed

+8
-21
lines changed

dev/components/form/checkbox.vue

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -87,15 +87,15 @@
8787
<q-list link>
8888
<q-item tag="label">
8989
<q-item-side>
90-
<q-checkbox v-model="checked"></q-checkbox>
90+
<q-checkbox @change="onChange" v-model="checked"></q-checkbox>
9191
</q-item-side>
9292
<q-item-main>
9393
<q-item-tile title>Notification</q-item-tile>
9494
</q-item-main>
9595
</q-item>
9696
<q-item tag="label">
9797
<q-item-side>
98-
<q-checkbox v-model="checked"></q-checkbox>
98+
<q-checkbox @change="onChange" v-model="checked"></q-checkbox>
9999
</q-item-side>
100100
<q-item-main>
101101
<q-item-tile label>Notification</q-item-tile>
@@ -104,7 +104,7 @@
104104
</q-item>
105105
<q-item tag="label">
106106
<q-item-side>
107-
<q-checkbox v-model="checked"></q-checkbox>
107+
<q-checkbox @change="onChange" v-model="checked"></q-checkbox>
108108
</q-item-side>
109109
<q-item-main>
110110
<q-item-tile label>Notification</q-item-tile>
@@ -113,14 +113,6 @@
113113
</q-item>
114114
</q-list>
115115
</div>
116-
<input type="checkbox" id="jack" value="Jack" v-model="checkedNames">
117-
<label for="jack">Jack</label>
118-
<input type="checkbox" id="john" value="John" v-model="checkedNames">
119-
<label for="john">John</label>
120-
<input type="checkbox" id="mike" value="Mike" v-model="checkedNames" style="width:100px;height:100px;">
121-
<label for="mike">Mike</label>
122-
<br>
123-
<span>Checked names: {{ checkedNames }}</span>
124116
</div>
125117
</template>
126118

@@ -130,8 +122,7 @@ export default {
130122
return {
131123
checked: true,
132124
group: ['op2'],
133-
selection: ['one', 'two', 'three'],
134-
checkedNames: []
125+
selection: ['one', 'two', 'three']
135126
}
136127
},
137128
methods: {

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
"parse5": "^2.1.0",
7777
"postcss-loader": "^1.0.0",
7878
"progress-bar-webpack-plugin": "^1.9.0",
79-
"quasar-extras": "0.0.1",
79+
"quasar-extras": "0.x",
8080
"raw-loader": "^0.5.1",
8181
"rollup": "^0.41.4",
8282
"rollup-plugin-babel": "^2.6.1",
@@ -102,6 +102,6 @@
102102
},
103103
"peerDependencies": {
104104
"vue": "^2.3.0",
105-
"quasar-extras": "^0.0.1"
105+
"quasar-extras": "0.x"
106106
}
107107
}

src/components/radio/QRadio.vue

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ export default {
6666
set (val) {
6767
if (val !== this.value) {
6868
this.$emit('input', val)
69-
this.__onChange(val)
7069
}
7170
}
7271
},
@@ -86,10 +85,7 @@ export default {
8685
}
8786
},
8887
__change (e) {
89-
if (this.model !== this.val) {
90-
this.__onChange(this.val)
91-
this.model = this.val
92-
}
88+
this.__onChange(this.value)
9389
},
9490
__onChange (val) {
9591
const ref = this.$refs.ripple

src/themes/core/ripples.styl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,5 +59,5 @@
5959

6060
&.active:after
6161
transform scale(0, 0)
62-
opacity .5
62+
opacity .4
6363
transition 0s

0 commit comments

Comments
 (0)