aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel/ninja.html
diff options
context:
space:
mode:
authorValerio Virgillito2012-02-14 11:07:21 -0800
committerValerio Virgillito2012-02-14 11:07:21 -0800
commitf060190a3bffd9a16718f2ce0499699103d46372 (patch)
treea308fe7eacec2156c8212dff0892a3de925d5f9a /js/ninja.reel/ninja.html
parentf766cc203f30ea43ae8b83cf4b65d45cc4435ee9 (diff)
parent33bc9d62b8e6694500bf14d5b18187bd99a520a3 (diff)
downloadninja-f060190a3bffd9a16718f2ce0499699103d46372.tar.gz
Merge branch 'FileIO' of https://github.com/joseeight/ninja-internal into integration
Diffstat (limited to 'js/ninja.reel/ninja.html')
-rwxr-xr-x[-rw-r--r--]js/ninja.reel/ninja.html18
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 @@
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"},
@@ -284,7 +296,9 @@
284 "stylesController": {"@": "stylesController"}, 296 "stylesController": {"@": "stylesController"},
285 "filePickerController": {"@": "filePickerController"}, 297 "filePickerController": {"@": "filePickerController"},
286 "newFileController": {"@": "newFileController"}, 298 "newFileController": {"@": "newFileController"},
299 "coreIoApi": {"@": "coreIoApi1"},
287 "documentBar": {"@": "documentBar"}, 300 "documentBar": {"@": "documentBar"},
301 "ioMediator": {"@": "ioMediator"},
288 "timeline": {"@": "timeline"}, 302 "timeline": {"@": "timeline"},
289 "mainMenuController": {"@": "mainMenuController"} 303 "mainMenuController": {"@": "mainMenuController"}
290 } 304 }