aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel/ninja.js
diff options
context:
space:
mode:
authorAnanya Sen2012-02-18 18:49:45 -0800
committerAnanya Sen2012-02-18 18:49:45 -0800
commit8fdce771bfcf662cf1acc16d45e4361ffd06c53e (patch)
tree4ac283e0e7724e5ede21c1a1e97d121033578c72 /js/ninja.reel/ninja.js
parentc2a5918480adae0124e1dc2531c019562f1e3e60 (diff)
parente23708721a71ca4c71365f5f8e8ac7d6113926db (diff)
downloadninja-8fdce771bfcf662cf1acc16d45e4361ffd06c53e.tar.gz
Merge branch 'refs/heads/FileIO-jose' into FileIO
Conflicts: js/controllers/document-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/ninja.reel/ninja.js')
-rwxr-xr-xjs/ninja.reel/ninja.js7
1 files changed, 7 insertions, 0 deletions
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js
index 43087c39..399d7b4d 100755
--- a/js/ninja.reel/ninja.js
+++ b/js/ninja.reel/ninja.js
@@ -60,11 +60,18 @@ exports.Ninja = Montage.create(Component, {
60 this.eventManager.addEventListener( "onOpenDocument", this, false); 60 this.eventManager.addEventListener( "onOpenDocument", this, false);
61 61
62 this.addEventListener("change@appModel.livePreview", this.executeLivePreview, false); 62 this.addEventListener("change@appModel.livePreview", this.executeLivePreview, false);
63 this.addEventListener("change@appModel.chromePreview", this.executeChromePreview, false);
63 this.addEventListener("change@appModel.debug", this.toggleDebug, false); 64 this.addEventListener("change@appModel.debug", this.toggleDebug, false);
64 65
65 NJevent("appLoading"); 66 NJevent("appLoading");
66 } 67 }
67 }, 68 },
69
70 executeChromePreview: {
71 value: function () {
72 this.application.ninja.documentController.activeDocument.livePreview();
73 }
74 },
68 75
69 handleResize: { 76 handleResize: {
70 value: function() { 77 value: function() {