diff options
Diffstat (limited to 'js/ninja.reel')
-rwxr-xr-x[-rw-r--r--] | js/ninja.reel/ninja.css | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | js/ninja.reel/ninja.html | 19 | ||||
-rwxr-xr-x[-rw-r--r--] | js/ninja.reel/ninja.js | 5 |
3 files changed, 21 insertions, 3 deletions
diff --git a/js/ninja.reel/ninja.css b/js/ninja.reel/ninja.css index 99fa9a4f..99fa9a4f 100644..100755 --- a/js/ninja.reel/ninja.css +++ b/js/ninja.reel/ninja.css | |||
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html index c8625159..c9f17e3b 100644..100755 --- a/js/ninja.reel/ninja.html +++ b/js/ninja.reel/ninja.html | |||
@@ -216,6 +216,11 @@ | |||
216 | "name": "ElementMediator" | 216 | "name": "ElementMediator" |
217 | }, | 217 | }, |
218 | 218 | ||
219 | "ioMediator": { | ||
220 | "module": "js/mediators/io-mediator", | ||
221 | "name": "IoMediator" | ||
222 | }, | ||
223 | |||
219 | "undocontroller1": { | 224 | "undocontroller1": { |
220 | "module": "js/controllers/undo-controller", | 225 | "module": "js/controllers/undo-controller", |
221 | "name": "UndoController" | 226 | "name": "UndoController" |
@@ -227,7 +232,7 @@ | |||
227 | }, | 232 | }, |
228 | 233 | ||
229 | "documentController1": { | 234 | "documentController1": { |
230 | "module": "js/io/document/document-controller", | 235 | "module": "js/controllers/document-controller", |
231 | "name": "DocumentController" | 236 | "name": "DocumentController" |
232 | }, | 237 | }, |
233 | 238 | ||
@@ -255,9 +260,14 @@ | |||
255 | }, | 260 | }, |
256 | 261 | ||
257 | "newFileController": { | 262 | "newFileController": { |
258 | "module": "js/io/workflow/newFileDialog/new-file-workflow-controller", | 263 | "module": "js/io/ui/new-file-dialog/new-file-workflow-controller", |
259 | "name": "NewFileWorkflowController" | 264 | "name": "NewFileWorkflowController" |
260 | }, | 265 | }, |
266 | |||
267 | "coreIoApi1": { | ||
268 | "module": "js/io/system/coreioapi", | ||
269 | "name": "CoreIoApi" | ||
270 | }, | ||
261 | 271 | ||
262 | "mainMenuController": { | 272 | "mainMenuController": { |
263 | "module": "js/controllers/main-menu-controller", | 273 | "module": "js/controllers/main-menu-controller", |
@@ -269,6 +279,8 @@ | |||
269 | "name": "Ninja", | 279 | "name": "Ninja", |
270 | "properties": { | 280 | "properties": { |
271 | "element": {"#": "main"}, | 281 | "element": {"#": "main"}, |
282 | "rulerTop": {"#": "rulerTop"}, | ||
283 | "rulerLeft": {"#": "rulerLeft"}, | ||
272 | "appModel": {"@": "appModel"}, | 284 | "appModel": {"@": "appModel"}, |
273 | "toolsData": {"@": "toolsData1"}, | 285 | "toolsData": {"@": "toolsData1"}, |
274 | "toolsList": {"@": "toolsList1"}, | 286 | "toolsList": {"@": "toolsList1"}, |
@@ -276,6 +288,7 @@ | |||
276 | "stage": {"@": "stage1"}, | 288 | "stage": {"@": "stage1"}, |
277 | "settings": {"@": "settings1"}, | 289 | "settings": {"@": "settings1"}, |
278 | "elementMediator": {"@": "elementMediator"}, | 290 | "elementMediator": {"@": "elementMediator"}, |
291 | "dragDropMediator": {"@": "dragDropMediator"}, | ||
279 | "undocontroller": {"@": "undocontroller1"}, | 292 | "undocontroller": {"@": "undocontroller1"}, |
280 | "selectionController": {"@": "selectionController1"}, | 293 | "selectionController": {"@": "selectionController1"}, |
281 | "documentController": {"@": "documentController1"}, | 294 | "documentController": {"@": "documentController1"}, |
@@ -284,7 +297,9 @@ | |||
284 | "stylesController": {"@": "stylesController"}, | 297 | "stylesController": {"@": "stylesController"}, |
285 | "filePickerController": {"@": "filePickerController"}, | 298 | "filePickerController": {"@": "filePickerController"}, |
286 | "newFileController": {"@": "newFileController"}, | 299 | "newFileController": {"@": "newFileController"}, |
300 | "coreIoApi": {"@": "coreIoApi1"}, | ||
287 | "documentBar": {"@": "documentBar"}, | 301 | "documentBar": {"@": "documentBar"}, |
302 | "ioMediator": {"@": "ioMediator"}, | ||
288 | "timeline": {"@": "timeline"}, | 303 | "timeline": {"@": "timeline"}, |
289 | "mainMenuController": {"@": "mainMenuController"} | 304 | "mainMenuController": {"@": "mainMenuController"} |
290 | } | 305 | } |
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js index 469d38f7..43087c39 100644..100755 --- a/js/ninja.reel/ninja.js +++ b/js/ninja.reel/ninja.js | |||
@@ -102,6 +102,9 @@ exports.Ninja = Montage.create(Component, { | |||
102 | didDraw: { | 102 | didDraw: { |
103 | value: function() { | 103 | value: function() { |
104 | if(!this._didDraw) { | 104 | if(!this._didDraw) { |
105 | if (!this.application.ninja.coreIoApi.ioServiceDetected) { | ||
106 | var check = this.application.ninja.coreIoApi.cloudAvailable(); | ||
107 | } | ||
105 | NJevent("appLoaded"); | 108 | NJevent("appLoaded"); |
106 | this._didDraw = true; | 109 | this._didDraw = true; |
107 | } | 110 | } |
@@ -186,7 +189,7 @@ exports.Ninja = Montage.create(Component, { | |||
186 | transitionStopRule = "*" | 189 | transitionStopRule = "*" |
187 | } | 190 | } |
188 | 191 | ||
189 | this.currentDocument.documentRoot.elementModel.controller.setProperty(this.currentDocument.documentRoot, "background", background); | 192 | this.currentDocument.documentRoot.elementModel.controller.setProperty(this.currentDocument.documentRoot, "body-background", background); |
190 | this.currentDocument.documentRoot.elementModel.controller.setProperty(this.currentDocument.documentRoot, "overflow", overflow); | 193 | this.currentDocument.documentRoot.elementModel.controller.setProperty(this.currentDocument.documentRoot, "overflow", overflow); |
191 | this.currentDocument.documentRoot.elementModel.controller.changeSelector(this.currentDocument.documentRoot, "transitionStopRule", transitionStopRule); | 194 | this.currentDocument.documentRoot.elementModel.controller.changeSelector(this.currentDocument.documentRoot, "transitionStopRule", transitionStopRule); |
192 | 195 | ||