Improve mdRipple detection

This commit is contained in:
Marcos Moura 2016-07-18 23:58:38 -03:00
parent 5e7e5aeea1
commit 3678f59264
2 changed files with 7 additions and 3 deletions

View file

@ -15,6 +15,7 @@
"lint": "eslint --ext .js,.vue src test/unit/specs test/e2e/specs"
},
"dependencies": {
"scopedQuerySelectorShim": "github:lazd/scopedQuerySelectorShim",
"vue": "^1.0.26"
},
"devDependencies": {

View file

@ -1,3 +1,4 @@
import 'scopedQuerySelectorShim/dist/scopedQuerySelectorShim';
import './mdInkRipple.vue';
export default function install(Vue) {
@ -8,7 +9,7 @@ export default function install(Vue) {
let registeredMouseFunction;
let unregisterMouseEvent = (element) => {
let ripple = element.querySelector('.' + rippleParentClass);
let ripple = element.querySelector(':scope > .' + rippleParentClass);
if (ripple) {
ripple.parentNode.removeChild(ripple);
@ -19,7 +20,9 @@ export default function install(Vue) {
let registerMouseEvent = (element, holder) => {
Vue.nextTick(() => {
let rect = holder.getBoundingClientRect();
let ripple = holder.querySelector('.' + rippleClass);
let ripple = holder.querySelector(':scope > .' + rippleParentClass + '> .' + rippleClass);
window.a = holder;
if (ripple) {
registeredMouseFunction = (event) => {
@ -77,7 +80,7 @@ export default function install(Vue) {
let createRipple = (element) => {
Vue.nextTick(() => {
let holder = getParentWithPositionRelatve(element);
let ripple = holder.querySelector('.' + rippleClass);
let ripple = holder.querySelector(':scope > .' + rippleParentClass + '> .' + rippleClass);
if (!ripple) {
let elementSize = Math.round(Math.max(holder.offsetWidth, holder.offsetHeight)) + 'px';