diff --git a/core/event/event-manager.js b/core/event/event-manager.js index 17ccba4a43..bd24c07446 100644 --- a/core/event/event-manager.js +++ b/core/event/event-manager.js @@ -1485,12 +1485,12 @@ var EventManager = exports.EventManager = Montage.specialize(/** @lends EventMan methodNameForBubblePhaseOfEventType: { enumerable: false, value: function methodNameForBubblePhaseOfEventType(eventType, identifier, capitalizedEventType, capitalizedIdentifier) { - var eventTypeBucket; + var eventTypeBucket, eventTypeString = String(eventType); if (identifier) { - eventTypeBucket = this._bubbleMethodNameByEventTypeIdentifier_.get(eventType) || (this._bubbleMethodNameByEventTypeIdentifier_.set(eventType, new Map())).get(eventType); - return eventTypeBucket.get(identifier) || (eventTypeBucket.set(identifier, ("handle" + (capitalizedIdentifier || identifier.toCapitalized()) + (capitalizedEventType || eventType.toCapitalized())))).get(identifier); + eventTypeBucket = this._bubbleMethodNameByEventTypeIdentifier_.get(eventTypeString) || (this._bubbleMethodNameByEventTypeIdentifier_.set(eventTypeString, new Map())).get(eventTypeString); + return eventTypeBucket.get(identifier) || (eventTypeBucket.set(identifier, ("handle" + (capitalizedIdentifier || identifier.toCapitalized()) + (capitalizedEventType || eventTypeString.toCapitalized())))).get(identifier); } else { - return this._bubbleMethodNameByEventType_.get(eventType) || (this._bubbleMethodNameByEventType_.set(eventType, ("handle" + (capitalizedEventType || eventType.toCapitalized())))).get(eventType); + return this._bubbleMethodNameByEventType_.get(eventTypeString) || (this._bubbleMethodNameByEventType_.set(eventTypeString, ("handle" + (capitalizedEventType || eventTypeString.toCapitalized())))).get(eventTypeString); } } }, @@ -1508,13 +1508,13 @@ var EventManager = exports.EventManager = Montage.specialize(/** @lends EventMan methodNameForCapturePhaseOfEventType: { enumerable: false, value: function methodNameForCapturePhaseOfEventType(eventType, identifier, capitalizedEventType, capitalizedIdentifier) { - var eventTypeBucket; + var eventTypeBucket, eventTypeString = String(eventType); if (identifier) { - eventTypeBucket = this._catptureMethodNameByEventTypeIdentifier_.get(eventType) || (this._catptureMethodNameByEventTypeIdentifier_.set(eventType,new Map())).get(eventType); - return eventTypeBucket.get(identifier) || (eventTypeBucket.set(identifier,("capture" + (capitalizedIdentifier || identifier.toCapitalized()) + (capitalizedEventType || eventType.toCapitalized())))).get(identifier); + eventTypeBucket = this._catptureMethodNameByEventTypeIdentifier_.get(eventTypeString) || (this._catptureMethodNameByEventTypeIdentifier_.set(eventTypeString,new Map())).get(eventTypeString); + return eventTypeBucket.get(identifier) || (eventTypeBucket.set(identifier,("capture" + (capitalizedIdentifier || identifier.toCapitalized()) + (capitalizedEventType || eventTypeString.toCapitalized())))).get(identifier); } else { - return this._captureMethodNameByEventType_.get(eventType) || - (this._captureMethodNameByEventType_.set(eventType, ("capture" + (capitalizedEventType || eventType.toCapitalized())))).get(eventType); + return this._captureMethodNameByEventType_.get(eventTypeString) || + (this._captureMethodNameByEventType_.set(eventTypeString, ("capture" + (capitalizedEventType || eventTypeString.toCapitalized())))).get(eventTypeString); } } }, @@ -2822,7 +2822,7 @@ var EventManager = exports.EventManager = Montage.specialize(/** @lends EventMan var targetCandidate = target, application = this.application, - eventPath = [], + eventPath, discoveredTargets = this._eventPathForTargetMap; discoveredTargets.clear(); @@ -2832,7 +2832,7 @@ var EventManager = exports.EventManager = Montage.specialize(/** @lends EventMan do { if (!discoveredTargets.has(targetCandidate)) { - eventPath.push(targetCandidate); + (eventPath || (eventPath = [])).push(targetCandidate); discoveredTargets.set(targetCandidate,true); } diff --git a/core/event/mutable-event.js b/core/event/mutable-event.js index ef6a5da322..268f425b07 100644 --- a/core/event/mutable-event.js +++ b/core/event/mutable-event.js @@ -34,6 +34,12 @@ if (typeof window !== "undefined") { @class MutableEvent */ var MutableEvent = exports.MutableEvent = Montage.specialize(/** @lends MutableEvent# */ { + constructor: { + value: function() { + this._currentTarget = void 0; + return this; + } + }, /** @private