Merge pull request #453 from azakus/fix-efp

Scope elementFromPoint to the current TreeScope
googlearchive · Jun 6, 2014 · 6c4490e · 6c4490e
2 parents 565320e + 92cd922
commit 6c4490e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/src/wrappers/events.js b/src/wrappers/events.js
@@ -815,6 +815,15 @@
     if (!element)
       return null;
     var path = getEventPath(element, null);
+
+    // scope the path to this TreeScope
+    var idx = path.lastIndexOf(self);
+    if (idx == -1)
+      return null;
+    else
+      path = path.slice(0, idx);
+
+    // TODO(dfreedm): pass idx to eventRetargetting to avoid array copy
     return eventRetargetting(path, self);
   }
 

diff --git a/test/js/ShadowRoot.js b/test/js/ShadowRoot.js
@@ -24,6 +24,10 @@ suite('ShadowRoot', function() {
                       'background: green';
 
     assert.equal(sr.elementFromPoint(5, 5), a);
+
+    var sr2 = a.createShadowRoot();
+    assert.equal(sr.elementFromPoint(5, 5), a);
+    assert.equal(sr2.elementFromPoint(5, 5), null);
   });
 
   test('getElementById', function() {