aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel
diff options
context:
space:
mode:
authorAnanya Sen2012-02-03 09:57:41 -0800
committerAnanya Sen2012-02-03 09:57:41 -0800
commitc093dd13a84ce6eb3e00a672c38a808093c5d966 (patch)
tree5dfd4a800bbbe02a8cbcb3ffeee542686bc258bb /js/ninja.reel
parent79b0173eeca079dec42ff1480182656dbe3af44f (diff)
parent8e06b63e5eab5558823f4923e20a832c8b36cbe2 (diff)
downloadninja-c093dd13a84ce6eb3e00a672c38a808093c5d966.tar.gz
Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO
Conflicts: js/io/document/document-controller.js js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js js/io/ui/save-as-dialog.reel/save-as-dialog.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/ninja.reel')
-rwxr-xr-xjs/ninja.reel/ninja.js20
1 files changed, 10 insertions, 10 deletions
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js
index 38bc22fb..3b9fc1c5 100755
--- a/js/ninja.reel/ninja.js
+++ b/js/ninja.reel/ninja.js
@@ -94,12 +94,18 @@ exports.Ninja = Montage.create(Component, {
94 } 94 }
95 }, 95 },
96 96
97 _didDraw: {
98 value: false
99 },
100
97 didDraw: { 101 didDraw: {
98 value: function() { 102 value: function() {
99 NJevent("appLoaded"); 103 if(!this._didDraw) {
100 // 104 if (!this.application.ninja.coreIoApi.ioServiceDetected) {
101 if (!this.application.ninja.coreIoApi.ioServiceDetected) { 105 var check = this.application.ninja.coreIoApi.cloudAvailable();
102 var check = this.application.ninja.coreIoApi.cloudAvailable(); 106 }
107 NJevent("appLoaded");
108 this._didDraw = true;
103 } 109 }
104 } 110 }
105 }, 111 },
@@ -167,12 +173,6 @@ exports.Ninja = Montage.create(Component, {
167 } 173 }
168 }, 174 },
169 175
170 handleLivePreview: {
171 value: function(event) {
172
173 }
174 },
175
176 executeLivePreview: { 176 executeLivePreview: {
177 value: function() { 177 value: function() {
178 var background, overflow, transitionStopRule; 178 var background, overflow, transitionStopRule;