6 files changed, 588 insertions, 65 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/component-controller.js b/js/controllers/elements/component-controller.js
index 5b0aaeac..dd0766df 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.model.getComponentFromElement(el);
+            var component = el.controller;
 
             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.model.getComponentFromElement(el);
+            var component = el.controller;
 
             switch(p) {
                 case "id":
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 da8afbaa..3d71c52d 100755
--- a/js/controllers/elements/element-controller.js
+++ b/js/controllers/elements/element-controller.js
@@ -5,12 +5,16 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 </copyright> */
 
 var Montage = require("montage/core/core").Montage,
-    Component = require("montage/ui/component").Component;
+    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) {
@@ -53,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);
@@ -179,32 +183,12 @@ exports.ElementController = Montage.create(Component, {
                             el.elementModel.stroke = null;
                             return;
                         case 'gradient':
-                            this.setProperty(el, "border-image", color.color.css);
-                            this.setProperty(el, "border-color", "none");
-                            if(color.borderInfo) {
-                                if(color.borderInfo.borderWidth) {
-                                    this.setProperty(el, "border-width", color.borderInfo.borderWidth + color.borderInfo.borderUnits);
-                                }
-                                if(color.borderInfo.borderStyle) {
-                                    this.setProperty(el, "border-style", color.borderInfo.borderStyle);
-                                }
-                            }
+                            this.setGradientBorder(el, color.color.gradientMode, color.color.css);
                             break;
                         default:
-                            if(borderSide){
-                                this.setProperty(el,"border-"+borderSide+"-color",color.color.css);
-                            }else{
-                                this.setProperty(el, "border-image", "none");
-                                this.setProperty(el, "border-color", color.color.css);
-                            }
-                            if(color.borderInfo) {
-                                if(color.borderInfo.borderWidth) {
-                                    this.setProperty(el, "border-width", color.borderInfo.borderWidth + color.borderInfo.borderUnits);
-                                }
-                                if(color.borderInfo.borderStyle) {
-                                    this.setProperty(el, "border-style", color.borderInfo.borderStyle);
-                                }
-                            }
+                            this.setProperty(el, "border-image", "none");
+                            this.setProperty(el, "border-image-slice", "");
+                            this.setProperty(el, "border-color", color.color.css);
                     }
                 }
                 el.elementModel.stroke = color;
@@ -212,26 +196,108 @@ exports.ElementController = Montage.create(Component, {
         }
     },
 
+    setGradientBorder: {
+        value: function(el, gradientMode, css) {
+            if(gradientMode === "radial") {
+                this.setProperty(el, "border-image", css.replace("ellipse", "circle"));
+            } else {
+                this.setProperty(el, "border-image", css);
+            }
+            this.setProperty(el, "border-color", "none");
+            // gradient slice = borderWidth/totalWidth
+            var b = parseInt(this.getProperty(el, "border-left-width", true)),
+                w = parseInt(this.getProperty(el, "width", true)),
+                h = parseInt(this.getProperty(el, "height", true));
+            if(h > w) {
+                w = h;
+            }
+            this.setProperty(el, "border-image-slice", Math.floor(b/(w+b+b) * 100) + "%");
+        }
+    },
+
     getStroke: {
-        value: function(el) {
-            // TODO - Need to figure out which border side user wants
+        value: function(el, stroke) {
+            var strokeInfo = {},