3 files changed, 155 insertions, 44 deletions

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/element-controller.js b/js/controllers/elements/element-controller.js
index 01e132d7..941e05ba 100755
--- a/js/controllers/elements/element-controller.js
+++ b/js/controllers/elements/element-controller.js
@@ -5,7 +5,8 @@ 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, {
 
@@ -162,28 +163,12 @@ exports.ElementController = Montage.create(Component, {
                             el.elementModel.stroke = null;
                             return;
                         case 'gradient':
-                            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:
                             this.setProperty(el, "border-image", "none");
                             this.setProperty(el, "border-image-slice", "");
                             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);
-                                }
-                            }
                     }
                 }
                 el.elementModel.stroke = color;
@@ -211,20 +196,83 @@ exports.ElementController = Montage.create(Component, {
     },
 
     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: {
diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js
index 626dedb6..845e7dc2 100755
--- a/js/controllers/elements/shapes-controller.js
+++ b/js/controllers/elements/shapes-controller.js
@@ -551,12 +551,6 @@ exports.ShapesController = Montage.create(CanvasController, {
                             el.elementModel.shapeModel.GLGeomObj.setStrokeColor(webGl);
                     }
                 }
-
-                // Support for ink-bottle tool
-                if(color.strokeInfo)
-                {
-                    this.setProperty(el, "strokeSize", color.strokeInfo.strokeSize + " " + color.strokeInfo.strokeUnits);
-                }
             }
             el.elementModel.shapeModel.GLWorld.render();
             this.application.ninja.currentDocument.model.needsSave = true;
@@ -564,23 +558,92 @@ exports.ShapesController = Montage.create(CanvasController, {
     },
 
     getStroke: {
-        value: function(el) {
-            // TODO - Need to figure out which border side user wants
-            var size = this.getShapeProperty(el, "strokeSize");
-            var color = this.getShapeProperty(el, "stroke");
-            return {stroke:color, strokeSize:size};
+        value: function(el, stroke) {
+            var strokeInfo = {},
+                color,
+                strokeWidth,
+                strokeSize;
+            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.shapeInfo) {
+                strokeInfo.shapeInfo = {};
+                strokeWidth = this.getProperty(el, "strokeSize");
+                if(strokeWidth) {
+                    strokeSize = njModule.NJUtils.getValueAndUnits(strokeWidth);
+                    strokeInfo.shapeInfo.strokeSize = strokeSize[0];