From 628fa735be22f3c60d06bbb098f45509d40dbe75 Mon Sep 17 00:00:00 2001 From: Gianluca Romeo Date: Tue, 22 Sep 2020 08:16:18 +0100 Subject: [PATCH 1/2] Improved touch/mousedown detection to work with shadow dom --- src/js/waves.js | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/src/js/waves.js b/src/js/waves.js index a528981..b3399ca 100644 --- a/src/js/waves.js +++ b/src/js/waves.js @@ -369,18 +369,29 @@ return null; } - var element = null; - var target = e.target || e.srcElement; + if (e.composedPath) { - while (target.parentElement) { - if ( (!(target instanceof SVGElement)) && target.classList.contains('waves-effect')) { - element = target; - break; + for (const el of e.composedPath()) { + if ((!(el instanceof SVGElement)) && el.classList.contains('waves-effect')) return el; } - target = target.parentElement; - } - return element; + return null; + + } else { + + var element = null; + var target = e.target || e.srcElement; + + while (target.parentElement) { + if ( (!(target instanceof SVGElement)) && target.classList.contains('waves-effect')) { + element = target; + break; + } + target = target.parentElement; + } + + return element; + } } /** From b10b51c843877e5bb30ccf54c179381a940e8fcf Mon Sep 17 00:00:00 2001 From: Gianluca Romeo Date: Tue, 22 Sep 2020 17:02:26 +0100 Subject: [PATCH 2/2] Another useless commit message --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 030e3cd..dce1988 100644 --- a/package.json +++ b/package.json @@ -7,15 +7,15 @@ "main": "src/js/waves.js", "types": "src/typings/waves.d.ts", "devDependencies": { - "grunt": "1.1.0", + "grunt": "1.3.0", "grunt-contrib-clean": "2.0.0", "grunt-contrib-concat": "1.0.1", "grunt-contrib-copy": "1.0.0", "grunt-contrib-cssmin": "3.0.0", "grunt-contrib-jshint": "2.1.0", "grunt-contrib-less": "2.0.0", - "grunt-contrib-sass": "1.0.0", - "grunt-contrib-uglify": "4.0.1", + "grunt-contrib-sass": "2.0.0", + "grunt-contrib-uglify": "5.0.0", "grunt-contrib-watch": "1.1.0", "grunt-sass-convert": "0.3.0" },