diff options
author | Jose Antonio Marquez | 2012-02-07 23:14:08 -0800 |
---|---|---|
committer | Jose Antonio Marquez | 2012-02-07 23:14:08 -0800 |
commit | 95808eb6ac82b8bf33de658bd135340b66a8fa29 (patch) | |
tree | bae2a7912552241a0476061ce8e7128f46cfd53e /node_modules/montage/core/event/event-manager.js | |
parent | 687cfbbae1df2392267e9602f955f6eadd5b339d (diff) | |
parent | e5579374ff39b80b8c0c69faba37f6f581758fe0 (diff) | |
download | ninja-95808eb6ac82b8bf33de658bd135340b66a8fa29.tar.gz |
Merge branch 'refs/heads/NinjaInternal' into FileIO
Diffstat (limited to 'node_modules/montage/core/event/event-manager.js')
-rwxr-xr-x | node_modules/montage/core/event/event-manager.js | 4 |
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) { |