Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures

Conflicts:
	assets/canvas-runtime.js
	js/io/system/ninjalibrary.json
	js/mediators/element-mediator.js

2 files changed, 1 insertions, 22 deletions

diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index a98fca60..38b956bd 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -246,7 +246,7 @@
                     "element":{"#" : "breadCrumbComponent"}
                 },
                 "bindings" : {
-                    "container": {"<-": "@owner.currentSelectedContainer"},
+
                     "currentDocument": {"<-": "@documentList.selectedObjects.0"}
                 }
             },
@@ -291,7 +291,6 @@
             "selectionController": {
                 "prototype": "js/controllers/selection-controller",
                 "bindings" : {
-                    "selectionContainer": {"<-": "@owner.currentSelectedContainer"},
                     "currentDocument": {"<-": "@documentList.selectedObjects.0"},
                     "selectedElements": {"<-": "@documentList.selectedObjects.0.model.selection"}
                 }
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js
index 38f5efcf..b57aecd2 100755
--- a/js/ninja.reel/ninja.js
+++ b/js/ninja.reel/ninja.js
@@ -147,21 +147,6 @@ exports.Ninja = Montage.create(Component, {
         value: []
     },
 
-    _currentSelectedContainer: {
-        value: null
-    },
-
-    currentSelectedContainer: {
-        get: function() {
-            return this._currentSelectedContainer;
-        },
-        set: function(value) {
-            if(value !== this._currentSelectedContainer) {
-                this._currentSelectedContainer = value;
-            }
-        }
-    },
-
     templateDidLoad: {
         value: function() {
             this.ninjaVersion = window.ninjaVersion.ninja.version;
@@ -321,11 +306,6 @@ exports.Ninja = Montage.create(Component, {
             // TODO: Remove this when integrating the next montage
             this.documentList.selectedObjects = [doc];
 
-            if(doc.currentView === "design") {
-                // TODO: Bind directly to the model of the document in components instead of this property
-                this._currentSelectedContainer = null;
-                this.currentSelectedContainer = doc.model.documentRoot;
-            }
         }
     },