diff options
author | Kruti Shah | 2012-07-19 10:08:07 -0700 |
---|---|---|
committer | Kruti Shah | 2012-07-19 10:08:07 -0700 |
commit | 5741fbc0a2eb1a43017b76406056bc98cdf00297 (patch) | |
tree | c6b478666eab9e637039467d70e948e1e0e46882 /js/ninja.reel/ninja.js | |
parent | 0b899ad6cec5e4626dfa32230be7c04d22d4f820 (diff) | |
parent | 142dc59794769ad783ab050b27b4f56ac5773afb (diff) | |
download | ninja-5741fbc0a2eb1a43017b76406056bc98cdf00297.tar.gz |
Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti
Diffstat (limited to 'js/ninja.reel/ninja.js')
-rwxr-xr-x | js/ninja.reel/ninja.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js index 9fd71b1c..42d15d8b 100755 --- a/js/ninja.reel/ninja.js +++ b/js/ninja.reel/ninja.js | |||
@@ -351,6 +351,7 @@ exports.Ninja = Montage.create(Component, { | |||
351 | this.ninjaVersion = window.ninjaVersion.ninja.version; | 351 | this.ninjaVersion = window.ninjaVersion.ninja.version; |
352 | this.undoManager = document.application.undoManager = UndoManager.create(); | 352 | this.undoManager = document.application.undoManager = UndoManager.create(); |
353 | document.application.njUtils = NjUtils; | 353 | document.application.njUtils = NjUtils; |
354 | document.application.model = this.appModel; | ||
354 | } | 355 | } |
355 | }, | 356 | }, |
356 | 357 | ||
@@ -376,9 +377,9 @@ exports.Ninja = Montage.create(Component, { | |||
376 | 377 | ||
377 | this.eventManager.addEventListener("selectTool", this, false); | 378 | this.eventManager.addEventListener("selectTool", this, false); |
378 | this.eventManager.addEventListener("selectSubTool", this, false); | 379 | this.eventManager.addEventListener("selectSubTool", this, false); |
380 | this.eventManager.addEventListener("executePreview", this, false); | ||
379 | 381 | ||
380 | this.addPropertyChangeListener("appModel.livePreview", this.executeLivePreview, false); | 382 | this.addPropertyChangeListener("appModel.livePreview", this.executeLivePreview, false); |
381 | this.addPropertyChangeListener("appModel.chromePreview", this.executeChromePreview, false); | ||
382 | this.addPropertyChangeListener("appModel.debug", this.toggleDebug, false); | 383 | this.addPropertyChangeListener("appModel.debug", this.toggleDebug, false); |
383 | } | 384 | } |
384 | }, | 385 | }, |
@@ -387,7 +388,7 @@ exports.Ninja = Montage.create(Component, { | |||
387 | //////////////////////////////////////////////////////////////////// | 388 | //////////////////////////////////////////////////////////////////// |
388 | //////////////////////////////////////////////////////////////////// | 389 | //////////////////////////////////////////////////////////////////// |
389 | //TODO: Expand method to allow other browsers for preview | 390 | //TODO: Expand method to allow other browsers for preview |
390 | executeChromePreview: { | 391 | handleExecutePreview: { |
391 | value: function () { | 392 | value: function () { |
392 | //TODO: Make into proper component | 393 | //TODO: Make into proper component |
393 | this.saveOperationScreen = {}; | 394 | this.saveOperationScreen = {}; |