From 7a6cc3b42cea4699d139f46ee0e66477f9a3b321 Mon Sep 17 00:00:00 2001 From: michaelw85 Date: Tue, 12 Nov 2019 11:40:52 +0100 Subject: [PATCH 1/3] fix(event-manager): Firefox shadow dom event handling Return correct original event target for Firefox Closes #765 --- src/event-manager.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/event-manager.js b/src/event-manager.js index 368f0064..fb3ef630 100644 --- a/src/event-manager.js +++ b/src/event-manager.js @@ -5,7 +5,7 @@ import * as LogManager from 'aurelia-logging'; let emLogger = LogManager.getLogger('event-manager'); //Note: path and deepPath are designed to handle v0 and v1 shadow dom specs respectively function findOriginalEventTarget(event) { - return (event.path && event.path[0]) || (event.deepPath && event.deepPath[0]) || event.target; + return (event.path && event.path[0]) || (event.deepPath && event.deepPath[0]) || (event.composedPath && event.composedPath()[0]) || event.target; } function stopPropagation() { From 1007900cfab9dd0922fcad085ca93013d0c16ab4 Mon Sep 17 00:00:00 2001 From: michaelw85 Date: Wed, 13 Nov 2019 11:32:52 +0100 Subject: [PATCH 2/3] Update to match v2 return order --- src/event-manager.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/event-manager.js b/src/event-manager.js index fb3ef630..7db299e5 100644 --- a/src/event-manager.js +++ b/src/event-manager.js @@ -5,7 +5,7 @@ import * as LogManager from 'aurelia-logging'; let emLogger = LogManager.getLogger('event-manager'); //Note: path and deepPath are designed to handle v0 and v1 shadow dom specs respectively function findOriginalEventTarget(event) { - return (event.path && event.path[0]) || (event.deepPath && event.deepPath[0]) || (event.composedPath && event.composedPath()[0]) || event.target; + return (event.composedPath && event.composedPath()[0]) || (event.deepPath && event.deepPath[0]) || (event.path && event.path[0]) || event.target; } function stopPropagation() { From 0fe516951e16463fec416a63ca75799391ab9c20 Mon Sep 17 00:00:00 2001 From: michaelw85 Date: Wed, 13 Nov 2019 11:38:15 +0100 Subject: [PATCH 3/3] deepPath is a method not an array --- src/event-manager.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/event-manager.js b/src/event-manager.js index 7db299e5..935e2f7f 100644 --- a/src/event-manager.js +++ b/src/event-manager.js @@ -5,7 +5,7 @@ import * as LogManager from 'aurelia-logging'; let emLogger = LogManager.getLogger('event-manager'); //Note: path and deepPath are designed to handle v0 and v1 shadow dom specs respectively function findOriginalEventTarget(event) { - return (event.composedPath && event.composedPath()[0]) || (event.deepPath && event.deepPath[0]) || (event.path && event.path[0]) || event.target; + return (event.composedPath && event.composedPath()[0]) || (event.deepPath && event.deepPath()[0]) || (event.path && event.path[0]) || event.target; } function stopPropagation() {