Skip to content

Commit 6fefae5

Browse files
committed
Merge branch 'dev' of github.com:quasarframework/quasar into dev
2 parents b56a838 + 3b71b46 commit 6fefae5

File tree

82 files changed

+111
-95
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+111
-95
lines changed

ui/src/components/avatar/QAvatar.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ export default Vue.extend({
4848
return h('div', {
4949
staticClass: 'q-avatar',
5050
style: this.sizeStyle,
51-
on: this.qListeners
51+
on: { ...this.qListeners }
5252
}, [
5353
h('div', {
5454
staticClass: 'q-avatar__content row flex-center overflow-hidden',

ui/src/components/badge/QBadge.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ export default Vue.extend({
6262
style: this.style,
6363
class: this.classes,
6464
attrs: this.attrs,
65-
on: this.qListeners
65+
on: { ...this.qListeners }
6666
}, this.label !== void 0 ? [ this.label ] : slot(this, 'default'))
6767
}
6868
})

ui/src/components/banner/QBanner.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ export default Vue.extend({
4646
'rounded-borders': this.rounded
4747
},
4848
attrs,
49-
on: this.qListeners
49+
on: { ...this.qListeners }
5050
}, child)
5151
}
5252
})

ui/src/components/bar/QBar.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export default Vue.extend({
2828
staticClass: 'q-bar row no-wrap items-center',
2929
class: this.classes,
3030
attrs,
31-
on: this.qListeners
31+
on: { ...this.qListeners }
3232
}, slot(this, 'default'))
3333
}
3434
})

ui/src/components/breadcrumbs/QBreadcrumbs.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ export default Vue.extend({
8080

8181
return h('div', {
8282
staticClass: 'q-breadcrumbs',
83-
on: this.qListeners
83+
on: { ...this.qListeners }
8484
}, [
8585
h('div', {
8686
staticClass: 'flex items-center',

ui/src/components/breadcrumbs/QBreadcrumbsEl.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export default Vue.extend({
3232
return h(this.hasRouterLink === true ? 'router-link' : 'span', {
3333
staticClass: 'q-breadcrumbs__el q-link flex inline items-center relative-position',
3434
props: this.hasRouterLink === true ? this.routerLinkProps : null,
35-
[this.hasRouterLink === true ? 'nativeOn' : 'on']: this.qListeners
35+
[this.hasRouterLink === true ? 'nativeOn' : 'on']: { ...this.qListeners }
3636
}, mergeSlot(child, this, 'default'))
3737
}
3838
})

ui/src/components/btn-group/QBtnGroup.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export default Vue.extend({
3333
staticClass: 'q-btn-group row no-wrap ' +
3434
(this.spread === true ? 'q-btn-group--spread' : 'inline'),
3535
class: this.classes,
36-
on: this.qListeners
36+
on: { ...this.qListeners }
3737
}, slot(this, 'default'))
3838
}
3939
})

ui/src/components/btn-toggle/QBtnToggle.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ export default Vue.extend({
135135
glossy: this.glossy,
136136
spread: this.spread
137137
},
138-
on: this.qListeners
138+
on: { ...this.qListeners }
139139
}, child)
140140
}
141141
})

ui/src/components/card/QCard.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export default Vue.extend({
3030
render (h) {
3131
return h(this.tag, {
3232
class: this.classes,
33-
on: this.qListeners
33+
on: { ...this.qListeners }
3434
}, slot(this, 'default'))
3535
}
3636
})

ui/src/components/card/QCardActions.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export default Vue.extend({
2424
return h('div', {
2525
staticClass: 'q-card__actions',
2626
class: this.classes,
27-
on: this.qListeners
27+
on: { ...this.qListeners }
2828
}, slot(this, 'default'))
2929
}
3030
})

0 commit comments

Comments
 (0)