diff options
author | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
commit | dc075ffcc6dd03c090d90fad999eee9b924d56ee (patch) | |
tree | 867f8bdd588c8f9076979233ca46a688ff70523e /node_modules/montage/core/event/event-manager.js | |
parent | 5d7e470351fd150d5e70a97332fa2f2553797499 (diff) | |
parent | 4d949f141247215b5f2a6ec0cfc7d2d31cf2bb1f (diff) | |
download | ninja-dc075ffcc6dd03c090d90fad999eee9b924d56ee.tar.gz |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
js/components/layout/tools-properties.reel/tools-properties.html
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'node_modules/montage/core/event/event-manager.js')
-rwxr-xr-x | node_modules/montage/core/event/event-manager.js | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/node_modules/montage/core/event/event-manager.js b/node_modules/montage/core/event/event-manager.js index 75272f85..d38b9755 100755 --- a/node_modules/montage/core/event/event-manager.js +++ b/node_modules/montage/core/event/event-manager.js | |||
@@ -332,29 +332,6 @@ var EventManager = exports.EventManager = Montage.create(Montage,/** @lends modu | |||
332 | this._application = application; | 332 | this._application = application; |
333 | } | 333 | } |
334 | }, | 334 | }, |
335 | /** | ||
336 | @function | ||
337 | @param {String} composer Event composer. | ||
338 | @param {Array} eventType Event type array. | ||
339 | */ | ||
340 | registerComposer_forEventType_: { | ||
341 | enumerable: false, | ||
342 | value: function(composer, eventType) { | ||
343 | |||
344 | if (!!this._registeredEventComposers[eventType]) { | ||
345 | throw "Cannot register composer for eventType:" + eventType + ". Already have one registered."; | ||
346 | } | ||
347 | |||
348 | this._registeredEventComposers[eventType] = composer; | ||
349 | } | ||
350 | }, | ||
351 | /** | ||
352 | @private | ||
353 | */ | ||
354 | _registeredEventComposers: { | ||
355 | value: {}, | ||
356 | enumerable: false | ||
357 | }, | ||
358 | 335 | ||
359 | // Dictionary keyed by event types with the collection of handlers per event type | 336 | // Dictionary keyed by event types with the collection of handlers per event type |
360 | // This dictates why the event manager observes events of a particular type | 337 | // This dictates why the event manager observes events of a particular type |
@@ -718,12 +695,7 @@ var EventManager = exports.EventManager = Montage.create(Montage,/** @lends modu | |||
718 | 695 | ||
719 | } | 696 | } |
720 | 697 | ||
721 | // Inform any composers about this request if we need to synthesize this eventType | ||
722 | if (isNewTarget && typeof target.nativeAddEventListener === "function") { | 698 | if (isNewTarget && typeof target.nativeAddEventListener === "function") { |
723 | if (this._registeredEventComposers[eventType]) { | ||
724 | this._registeredEventComposers[eventType].startObservingTarget_forEventType_(target, eventType); | ||
725 | } | ||
726 | |||
727 | this._observeTarget_forEventType_(target, eventType); | 699 | this._observeTarget_forEventType_(target, eventType); |
728 | } | 700 | } |
729 | 701 | ||