aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-02-20 11:14:44 -0800
committerNivesh Rajbhandari2012-02-20 11:14:44 -0800
commitabf78e2d7a97d295ce5a1c425fd359d47379137e (patch)
treed08c91bd2aef31e6325e0b499b2ffc390018bec6 /js/ninja.reel
parente80a79bff57fecf3aa9b869d8ed2de5fd815287c (diff)
parente23708721a71ca4c71365f5f8e8ac7d6113926db (diff)
downloadninja-abf78e2d7a97d295ce5a1c425fd359d47379137e.tar.gz
Merge branch 'refs/heads/ninja-internal' into ToolFixes
Diffstat (limited to 'js/ninja.reel')
-rwxr-xr-x[-rw-r--r--]js/ninja.reel/ninja.css2
-rwxr-xr-x[-rw-r--r--]js/ninja.reel/ninja.html19
-rwxr-xr-x[-rw-r--r--]js/ninja.reel/ninja.js10
3 files changed, 27 insertions, 4 deletions
diff --git a/js/ninja.reel/ninja.css b/js/ninja.reel/ninja.css
index 99fa9a4f..83c0e569 100644..100755
--- a/js/ninja.reel/ninja.css
+++ b/js/ninja.reel/ninja.css
@@ -7,5 +7,3 @@
7.main { 7.main {
8 padding: 100px; 8 padding: 100px;
9} 9}
10
11
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 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 }