Skip to content

- WIP to move buidling composedPath on MutableEvent so it can be over… #127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
marchant wants to merge 1 commit into
base: main
Choose a base branch
from
Open

- WIP to move buidling composedPath on MutableEvent so it can be over… #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
229 changes: 115 additions & 114 deletions core/event/event-manager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3305,8 +3305,9 @@ var EventManager = exports.EventManager = Montage.specialize(/** @lends EventMan
}

mutableEventTarget = mutableEvent.target;
eventPath = this.eventPathForTarget(mutableEventTarget);
mutableEvent._composedPath = eventPath;
// eventPath = this.eventPathForTarget(mutableEventTarget);
// mutableEvent._composedPath = eventPath;
eventPath = mutableEvent.composedPath();


// Let the delegate handle the event first
Expand Down Expand Up @@ -3681,136 +3682,136 @@ var EventManager = exports.EventManager = Montage.specialize(/** @lends EventMan
}
},

_eventPathForTargetMap : {
value: undefined
},

eventPathForTarget: {
enumerable: false,
value: function (target) {

if (this.isBrowser && (this.isElement(target) || target instanceof Document || target === window)) {
return this._eventPathForDomTarget(target);
} else {
return this._eventPathForTarget(target);
}
}
},
// _eventPathForTargetMap : {
// value: undefined
// },

/**
* Build the event target chain for the the specified Target
* @private
*/
_eventPathForTarget: {
enumerable: false,
value: function (target) {
// eventPathForTarget: {
// enumerable: false,
// value: function (target) {

if (!target) {
return this._emptyComposedPath;
} else if(target.composedPath) {
/*
If target has a commposedPath, it's likely cached.
So in case it's mutated by a listner, we're making a copy
to guard against that.
*/
return Array.from(target.composedPath);
} else {
// if (this.isBrowser && (this.isElement(target) || target instanceof Document || target === window)) {
// return this._eventPathForDomTarget(target);
// } else {
// return this._eventPathForTarget(target);
// }
// }
// },

var targetCandidate = target,
application = this.application,
eventPath = [],
discoveredTargets = this._eventPathForTargetMap;
// /**
// * Build the event target chain for the the specified Target
// * @private
// */
// _eventPathForTarget: {
// enumerable: false,
// value: function (target) {

discoveredTargets.clear();
// if (!target) {
// return this._emptyComposedPath;
// } else if(target.composedPath()) {
// /*
// If target has a commposedPath, it's likely cached.
// So in case it's mutated by a listner, we're making a copy
// to guard against that.
// */
// return Array.from(target.composedPath());
// } else {

// Consider the target "discovered" for less specialized detection of cycles
// discoveredTargets.set(target,true);
// var targetCandidate = target,
// application = this.application,
// eventPath = [],
// discoveredTargets = this._eventPathForTargetMap;

do {
if (!discoveredTargets.has(targetCandidate)) {
eventPath.push(targetCandidate);
discoveredTargets.set(targetCandidate,true);
}
// discoveredTargets.clear();

targetCandidate = targetCandidate.nextTarget;
// // Consider the target "discovered" for less specialized detection of cycles
// // discoveredTargets.set(target,true);

if (!targetCandidate || discoveredTargets.has(targetCandidate)) {
targetCandidate = application;
}
// do {
// if (!discoveredTargets.has(targetCandidate)) {
// eventPath.push(targetCandidate);
// discoveredTargets.set(targetCandidate,true);
// }

if (targetCandidate && discoveredTargets.has(targetCandidate)) {
targetCandidate = null;
}
}
while (targetCandidate);
// targetCandidate = targetCandidate.nextTarget;

return eventPath;
}
// if (!targetCandidate || discoveredTargets.has(targetCandidate)) {
// targetCandidate = application;
// }

}
},
// if (targetCandidate && discoveredTargets.has(targetCandidate)) {
// targetCandidate = null;
// }
// }
// while (targetCandidate);

_emptyComposedPath: {
value: Object.freeze([])
},
/**
* Build the event target chain for the the specified DOM target
* @private
*/
_eventPathForDomTarget: {
enumerable: false,
value: function (target) {
// return eventPath;
// }

if (!target) {
return this._emptyComposedPath;
}
// }
// },

var targetCandidate = target,
targetView = targetCandidate && targetCandidate.defaultView ? targetCandidate.defaultView : window,
targetDocument = targetView.document ? targetView.document : document,
targetApplication = this.application,
previousBubblingTarget,
eventPath = [];
// _emptyComposedPath: {
// value: Object.freeze([])
// },
// /**
// * Build the event target chain for the the specified DOM target
// * @private
// */
// _eventPathForDomTarget: {
// enumerable: false,
// value: function (target) {

do {
// Include the target itself as the root of the event's compsoedPath
eventPath.push(targetCandidate);

previousBubblingTarget = targetCandidate;
// use the structural DOM hierarchy until we run out of that and need
// to give listeners on document, window, and application a chance to respond
switch (targetCandidate) {
case targetApplication:
targetCandidate = targetCandidate.parentApplication;
if (targetCandidate) {
targetApplication = targetCandidate;
}
break;
case targetView:
targetCandidate = targetApplication;
break;
case targetDocument:
targetCandidate = targetView;
break;
case targetDocument.documentElement:
targetCandidate = targetDocument;
break;
default:
targetCandidate = targetCandidate.parentNode;
// if (!target) {
// return this._emptyComposedPath;
// }

// Run out of hierarchy candidates? go up to the application
if (!targetCandidate) {
targetCandidate = targetApplication;
}
// var targetCandidate = target,
// targetView = targetCandidate && targetCandidate.defaultView ? targetCandidate.defaultView : window,
// targetDocument = targetView.document ? targetView.document : document,
// targetApplication = this.application,
// previousBubblingTarget,
// eventPath = [];

// do {
// // Include the target itself as the root of the event's compsoedPath
// eventPath.push(targetCandidate);

// previousBubblingTarget = targetCandidate;
// // use the structural DOM hierarchy until we run out of that and need
// // to give listeners on document, window, and application a chance to respond
// switch (targetCandidate) {
// case targetApplication:
// targetCandidate = targetCandidate.parentApplication;
// if (targetCandidate) {
// targetApplication = targetCandidate;
// }
// break;
// case targetView:
// targetCandidate = targetApplication;
// break;
// case targetDocument:
// targetCandidate = targetView;
// break;
// case targetDocument.documentElement:
// targetCandidate = targetDocument;
// break;
// default:
// targetCandidate = targetCandidate.parentNode;

// // Run out of hierarchy candidates? go up to the application
// if (!targetCandidate) {
// targetCandidate = targetApplication;
// }

break;
}
}
while (targetCandidate && previousBubblingTarget !== targetCandidate);
// break;
// }
// }
// while (targetCandidate && previousBubblingTarget !== targetCandidate);

return eventPath;
}
},
// return eventPath;
// }
// },

/**
* @private
Expand Down
Loading