GreenPolyProducts/polymer
5
0
Fork 0
mirror of https://github.com/Polymer/polymer.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3202 from Polymer/issue-3201

Browse Source 
use destination insertion points when calculating the path
This commit is contained in:
Steve Orvell 2015-12-15 16:57:26 -08:00
commit dd34fc6163
2 changed files with 39 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/lib/dom-api-event.html
View File

@ -15,13 +15,13 @@ Polymer.EventApi = (function() {
var DomApi = Polymer.DomApi.ctor;
var Settings = Polymer.Settings;
/**
* DomApi.Event allows maniuplation of events compatible with
* the scoping concepts in Shadow DOM and compatible with both Shady DOM
* and Shadow DOM. The general usage is
* `Polymer.dom(event).property`. The `path` property returns `event.path`
* matching Shadow DOM. The `rootTarget` property returns the first node
* DomApi.Event allows maniuplation of events compatible with
* the scoping concepts in Shadow DOM and compatible with both Shady DOM
* and Shadow DOM. The general usage is
* `Polymer.dom(event).property`. The `path` property returns `event.path`
* matching Shadow DOM. The `rootTarget` property returns the first node
* in the `path` and is the original event target. The `localTarget` property
* matches event.target under Shadow DOM and is the scoped event target.
*/
@ -32,7 +32,7 @@ Polymer.EventApi = (function() {
if (Settings.useShadow) {
DomApi.Event.prototype = {
get rootTarget() {
return this.event.path[0];
},
@ -50,7 +50,7 @@ Polymer.EventApi = (function() {
} else {
DomApi.Event.prototype = {
get rootTarget() {
return this.event.target;
},
@ -71,10 +71,18 @@ Polymer.EventApi = (function() {
get path() {
if (!this.event._path) {
var path = [];
var o = this.rootTarget;
while (o) {
path.push(o);
o = Polymer.dom(o).parentNode || o.host;
var current = this.rootTarget;
while (current) {
path.push(current);
var insertionPoints = Polymer.dom(current).getDestinationInsertionPoints();
if (insertionPoints.length) {
for (var i = 0; i < insertionPoints.length - 1; i++) {
path.push(insertionPoints[i]);
}
current = insertionPoints[insertionPoints.length - 1];
} else {
current = Polymer.dom(current).parentNode || current.host;
}
}
// event path includes window in most recent native implementations
path.push(window);

19
test/unit/polymer-dom.js
View File

@ -663,6 +663,25 @@ suite('Polymer.dom', function() {
assert.sameMembers(order, [cb1, cbReentrant, cb2, cb3, cb4]);
});
test('path correctly calculated for elements with destination insertion points', function(done) {
var re = document.createElement('x-reproject');
var p = Polymer.dom(re.root).querySelector('x-project');
var child = document.createElement('p');
child.innerHTML = "hello";
// child will be inserted into p after distributeContent is performed.
Polymer.dom(re).appendChild(child);
Polymer.dom(document.body).appendChild(re);
Polymer.dom.flush();
child.addEventListener('child-event', function(e){
var path = Polymer.dom(e).path;
assert.isTrue(path.indexOf(p) !== -1, 'path contains p');
assert.isTrue(path.indexOf(re) !== -1, 'path contains re');
done();
});
var evt = new CustomEvent('child-event');
child.dispatchEvent(evt);
});
});
suite('Polymer.dom accessors', function() {