diff options
| author | Eric Guzman | 2012-02-08 15:33:30 -0800 |
|---|---|---|
| committer | Eric Guzman | 2012-02-08 15:33:30 -0800 |
| commit | 4ab650bccc776b031191dc410a93309a9d342bab (patch) | |
| tree | 55a2c7cdda8cce2ede9a8efcb3e77bfa96abc821 /node_modules/montage/core/event/event-manager.js | |
| parent | 7fc8ce44579b0464710d0696782daf7df776b1a0 (diff) | |
| parent | 0537f8f29e7b8dd48fd08f20b1533fbe92a54c4b (diff) | |
| download | ninja-4ab650bccc776b031191dc410a93309a9d342bab.tar.gz | |
Merge branch 'refs/heads/master' into PresetsPanel
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) { |