Merge branch 'refs/heads/ninja-internal-master' into bugfix-master

Conflicts:
	js/ninja.reel/ninja.html

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

1 files changed, 9 insertions, 0 deletions

diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index fcf6779d..5429e7d0 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -353,6 +353,14 @@
                 }
             },
 
+            "objectsController" : {
+                "prototype": "js/controllers/objects-controller",
+                "bindings": {
+                    "currentDocument": {"<-": "@documentList.selectedObjects.0"},
+                    "objects": {"<-": "@documentList.selectedObjects.0.model.mObjects"}
+                }
+            },
+
             "clipboardController": {
                 "prototype": "js/controllers/clipboard-controller"
             },
@@ -386,6 +394,7 @@
                     "timeline":             {"@": "timeline"},
                     "mainMenuController":   {"@": "mainMenuController"},
                     "codeEditorWrapper": {"@": "codeEditorWrapper"},
+                    "objectsController":    {"@": "objectsController"},
                     "rightPanelContainer":  {"#": "rightPanelContainer" },
                     "panelSplitter":        {"@": "splitter3"},
                     "timelineSplitter":     {"@": "splitter4"},