Merge remote-tracking branch 'ninja-internal/master' into test-merge

Conflicts:
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
	js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
	js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js

3 files changed, 9 insertions, 29 deletions

diff --git a/js/controllers/elements/body-controller.js b/js/controllers/elements/body-controller.js
index 0dc11b82..27989c65 100755
--- a/js/controllers/elements/body-controller.js
+++ b/js/controllers/elements/body-controller.js
@@ -37,7 +37,7 @@ exports.BodyController = Montage.create(ElementController, {
                 case "height":
                 case "width":
                 case "-webkit-transform-style":
-                    return this.application.ninja.stylesController.getElementStyle(el, p, true, true);
+                    return this.application.ninja.stylesController.getElementStyle(el, p);
                 default:
                     return ElementController.getProperty(el, p, true, true);
                     //console.log("Undefined Stage property ", p);
diff --git a/js/controllers/elements/element-controller.js b/js/controllers/elements/element-controller.js
index 3d71c52d..a474961a 100755
--- a/js/controllers/elements/element-controller.js
+++ b/js/controllers/elements/element-controller.js
@@ -38,13 +38,13 @@ exports.ElementController = Montage.create(Component, {
                 var selectedLayerIndex = this.application.ninja.timeline.getLayerIndexByID(this.application.ninja.timeline.currentLayerSelected.layerData.layerID);
 
                 if(selectedLayerIndex === 0) {
-                    this.application.ninja.currentSelectedContainer.appendChild(el);
+                    this.application.ninja.currentDocument.model.domContainer.appendChild(el);
                 } else {
                     var element = this.application.ninja.timeline.arrLayers[selectedLayerIndex].layerData.stageElement;
                     element.parentNode.insertBefore(el, element.nextSibling);
                 }
             } else {
-                this.application.ninja.currentSelectedContainer.appendChild(el);
+                this.application.ninja.currentDocument.model.domContainer.appendChild(el);
             }
 
             if(styles) {
diff --git a/js/controllers/selection-controller.js b/js/controllers/selection-controller.js
index 4bca0755..b327bea4 100755
--- a/js/controllers/selection-controller.js
+++ b/js/controllers/selection-controller.js
@@ -35,11 +35,13 @@ exports.SelectionController = Montage.create(Component, {
 
             if(this._currentDocument && this._currentDocument.currentView === "design") {
                 this._currentDocument.model._selection = this.application.ninja.selectedElements;
-                this._currentDocument.model.selectionContainer = this.application.ninja._currentSelectedContainer;
             }
 
             this._currentDocument = value;
 
+            if(this._currentDocument && this._currentDocument.currentView === "design") {
+                this.selectedElements = this._currentDocument.model.selection;
+            }
             /*
             if(!value) {
             } else if(this._currentDocument.currentView === "design") {
@@ -59,43 +61,21 @@ exports.SelectionController = Montage.create(Component, {
             return this._selectedElements;
         },
         set: function(value) {
-            if(this.currentDocument && this.currentDocument.currentView === "code") return;
 
             if(value) {
                 this._selectedElements = value;
 
                 this.application.ninja.selectedElements = this._selectedElements;
-                this.application.ninja._currentSelectedContainer = this._selectionContainer = this.application.ninja.currentDocument.model.documentRoot;
 
                 if(this._selectedElements.length === 0) {
                     this.executeSelectElement();
                 } else {
                     this.executeSelectElement(this._selectedElements);
                 }
-
-
             }
         }
     },
 
-    // Bound property to the ninja currentSelectedContainer
-    _selectionContainer: {
-        value: null
-    },
-
-    selectionContainer: {
-        get: function() {
-            return this._selectionContainer
-        },
-        set: function(value) {
-            if(this._selectionContainer && this._selectionContainer !== value) {
-                this.executeSelectElement();
-            }
-
-            this._selectionContainer = value;
-        }
-    },
-
     deserializedFromTemplate: {
         value: function() {
             this.eventManager.addEventListener("elementAdded", this, false);
@@ -131,7 +111,7 @@ exports.SelectionController = Montage.create(Component, {
         value: function(event) {
             var selected = [], childNodes = [], self = this;
 
-            childNodes = this.application.ninja.currentDocument.model.documentRoot.childNodes;
+            childNodes = this.currentDocument.model.domContainer.childNodes;
             childNodes = Array.prototype.slice.call(childNodes, 0);
             childNodes.forEach(function(item) {
                 if(self.isNodeTraversable(item)) {
@@ -175,12 +155,12 @@ exports.SelectionController = Montage.create(Component, {
                     if(this.isDocument) return;     // If the stage is already selected do nothing.
                     this.executeSelectElement();    // Else execute selection with no element
                 } else {
-                    if(element.parentNode.uuid === this.selectionContainer.uuid) {
+                    if(element.parentNode.uuid === this.currentDocument.model.domContainer.uuid) {
                         this.executeSelectElement(element);
                     } else {
                         var outerElement = element.parentNode;
 
-                        while(outerElement.parentNode && outerElement.parentNode.uuid !== this.selectionContainer.uuid) {
+                        while(outerElement.parentNode && outerElement.parentNode.uuid !== this.currentDocument.model.domContainer.uuid) {
                             // If element is higher up than current container then return
                             if(outerElement.nodeName === "BODY") return;
                             // else keep going up the chain