aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel/ninja.html
diff options
context:
space:
mode:
authorArmen Kesablyan2012-02-22 16:26:41 -0800
committerArmen Kesablyan2012-02-22 16:26:41 -0800
commit0bd1cefea2ab350fad1a891bdc926053b799aafc (patch)
tree962f559fcc02a3dfeb297d59907e40fa153453f3 /js/ninja.reel/ninja.html
parent695bc5082f48dddf66ce31480a4faefc067b38bd (diff)
parent2d2b1af8b5c0d506fe6a1cf65614101fec145970 (diff)
downloadninja-0bd1cefea2ab350fad1a891bdc926053b799aafc.tar.gz
Merge branch 'refs/heads/master' into new-tool-icons
Diffstat (limited to 'js/ninja.reel/ninja.html')
-rwxr-xr-x[-rw-r--r--]js/ninja.reel/ninja.html31
1 files changed, 27 insertions, 4 deletions
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index 1db5373e..1393b4b9 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"
@@ -223,11 +228,19 @@
223 228
224 "selectionController1": { 229 "selectionController1": {
225 "module": "js/controllers/selection-controller", 230 "module": "js/controllers/selection-controller",
226 "name": "SelectionController" 231 "name": "SelectionController",
232 "bindings" : {
233 "selectionContainer": {
234 "boundObject": {"@": "owner"},
235 "boundObjectPropertyPath": "currentSelectedContainer",
236 "oneway": true
237 }
238 }
239
227 }, 240 },
228 241
229 "documentController1": { 242 "documentController1": {
230 "module": "js/io/document/document-controller", 243 "module": "js/controllers/document-controller",
231 "name": "DocumentController" 244 "name": "DocumentController"
232 }, 245 },
233 246
@@ -250,14 +263,19 @@
250 }, 263 },
251 264
252 "filePickerController": { 265 "filePickerController": {
253 "module": "js/components/ui/FilePicker/file-picker-controller", 266 "module": "js/io/ui/file-picker/file-picker-controller",
254 "name": "FilePickerController" 267 "name": "FilePickerController"
255 }, 268 },
256 269
257 "newFileController": { 270 "newFileController": {
258 "module": "js/io/workflow/newFileDialog/new-file-workflow-controller", 271 "module": "js/io/ui/new-file-dialog/new-file-workflow-controller",
259 "name": "NewFileWorkflowController" 272 "name": "NewFileWorkflowController"
260 }, 273 },
274
275 "coreIoApi1": {
276 "module": "js/io/system/coreioapi",
277 "name": "CoreIoApi"
278 },
261 279
262 "mainMenuController": { 280 "mainMenuController": {
263 "module": "js/controllers/main-menu-controller", 281 "module": "js/controllers/main-menu-controller",
@@ -269,6 +287,8 @@
269 "name": "Ninja", 287 "name": "Ninja",
270 "properties": { 288 "properties": {
271 "element": {"#": "main"}, 289 "element": {"#": "main"},
290 "rulerTop": {"#": "rulerTop"},
291 "rulerLeft": {"#": "rulerLeft"},
272 "appModel": {"@": "appModel"}, 292 "appModel": {"@": "appModel"},
273 "toolsData": {"@": "toolsData1"}, 293 "toolsData": {"@": "toolsData1"},
274 "toolsList": {"@": "toolsList1"}, 294 "toolsList": {"@": "toolsList1"},
@@ -276,6 +296,7 @@
276 "stage": {"@": "stage1"}, 296 "stage": {"@": "stage1"},
277 "settings": {"@": "settings1"}, 297 "settings": {"@": "settings1"},
278 "elementMediator": {"@": "elementMediator"}, 298 "elementMediator": {"@": "elementMediator"},
299 "dragDropMediator": {"@": "dragDropMediator"},
279 "undocontroller": {"@": "undocontroller1"}, 300 "undocontroller": {"@": "undocontroller1"},
280 "selectionController": {"@": "selectionController1"}, 301 "selectionController": {"@": "selectionController1"},
281 "documentController": {"@": "documentController1"}, 302 "documentController": {"@": "documentController1"},
@@ -284,7 +305,9 @@
284 "stylesController": {"@": "stylesController"}, 305 "stylesController": {"@": "stylesController"},
285 "filePickerController": {"@": "filePickerController"}, 306 "filePickerController": {"@": "filePickerController"},
286 "newFileController": {"@": "newFileController"}, 307 "newFileController": {"@": "newFileController"},
308 "coreIoApi": {"@": "coreIoApi1"},
287 "documentBar": {"@": "documentBar"}, 309 "documentBar": {"@": "documentBar"},
310 "ioMediator": {"@": "ioMediator"},
288 "timeline": {"@": "timeline"}, 311 "timeline": {"@": "timeline"},
289 "mainMenuController": {"@": "mainMenuController"} 312 "mainMenuController": {"@": "mainMenuController"}
290 } 313 }