diff options
author | Armen Kesablyan | 2012-05-17 13:33:28 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-05-17 13:33:28 -0700 |
commit | ee3702894b5c69a74f47b22aa5f2c8f58ad0179c (patch) | |
tree | 7b4dba1e5a4212c770c95aef9e45c81ce5626007 /js/ninja.reel/ninja.html | |
parent | c8d61c8e72e0eba266575f9df54325fa77fde73d (diff) | |
parent | 7e94d5786df400b599df3233b3086bfe9eff2bde (diff) | |
download | ninja-ee3702894b5c69a74f47b22aa5f2c8f58ad0179c.tar.gz |
Merge pull request #3 from ericguzman/binding
Binding: Objects Panel Initialization
Diffstat (limited to 'js/ninja.reel/ninja.html')
-rwxr-xr-x | js/ninja.reel/ninja.html | 5 |
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"}, |