Merge branch 'refs/heads/ninja-internal' into ToolFixes

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 @@
 .main {
     padding: 100px;
 }
-
-
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 @@
                 "name": "ElementMediator"
             },
 
+            "ioMediator": {
+                "module": "js/mediators/io-mediator",
+                "name": "IoMediator"
+            },
+
             "undocontroller1": {
                 "module": "js/controllers/undo-controller",
                 "name": "UndoController"
@@ -227,7 +232,7 @@
             },
 
             "documentController1": {
-                "module": "js/io/document/document-controller",
+                "module": "js/controllers/document-controller",
                 "name": "DocumentController"
             },
 
@@ -255,9 +260,14 @@
             },
 
             "newFileController": {
-                "module": "js/io/workflow/newFileDialog/new-file-workflow-controller",
+                "module": "js/io/ui/new-file-dialog/new-file-workflow-controller",
                 "name": "NewFileWorkflowController"
             },
+            
+            "coreIoApi1": {
+                "module": "js/io/system/coreioapi",
+                "name": "CoreIoApi"
+            },
 
             "mainMenuController": {
                 "module": "js/controllers/main-menu-controller",
@@ -269,6 +279,8 @@
                 "name": "Ninja",
                 "properties": {
                     "element":              {"#": "main"},
+                    "rulerTop":                 {"#": "rulerTop"},
+                    "rulerLeft":                {"#": "rulerLeft"},
                     "appModel":             {"@": "appModel"},
                     "toolsData":            {"@": "toolsData1"},
                     "toolsList":            {"@": "toolsList1"},
@@ -276,6 +288,7 @@
                     "stage":                {"@": "stage1"},
                     "settings":             {"@": "settings1"},
                     "elementMediator":      {"@": "elementMediator"},
+                    "dragDropMediator":     {"@": "dragDropMediator"},
                     "undocontroller":       {"@": "undocontroller1"},
                     "selectionController":  {"@": "selectionController1"},
                     "documentController":   {"@": "documentController1"},
@@ -284,7 +297,9 @@
                     "stylesController":     {"@": "stylesController"},
                     "filePickerController": {"@": "filePickerController"},
                     "newFileController":    {"@": "newFileController"},
+                    "coreIoApi":                {"@": "coreIoApi1"},
                     "documentBar":          {"@": "documentBar"},
+                    "ioMediator":           {"@": "ioMediator"},
                     "timeline":             {"@": "timeline"},
                     "mainMenuController":   {"@": "mainMenuController"}
                 }
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, {
             this.eventManager.addEventListener( "onOpenDocument", this, false);
 
             this.addEventListener("change@appModel.livePreview", this.executeLivePreview, false);
+            this.addEventListener("change@appModel.chromePreview", this.executeChromePreview, false);
             this.addEventListener("change@appModel.debug", this.toggleDebug, false);
 
             NJevent("appLoading");
         }
     },
+    
+    executeChromePreview: {
+        value: function () {
+                this.application.ninja.documentController.activeDocument.livePreview();
+        }
+    },
 
     handleResize: {
         value: function() {
@@ -102,6 +109,9 @@ exports.Ninja = Montage.create(Component, {
     didDraw: {
         value: function() {
             if(!this._didDraw) {
+                if (!this.application.ninja.coreIoApi.ioServiceDetected) {
+                        var check = this.application.ninja.coreIoApi.cloudAvailable();
+                }
                 NJevent("appLoaded");
                 this._didDraw = true;
             }