aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel/ninja.html
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-06-26 13:40:44 -0700
committerJose Antonio Marquez2012-06-26 13:40:44 -0700
commit81747f839bf5d176a15511303f7d2a0e4028e5bb (patch)
tree5afab7fb834f9df27d2bf35f6414a906c27ec598 /js/ninja.reel/ninja.html
parent9ebf80d943b894242d90cf62bc3078c6a83041ad (diff)
parent87a8b62f71bb72274c3dd1fa389e88c12d482ebb (diff)
downloadninja-81747f839bf5d176a15511303f7d2a0e4028e5bb.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into Color
Diffstat (limited to 'js/ninja.reel/ninja.html')
-rwxr-xr-xjs/ninja.reel/ninja.html13
1 files changed, 9 insertions, 4 deletions
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index beae59d9..94db0cac 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -261,10 +261,6 @@
261 } 261 }
262 }, 262 },
263 263
264 "mouseMediator": {
265 "prototype": "js/mediators/mouse-mediator"
266 },
267
268 "keyboardMediator": { 264 "keyboardMediator": {
269 "prototype": "js/mediators/keyboard-mediator", 265 "prototype": "js/mediators/keyboard-mediator",
270 "properties":{ 266 "properties":{
@@ -358,6 +354,14 @@
358 } 354 }
359 }, 355 },
360 356
357 "objectsController" : {
358 "prototype": "js/controllers/objects-controller",
359 "bindings": {
360 "currentDocument": {"<-": "@documentList.selectedObjects.0"},
361 "objects": {"<-": "@documentList.selectedObjects.0.model.mObjects"}
362 }
363 },
364
361 "clipboardController": { 365 "clipboardController": {
362 "prototype": "js/controllers/clipboard-controller" 366 "prototype": "js/controllers/clipboard-controller"
363 }, 367 },
@@ -391,6 +395,7 @@
391 "timeline": {"@": "timeline"}, 395 "timeline": {"@": "timeline"},
392 "mainMenuController": {"@": "mainMenuController"}, 396 "mainMenuController": {"@": "mainMenuController"},
393 "codeEditorController": {"@": "codeEditorController"}, 397 "codeEditorController": {"@": "codeEditorController"},
398 "objectsController": {"@": "objectsController"},
394 "rightPanelContainer": {"#": "rightPanelContainer" }, 399 "rightPanelContainer": {"#": "rightPanelContainer" },
395 "panelSplitter": {"@": "splitter3"}, 400 "panelSplitter": {"@": "splitter3"},
396 "timelineSplitter": {"@": "splitter4"}, 401 "timelineSplitter": {"@": "splitter4"},