Merge branch 'refs/heads/TimelineUberjd' into TimelineUber

Conflicts:
	js/panels/Timeline/Layer.reel/Layer.js

Signed-off-by: Kruti Shah <kruti.shah@motorola.com>

4 files changed, 54 insertions, 6 deletions

diff --git a/js/controllers/elements/body-controller.js b/js/controllers/elements/body-controller.js
index 14aeae24..7a3a66f5 100755
--- a/js/controllers/elements/body-controller.js
+++ b/js/controllers/elements/body-controller.js
@@ -13,7 +13,7 @@ exports.BodyController = Montage.create(ElementController, {
     set3DProperties: {
         value: function(el, props, update3DModel) {
             var dist = props["dist"], mat = props["mat"];
-            this.application.ninja.stylesController.setElementStyle(el, "-webkit-transform", "perspective(" + dist + ") " + "matrix3d(" + MathUtils.scientificToDecimal(mat, 5) + ")", true);
+            this.application.ninja.stylesController.setElementStyle(el, "-webkit-transform", "perspective(" + dist + ") " + "matrix3d(" + MathUtils.scientificToDecimal(mat, 5) + ")");
 
             el.elementModel.props3D.matrix3d = mat;
             el.elementModel.props3D.perspectiveDist = dist;
@@ -28,11 +28,39 @@ exports.BodyController = Montage.create(ElementController, {
 
     getProperty: {
         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 "border":
+                    return 0;
+                case "height":
+                case "width":
+                case "-webkit-transform-style":
+                    return this.application.ninja.stylesController.getElementStyle(el, p, true, true);
+                default:
+                    return ElementController.getProperty(el, p, true, true);
+                    //console.log("Undefined Stage property ", p);
+            }
         }
     },
 
     setProperty: {
         value: function(el, p, value) {
+            switch(p) {
+                case "body-background":
+                case "background":
+                    this.application.ninja.stylesController.setElementStyle(el, "background-color", value);
+                    break;
+                case "overflow":
+                case "width":
+                case "height":
+                case "-webkit-transform-style":
+                    this.application.ninja.stylesController.setElementStyle(el, p, value);
+                    this.application.ninja.stage.updatedStage = true;
+                    break;
+                default:
+                    console.log("Undefined property ", p, "for the Body Controller");
+            }
         }
     },
 
diff --git a/js/controllers/elements/component-controller.js b/js/controllers/elements/component-controller.js
index d902e4a1..5b0aaeac 100755
--- a/js/controllers/elements/component-controller.js
+++ b/js/controllers/elements/component-controller.js
@@ -11,7 +11,7 @@ exports.ComponentController = Montage.create(ElementController, {
 
     getProperty: {
         value: function(el, prop) {
-            var component = el.controller || this.application.ninja.currentDocument.getComponentFromElement(el);
+            var component = el.controller || this.application.ninja.currentDocument.model.getComponentFromElement(el);
 
             switch(prop) {
                 case "id":
@@ -34,7 +34,7 @@ exports.ComponentController = Montage.create(ElementController, {
 
     setProperty: {
         value: function(el, p, value) {
-            var component = el.controller || this.application.ninja.currentDocument.getComponentFromElement(el);
+            var component = el.controller || this.application.ninja.currentDocument.model.getComponentFromElement(el);
 
             switch(p) {
                 case "id":
diff --git a/js/controllers/elements/element-controller.js b/js/controllers/elements/element-controller.js
index 20225c61..675176e9 100755
--- a/js/controllers/elements/element-controller.js
+++ b/js/controllers/elements/element-controller.js
@@ -11,13 +11,32 @@ exports.ElementController = Montage.create(Component, {
 
     addElement: {
         value: function(el, styles) {
+                // Updated to use new methods in TimelinePanel. JR.
+                var insertionIndex = this.application.ninja.timeline.getInsertionIndex();
+                if (insertionIndex === false) {
+                        this.application.ninja.currentSelectedContainer.appendChild(el);
+                } else {
+                        if (insertionIndex === 0) {
+                                this.application.ninja.currentSelectedContainer.appendChild(el);
+                        } else {
+                    var element = this.application.ninja.timeline.arrLayers[insertionIndex].layerData.stageElement;
+                    element.parentNode.insertBefore(el, element.nextSibling);
+                        }
+                }
+                
+            if(styles) {
+                this.application.ninja.stylesController.setElementStyles(el, styles);
+            }
+                
+                /*
+                        // Old methods. Kept for reference. Delete if not needed. JR.
             if(this.application.ninja.timeline.currentLayerSelected) {
                 var selectedLayerIndex = this.application.ninja.timeline.getLayerIndexByID(this.application.ninja.timeline.currentLayerSelected.layerData.layerID);
 
                 if(selectedLayerIndex === 0) {
                     this.application.ninja.currentSelectedContainer.appendChild(el);
                 } else {
-                    var element = this.application.ninja.timeline.arrLayers[selectedLayerIndex].layerData.elementsList[0];
+                    var element = this.application.ninja.timeline.arrLayers[selectedLayerIndex].layerData.stageElement;
                     element.parentNode.insertBefore(el, element.nextSibling);
                 }
             } else {
@@ -27,6 +46,7 @@ exports.ElementController = Montage.create(Component, {
             if(styles) {
                 this.application.ninja.stylesController.setElementStyles(el, styles);
             }
+            */
         }
     },
 
diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js
index e9a5f865..38f133b5 100755
--- a/js/controllers/elements/shapes-controller.js
+++ b/js/controllers/elements/shapes-controller.js
@@ -213,7 +213,7 @@ exports.ShapesController = Montage.create(CanvasController, {
                 default:
                     CanvasController.setProperty(el, p, value);
             }
-            this.application.ninja.documentController.activeDocument.needsSave = true;
+            this.application.ninja.documentController.activeDocument.model.needsSave = true;
         }
     },
 
@@ -559,7 +559,7 @@ exports.ShapesController = Montage.create(CanvasController, {
                 }
             }
             el.elementModel.shapeModel.GLWorld.render();
-            this.application.ninja.documentController.activeDocument.needsSave = true;
+            this.application.ninja.documentController.activeDocument.model.needsSave = true;
         }
     },