aboutsummaryrefslogtreecommitdiff
path: root/node_modules/montage/core/event/event-manager.js
diff options
context:
space:
mode:
authorValerio Virgillito2012-02-08 22:15:41 -0800
committerValerio Virgillito2012-02-08 22:15:41 -0800
commitc7df002135328edac03e72a1e4b331b2c72667f8 (patch)
treeee50509df494b069d1769b7b54afd83fd0178e64 /node_modules/montage/core/event/event-manager.js
parent725c54ff4af40f70b7dbd4508da34d2909cea8bd (diff)
parent35ad4d6d2fac4432046141c63c0209cf3d00be5c (diff)
downloadninja-c7df002135328edac03e72a1e4b331b2c72667f8.tar.gz
Merge branch 'refs/heads/master' into components
Diffstat (limited to 'node_modules/montage/core/event/event-manager.js')
-rwxr-xr-xnode_modules/montage/core/event/event-manager.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/node_modules/montage/core/event/event-manager.js b/node_modules/montage/core/event/event-manager.js
index 4adc3926..b3e97dbe 100755
--- a/node_modules/montage/core/event/event-manager.js
+++ b/node_modules/montage/core/event/event-manager.js
@@ -1874,9 +1874,9 @@ var EventManager = exports.EventManager = Montage.create(Montage,/** @lends modu
1874 if (target) { 1874 if (target) {
1875 associatedComponent = this.eventHandlerForElement(target); 1875 associatedComponent = this.eventHandlerForElement(target);
1876 if (associatedComponent) { 1876 if (associatedComponent) {
1877 if (!associatedComponent._preparedForActivationEvents && typeof associatedComponent.prepareForActivationEvents === "function") { 1877 if (!associatedComponent._preparedForActivationEvents) {
1878 1878
1879 associatedComponent.prepareForActivationEvents(); 1879 associatedComponent._prepareForActivationEvents();
1880 associatedComponent._preparedForActivationEvents = true; 1880 associatedComponent._preparedForActivationEvents = true;
1881 1881
1882 } else if (associatedComponent._preparedForActivationEvents) { 1882 } else if (associatedComponent._preparedForActivationEvents) {