aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel/ninja.js
diff options
context:
space:
mode:
authorValerio Virgillito2012-07-18 16:24:45 -0700
committerValerio Virgillito2012-07-18 16:24:45 -0700
commitf79f7c540d8533eed8fc562b809e15dcfea94438 (patch)
tree955b0d51fb163fb0a5165a6e16bf503de4cda712 /js/ninja.reel/ninja.js
parent71650434d5b78c2b86dc8a689d0c9034d418f38b (diff)
parent6f2e455a77179f81dfd19037c078c158d3e14ee2 (diff)
downloadninja-f79f7c540d8533eed8fc562b809e15dcfea94438.tar.gz
Merge branch 'menu-fixes' of https://github.com/mencio/ninja
Diffstat (limited to 'js/ninja.reel/ninja.js')
-rwxr-xr-xjs/ninja.reel/ninja.js5
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 = {};