aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel/ninja.html
diff options
context:
space:
mode:
authorJon Reid2012-06-26 14:58:10 -0700
committerJon Reid2012-06-26 14:58:10 -0700
commit2599f74d72293b809929d8a0b36fb8e721f194cd (patch)
treeca4cd45b23b8debea32f95d7dea807c77b6633b2 /js/ninja.reel/ninja.html
parentab9d14780eed98f39786fae4518e69861b34bad7 (diff)
parente4304b9ac6c58802de4dd334be1f5802533f5160 (diff)
downloadninja-2599f74d72293b809929d8a0b36fb8e721f194cd.tar.gz
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
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"},