6 files changed, 34 insertions, 35 deletions

diff --git a/js/controllers/elements/body-controller.js b/js/controllers/elements/body-controller.js
index 7a3a66f5..0dc11b82 100755
--- a/js/controllers/elements/body-controller.js
+++ b/js/controllers/elements/body-controller.js
@@ -30,7 +30,8 @@ exports.BodyController = Montage.create(ElementController, {
         value: function(el, p) {
             switch(p) {
                 case "background" :
-                    return this.application.ninja.colorController.getColorObjFromCss(this.application.ninja.stylesController.getElementStyle(el, "background-color", false, true));
+                case "background-color":
+                    return this.application.ninja.colorController.getColorObjFromCss(this.application.ninja.stylesController.getElementStyle(el, "background-color"));
                 case "border":
                     return 0;
                 case "height":
@@ -47,8 +48,8 @@ exports.BodyController = Montage.create(ElementController, {
     setProperty: {
         value: function(el, p, value) {
             switch(p) {
-                case "body-background":
                 case "background":
+                case "background-color":
                     this.application.ninja.stylesController.setElementStyle(el, "background-color", value);
                     break;
                 case "overflow":
@@ -71,7 +72,7 @@ exports.BodyController = Montage.create(ElementController, {
 
     getPerspectiveDist: {
         value: function(el) {
-            if(el.elementModel && el.elementModel.props3D && el.elementModel.props3D.perspectiveDist) {
+            if(el.elementModel.props3D && el.elementModel.props3D.perspectiveDist) {
                 return el.elementModel.props3D.perspectiveDist;
             } else {
                 var dist = this.application.ninja.stylesController.getPerspectiveDistFromElement(el, true);
@@ -83,7 +84,7 @@ exports.BodyController = Montage.create(ElementController, {
 
     getMatrix: {
         value: function(el) {
-            if(el.elementModel && el.elementModel.props3D && el.elementModel.props3D.matrix3d)
+            if(el.elementModel.props3D && el.elementModel.props3D.matrix3d)
             {
                 return el.elementModel.props3D.matrix3d.slice(0);
             }
diff --git a/js/controllers/elements/controller-factory.js b/js/controllers/elements/controller-factory.js
index 3ac3fe14..2d2a5cd1 100755
--- a/js/controllers/elements/controller-factory.js
+++ b/js/controllers/elements/controller-factory.js
@@ -8,7 +8,6 @@ var Montage         = require("montage/core/core").Montage;
 
 var BodyController = require("js/controllers/elements/body-controller").BodyController,
     BlockController = require("js/controllers/elements/block-controller").BlockController,
-    StageController = require("js/controllers/elements/stage-controller").StageController,
     ShapesController = require("js/controllers/elements/shapes-controller").ShapesController,
         ImageController = require("js/controllers/elements/image-controller").ImageController,
     VideoController = require("js/controllers/elements/video-controller").VideoController,
@@ -27,7 +26,8 @@ exports.ControllerFactory = Montage.create(Montage, {
                 if(value.indexOf("block") !== -1) {
                     return BlockController;
                 } else if(value.indexOf("stage") !== -1) {
-                    return StageController;
+//                    return StageController;
+                    alert("Calling the stage controller. Should not be calling this object");
                 } else if(value.indexOf("body") !== -1) {
                     return BodyController;
                 } else if(value.indexOf("shape") !== -1) {
diff --git a/js/controllers/elements/element-controller.js b/js/controllers/elements/element-controller.js
index 941e05ba..e40a646a 100755
--- a/js/controllers/elements/element-controller.js
+++ b/js/controllers/elements/element-controller.js
@@ -19,13 +19,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.elementsList[0];
                     element.parentNode.insertBefore(el, element.nextSibling);
                 }
             } else {
-                this.application.ninja.currentSelectedContainer.appendChild(el);
+                this.application.ninja.currentDocument.model.domContainer.appendChild(el);
             }
 
             if(styles) {
@@ -37,7 +37,7 @@ exports.ElementController = Montage.create(Component, {
     // Remove the element from the DOM and clear the GLWord.
     removeElement: {
         value: function(el) {
-            if(el.elementModel && el.elementModel.shapeModel && el.elementModel.shapeModel.GLWorld) {
+            if(el.elementModel.shapeModel && el.elementModel.shapeModel.GLWorld) {
                 el.elementModel.shapeModel.GLWorld.clearTree();
             }
             el.parentNode.removeChild(el);
@@ -277,7 +277,7 @@ exports.ElementController = Montage.create(Component, {
     // Routines to get/set 3D properties
     get3DProperty: {
         value: function(el, prop) {
-            if(el.elementModel && el.elementModel.props3D) {
+            if(el.elementModel.props3D) {
                 return el.elementModel.props3D[prop];
             }
         }
@@ -285,7 +285,7 @@ exports.ElementController = Montage.create(Component, {
 
     getMatrix: {
         value: function(el) {
-            if(el.elementModel && el.elementModel.props3D && el.elementModel.props3D.matrix3d) {
+            if(el.elementModel.props3D && el.elementModel.props3D.matrix3d) {
                 return el.elementModel.props3D.matrix3d.slice(0);
             } else {
                 var mat;
@@ -305,7 +305,7 @@ exports.ElementController = Montage.create(Component, {
 
     getPerspectiveDist: {
         value: function(el) {
-            if(el.elementModel && el.elementModel.props3D && el.elementModel.props3D.perspectiveDist) {
+            if(el.elementModel.props3D && el.elementModel.props3D.perspectiveDist) {
                 return el.elementModel.props3D.perspectiveDist;
             } else {
                 var dist = this.application.ninja.stylesController.getPerspectiveDistFromElement(el, false);
diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js
index 845e7dc2..9fc9b576 100755
--- a/js/controllers/elements/shapes-controller.js
+++ b/js/controllers/elements/shapes-controller.js
@@ -133,7 +133,7 @@ exports.ShapesController = Montage.create(CanvasController, {
                     canvas.setAttribute("data-RDGE-id", njModule.NJUtils.generateRandom());
                     canvas.width = el.width;
                     canvas.height = el.height;
-                    canvas.elementModel = el.elementModel;
+                    canvas._model = el.elementModel;
                     this.toggleWebGlMode(canvas, value);
                     this.application.ninja.elementMediator.replaceElement(canvas, el);
                     break;
diff --git a/js/controllers/selection-controller.js b/js/controllers/selection-controller.js
index 4bca0755..9ae1cfc9 100755
--- a/js/controllers/selection-controller.js
+++ b/js/controllers/selection-controller.js
@@ -35,7 +35,7 @@ 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.model.selectionContainer = this.application.ninja._currentSelectedContainer;
             }
 
             this._currentDocument = value;
@@ -65,7 +65,7 @@ exports.SelectionController = Montage.create(Component, {
                 this._selectedElements = value;
 
                 this.application.ninja.selectedElements = this._selectedElements;
-                this.application.ninja._currentSelectedContainer = this._selectionContainer = this.application.ninja.currentDocument.model.documentRoot;
+//                this.application.ninja._currentSelectedContainer = this._selectionContainer = this.application.ninja.currentDocument.model.documentRoot;
 
                 if(this._selectedElements.length === 0) {
                     this.executeSelectElement();
@@ -78,30 +78,24 @@ exports.SelectionController = Montage.create(Component, {
         }
     },
 
-    // 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;