Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local

6 files changed, 417 insertions, 19 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 308e598b..3d71c52d 100755
--- a/js/controllers/elements/element-controller.js
+++ b/js/controllers/elements/element-controller.js
@@ -57,7 +57,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);
@@ -103,24 +103,24 @@ exports.ElementController = Montage.create(Component, {
 
             // Return cached value if one exists
             if(isFill) {
-                if(el.elementModel.fill) {
-                    return el.elementModel.fill;
-                }
+//                if(el.elementModel.fill) {
+//                    return el.elementModel.fill;
+//                }
                 //TODO: Once logic for color and gradient is established, this needs to be revised
                 color = this.getProperty(el, "background-color");
                 image = this.getProperty(el, "background-image");
             } else {
                 // Try getting border color from specific side first
                 if(borderSide) {
-                    color = this.getProperty(el, "border-" + borderSide + "-color");
+                    color = this.getProperty(el, "border-" + borderSide + "-color",true);
                     image = this.getProperty(el, "border-" + borderSide + "-image");
                 }
 
                 // If no color was found, look up the shared border color
                 if(!color && !image) {
-                    if(el.elementModel.stroke) {
-                        return el.elementModel.stroke;
-                    }
+//                    if(el.elementModel.stroke) {
+//                        return el.elementModel.stroke;
+//                    }
 
                     color = this.getProperty(el, "border-color");
                     image = this.getProperty(el, "border-image");
@@ -152,7 +152,7 @@ exports.ElementController = Montage.create(Component, {
     },
 
     setColor: {
-        value: function(el, color, isFill) {
+        value: function(el, color, isFill,borderSide) {
             var mode = color.mode;
 
             if(isFill) {
@@ -297,7 +297,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];
             }
         }
@@ -305,7 +305,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;
@@ -325,7 +325,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/element-controller.js.orig b/js/controllers/elements/element-controller.js.orig
new file mode 100755
index 00000000..bf631d61
--- /dev/null
+++ b/js/controllers/elements/element-controller.js.orig
@@ -0,0 +1,393 @@
+/* <copyright>
+This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+(c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+</copyright> */
+
+var Montage = require("montage/core/core").Montage,
+    Component = require("montage/ui/component").Component,
+    njModule = require("js/lib/NJUtils");
+
+exports.ElementController = Montage.create(Component, {
+
+    addElement: {
+        value: function(el, styles) {
+        
+                if (el.getAttribute) el.setAttribute('data-ninja-node', 'true');
+                
+                // 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);