1 files changed, 101 insertions, 35 deletions

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
-            return this.application.ninja.stylesController.getElementStyle(el, "border");
+        value: function(el, stroke) {
+            var strokeInfo = {},
+                color,
+                borderWidth,
+                border;
+            if(stroke.colorInfo) {
+                strokeInfo.colorInfo = {};
+                color = this.getColor(el, false);
+                if(color && color.color) {
+                    strokeInfo.colorInfo.mode = color.mode;
+                    strokeInfo.colorInfo.color = color.color;
+                } else {
+                    strokeInfo.colorInfo.mode = "nocolor";
+                    strokeInfo.colorInfo.color = null;
+                }
+            }
+            if(stroke.borderInfo) {
+                // TODO - Need to figure out which border side user wants
+                strokeInfo.borderInfo = {};
+                if(stroke.borderInfo.borderWidth) {
+                    borderWidth = this.getProperty(el, "border-width");
+                    if(borderWidth) {
+                        border = njModule.NJUtils.getValueAndUnits(borderWidth);
+                        strokeInfo.borderInfo.borderWidth = border[0];
+                        strokeInfo.borderInfo.borderUnits = border[1];
+                    }
+                }
+                if(stroke.borderInfo.borderStyle) {
+                    strokeInfo.borderInfo.borderStyle = this.getProperty(el, "border-style");
+                }
+            }
+            return strokeInfo;
         }
     },
 
     setStroke: {
         value: function(el, stroke) {
-            this.application.ninja.stylesController.setElementStyle(el, "border-width", stroke.borderWidth + stroke.borderUnits);
-            this.application.ninja.stylesController.setElementStyle(el, "border-style", stroke.borderStyle);
-            this.setColor(el, stroke.color, false);
+            if(stroke.borderInfo) {
+                if(stroke.borderInfo.borderWidth) {
+                    this.application.ninja.stylesController.setElementStyle(el, "border-width", stroke.borderInfo.borderWidth + stroke.borderInfo.borderUnits);
+                }
+                if(stroke.borderInfo.borderStyle) {
+                    this.application.ninja.stylesController.setElementStyle(el, "border-style", stroke.borderInfo.borderStyle);
+                }
+            }
+            if(stroke.colorInfo) {
+                this.setColor(el, stroke.colorInfo, false);
+            }
         }
     },
 
+    getFill: {
+        value: function(el, fill) {
+            var fillInfo = {},
+                color;
+            if(fill.colorInfo) {
+                fillInfo.colorInfo = {};
+                color = this.getColor(el, true);
+                if(color && color.color) {
+                    fillInfo.colorInfo.mode = color.mode;
+                    fillInfo.colorInfo.color = color.color;
+                } else {
+                    fillInfo.colorInfo.mode = "nocolor";
+                    fillInfo.colorInfo.color = null;
+                }
+            }
+            return fillInfo;
+        }
+    },
+
+    setFill: {
+        value: function(el, fill) {
+            if(fill.colorInfo) {
+                this.setColor(el, fill.colorInfo, true);
+            }
+        }
+    },
     //--------------------------------------------------------------------------------------------------------
     // 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];
             }
         }
@@ -239,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;
@@ -259,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) {