Skip to content
This repository was archived by the owner on Mar 13, 2018. It is now read-only.

Commit 2ca1cd3

Browse files
committed
Merge pull request #447 from arv/event-path-no-encapsulation
Event path should return every nodes in the event path
2 parents 79acf9a + 2695aa7 commit 2ca1cd3

File tree

2 files changed

+13
-18
lines changed

2 files changed

+13
-18
lines changed

src/wrappers/events.js

+4-18
Original file line numberDiff line numberDiff line change
@@ -475,25 +475,11 @@
475475
return eventPhaseTable.get(this);
476476
},
477477
get path() {
478-
var nodeList = new wrappers.NodeList();
479478
var eventPath = eventPathTable.get(this);
480-
if (eventPath) {
481-
var index = 0;
482-
var lastIndex = eventPath.length - 1;
483-
var baseRoot = getTreeScope(currentTargetTable.get(this));
484-
485-
for (var i = 0; i <= lastIndex; i++) {
486-
var currentTarget = eventPath[i];
487-
var currentRoot = getTreeScope(currentTarget);
488-
if (currentRoot.contains(baseRoot) &&
489-
// Make sure we do not add Window to the path.
490-
(i !== lastIndex || currentTarget instanceof wrappers.Node)) {
491-
nodeList[index++] = currentTarget;
492-
}
493-
}
494-
nodeList.length = index;
495-
}
496-
return nodeList;
479+
if (!eventPath)
480+
return [];
481+
// TODO(arv): Event path should contain window.
482+
return eventPath.slice();
497483
},
498484
stopPropagation: function() {
499485
stopPropagationTable.set(this, true);

test/js/events.js

+9
Original file line numberDiff line numberDiff line change
@@ -1194,6 +1194,9 @@ test('retarget order (multiple shadow roots)', function() {
11941194
[
11951195
tree.c,
11961196
tree.content,
1197+
tree.content2,
1198+
tree.e,
1199+
tree.sr2,
11971200
tree.d,
11981201
tree.sr,
11991202
tree.b,
@@ -1209,6 +1212,12 @@ test('retarget order (multiple shadow roots)', function() {
12091212
assertArrayEqual(
12101213
[
12111214
tree.c,
1215+
tree.content,
1216+
tree.content2,
1217+
tree.e,
1218+
tree.sr2,
1219+
tree.d,
1220+
tree.sr,
12121221
tree.b,
12131222
tree.a,
12141223
tree.div,

0 commit comments

Comments
 (0)