mirror of
https://github.com/Hopiu/vue-material.git
synced 2026-05-24 23:03:45 +00:00
Merge remote-tracking branch 'origin/master' into develop
* origin/master: Add extra line between rules remove dotted outline around button pass on DOM event for checkbox and radio
This commit is contained in:
commit
a37630184d
3 changed files with 11 additions and 7 deletions
|
|
@ -43,6 +43,10 @@ $button-icon-size: 40px;
|
|||
&:focus {
|
||||
outline: none;
|
||||
}
|
||||
|
||||
&::-moz-focus-inner {
|
||||
border:0;
|
||||
}
|
||||
|
||||
&:hover {
|
||||
&:not([disabled]) {
|
||||
|
|
|
|||
|
|
@ -39,11 +39,11 @@
|
|||
}
|
||||
},
|
||||
methods: {
|
||||
toggleCheck() {
|
||||
toggleCheck($event) {
|
||||
if (!this.disabled) {
|
||||
this.checked = !this.checked;
|
||||
this.$emit('change', this.checked);
|
||||
this.$emit('input', this.checked);
|
||||
this.$emit('change', this.checked, $event);
|
||||
this.$emit('input', this.checked, $event);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<template>
|
||||
<div class="md-radio" :class="classes">
|
||||
<div class="md-radio-container" @click="toggleCheck" v-md-ink-ripple="disabled">
|
||||
<div class="md-radio-container" @click="toggleCheck($event)" v-md-ink-ripple="disabled">
|
||||
<input type="radio" :name="name" :id="id" :disabled="disabled" :value="value">
|
||||
</div>
|
||||
|
||||
|
|
@ -33,10 +33,10 @@
|
|||
}
|
||||
},
|
||||
methods: {
|
||||
toggleCheck() {
|
||||
toggleCheck($event) {
|
||||
if (!this.disabled) {
|
||||
this.$emit('change', this.mdValue);
|
||||
this.$emit('input', this.mdValue);
|
||||
this.$emit('change', this.mdValue, $event);
|
||||
this.$emit('input', this.mdValue, $event);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue