Merge branch 'FileIO' of https://github.com/joseeight/ninja-internal into integration

1 files changed, 16 insertions, 2 deletions

diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index c8625159..9a1a6b97 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"},
@@ -284,7 +296,9 @@
                     "stylesController":     {"@": "stylesController"},
                     "filePickerController": {"@": "filePickerController"},
                     "newFileController":    {"@": "newFileController"},
+                    "coreIoApi":                {"@": "coreIoApi1"},
                     "documentBar":          {"@": "documentBar"},
+                    "ioMediator":           {"@": "ioMediator"},
                     "timeline":             {"@": "timeline"},
                     "mainMenuController":   {"@": "mainMenuController"}
                 }