diff --git a/packages/vuetify/src/components/VDialog/VDialog.js b/packages/vuetify/src/components/VDialog/VDialog.js index a48d010eab2..5648e6285f4 100644 --- a/packages/vuetify/src/components/VDialog/VDialog.js +++ b/packages/vuetify/src/components/VDialog/VDialog.js @@ -203,10 +203,10 @@ export default { 'class': { 'v-dialog__activator--disabled': this.disabled }, - on: { + on: this.disabled ? {} : { click: e => { e.stopPropagation() - if (!this.disabled) this.isActive = !this.isActive + this.isActive = !this.isActive } } }, [this.$slots.activator])) diff --git a/packages/vuetify/src/components/VMenu/mixins/menu-generators.js b/packages/vuetify/src/components/VMenu/mixins/menu-generators.js index c7059005c56..b350cec16c9 100644 --- a/packages/vuetify/src/components/VMenu/mixins/menu-generators.js +++ b/packages/vuetify/src/components/VMenu/mixins/menu-generators.js @@ -14,11 +14,13 @@ export default { on: {} } - if (this.openOnHover) { - options.on['mouseenter'] = this.mouseEnterHandler - options.on['mouseleave'] = this.mouseLeaveHandler - } else if (this.openOnClick) { - options.on['click'] = this.activatorClickHandler + if (!this.disabled) { + if (this.openOnHover) { + options.on['mouseenter'] = this.mouseEnterHandler + options.on['mouseleave'] = this.mouseLeaveHandler + } else if (this.openOnClick) { + options.on['click'] = this.activatorClickHandler + } } return this.$createElement('div', options, this.$slots.activator) diff --git a/packages/vuetify/src/stylus/components/_dialogs.styl b/packages/vuetify/src/stylus/components/_dialogs.styl index e4049231a1a..45aba7aedfc 100644 --- a/packages/vuetify/src/stylus/components/_dialogs.styl +++ b/packages/vuetify/src/stylus/components/_dialogs.styl @@ -33,9 +33,6 @@ * cursor: pointer - &--disabled - pointer-events: none - &__container display: inline-block vertical-align: middle diff --git a/packages/vuetify/src/stylus/components/_menus.styl b/packages/vuetify/src/stylus/components/_menus.styl index 6fe4ec86e1f..55c0083d6e7 100644 --- a/packages/vuetify/src/stylus/components/_menus.styl +++ b/packages/vuetify/src/stylus/components/_menus.styl @@ -17,9 +17,6 @@ * cursor: pointer - &--disabled - pointer-events: none - &__content position: absolute display: inline-block