aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel
diff options
context:
space:
mode:
authorEric Guzman2012-05-16 22:58:24 -0700
committerEric Guzman2012-05-16 22:58:24 -0700
commit7e94d5786df400b599df3233b3086bfe9eff2bde (patch)
tree7b4dba1e5a4212c770c95aef9e45c81ce5626007 /js/ninja.reel
parenta40184e08a7ee2f189f133fd7bd83480e4bfc7f2 (diff)
downloadninja-7e94d5786df400b599df3233b3086bfe9eff2bde.tar.gz
Objects Panel - Add Objects controller and montage/application hack to expose template
Diffstat (limited to 'js/ninja.reel')
-rwxr-xr-xjs/ninja.reel/ninja.html5
1 files changed, 5 insertions, 0 deletions
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index 52a6daa2..7c3bc2c4 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -321,6 +321,10 @@
321 "prototype": "js/controllers/code-editor-controller" 321 "prototype": "js/controllers/code-editor-controller"
322 }, 322 },
323 323
324 "objectsController" : {
325 "prototype": "js/controllers/objects-controller"
326 },
327
324 "owner": { 328 "owner": {
325 "prototype": "js/ninja.reel", 329 "prototype": "js/ninja.reel",
326 "properties": { 330 "properties": {
@@ -350,6 +354,7 @@
350 "timeline": {"@": "timeline"}, 354 "timeline": {"@": "timeline"},
351 "mainMenuController": {"@": "mainMenuController"}, 355 "mainMenuController": {"@": "mainMenuController"},
352 "codeEditorController": {"@": "codeEditorController"}, 356 "codeEditorController": {"@": "codeEditorController"},
357 "objectsController": {"@": "objectsController"},
353 "rightPanelContainer": {"#": "rightPanelContainer" }, 358 "rightPanelContainer": {"#": "rightPanelContainer" },
354 "panelSplitter": {"@": "splitter3"}, 359 "panelSplitter": {"@": "splitter3"},
355 "timelineSplitter": {"@": "splitter4"}, 360 "timelineSplitter": {"@": "splitter4"},