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>

2 files changed, 34 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"},
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js
index 0d355eaa..859268a0 100755
--- a/js/ninja.reel/ninja.js
+++ b/js/ninja.reel/ninja.js
@@ -191,9 +191,33 @@ exports.Ninja = Montage.create(Component, {
         }
     },
 
+        _workspaceMode: {
+        value: null
+    },
+
+    workspaceMode: {
+        get: function() {
+            return this._workspaceMode;
+        },
+        set: function(val) {
+            if(this._workspaceMode !== val ) {
+                if(this._workspaceMode !== null) {
+                   document.body.classList.remove("ws-" + this._workspaceMode);
+                }
+                document.body.classList.add("ws-" + val);
+                this._workspaceMode = val;
+            }
+        }
+    },
+
+    _isResizing: {
+        value: null
+    },
+
     _resizedHeight : {
         value: 0
     },
+
     _height: {
         value: null
     },
@@ -307,6 +331,7 @@ exports.Ninja = Montage.create(Component, {
 
     prepareForDraw: {
         value: function() {
+            this.workspaceMode = "default";
             console.log("Loading Ninja --> ", this.ninjaVersion);
 
             this.application.ninja = this;