diff options
author | Nivesh Rajbhandari | 2012-02-20 11:14:44 -0800 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-02-20 11:14:44 -0800 |
commit | abf78e2d7a97d295ce5a1c425fd359d47379137e (patch) | |
tree | d08c91bd2aef31e6325e0b499b2ffc390018bec6 /js/ninja.reel/ninja.js | |
parent | e80a79bff57fecf3aa9b869d8ed2de5fd815287c (diff) | |
parent | e23708721a71ca4c71365f5f8e8ac7d6113926db (diff) | |
download | ninja-abf78e2d7a97d295ce5a1c425fd359d47379137e.tar.gz |
Merge branch 'refs/heads/ninja-internal' into ToolFixes
Diffstat (limited to 'js/ninja.reel/ninja.js')
-rwxr-xr-x[-rw-r--r--] | js/ninja.reel/ninja.js | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js index e9c79230..399d7b4d 100644..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() { |
@@ -102,6 +109,9 @@ exports.Ninja = Montage.create(Component, { | |||
102 | didDraw: { | 109 | didDraw: { |
103 | value: function() { | 110 | value: function() { |
104 | if(!this._didDraw) { | 111 | if(!this._didDraw) { |
112 | if (!this.application.ninja.coreIoApi.ioServiceDetected) { | ||
113 | var check = this.application.ninja.coreIoApi.cloudAvailable(); | ||
114 | } | ||
105 | NJevent("appLoaded"); | 115 | NJevent("appLoaded"); |
106 | this._didDraw = true; | 116 | this._didDraw = true; |
107 | } | 117 | } |