Merge branch 'refs/heads/NiveshColor' into ToolFixes

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>

2 files changed, 107 insertions, 16 deletions

diff --git a/js/controllers/elements/element-controller.js b/js/controllers/elements/element-controller.js
index f2b54014..65d26bdd 100644
--- a/js/controllers/elements/element-controller.js
+++ b/js/controllers/elements/element-controller.js
@@ -69,27 +69,103 @@ var ElementController = exports.ElementController = Montage.create(NJComponent,
     // Routines to get/set color properties
     getColor: {
         value: function(el, isFill) {
+            var colorObj,
+                color,
+                image;
+
+            // Return cached value if one exists
             if(isFill)
             {
-                return this.application.ninja.stylesController.getElementStyle(el, "background-color");
+                if(el.elementModel.fill)
+                {
+                    return el.elementModel.fill;
+                }
+//                return this.application.ninja.stylesController.getElementStyle(el, "background-color");
+                //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
             {
                 // TODO - Need to figure out which border side user wants
-                return this.application.ninja.stylesController.getElementStyle(el, "border-color");
+                if(el.elementModel.stroke)
+                {
+                    return el.elementModel.stroke;
+                }
+                // TODO - Need to figure out which border side user wants
+//                return this.application.ninja.stylesController.getElementStyle(el, "border-color");
+                color = this.getProperty(el, "border-color");
+                image = this.getProperty(el, "border-image");
             }
+
+            if(color || image) {
+                if (image && image !== 'none' && image.indexOf('-webkit') >= 0) {
+                    //Gradient
+                    colorObj = this.application.ninja.colorController.getColorObjFromCss(image);
+                } else {
+                    //Solid
+                    colorObj = this.application.ninja.colorController.getColorObjFromCss(color);
+                }
+            }
+
+            // Update cache
+            if(isFill)
+            {
+                el.elementModel.fill = colorObj;
+            }
+            else
+            {
+                el.elementModel.stroke = colorObj;
+            }
+
+            return colorObj;
         }
     },
 
     setColor: {
         value: function(el, color, isFill) {
+            var mode = color.mode;
             if(isFill)
             {
-                this.application.ninja.stylesController.setElementStyle(el, "background-color", color.color.css);
+                if(mode)
+                {
+                    switch (mode) {
+                        case 'nocolor':
+                            this.setProperty(el, "background-image", "none");
+                            this.setProperty(el, "background-color", "none");
+                            el.elementModel.fill = null;
+                            return;
+                        case 'gradient':
+                            this.setProperty(el, "background-image", color.color.css);
+                            this.setProperty(el, "background-color", "none");
+                            break;
+                        default:
+                            this.setProperty(el, "background-image", "none");
+                            this.setProperty(el, "background-color", color.color.css);
+                    }
+                }
+                el.elementModel.fill = color;
             }
             else
             {
-                this.application.ninja.stylesController.setElementStyle(el, "border-color", color.color.css);
+                if(mode)
+                {
+                    switch (mode) {
+                        case 'nocolor':
+                            this.setProperty(el, "border-image", "none");
+                            this.setProperty(el, "border-color", "none");
+                            el.elementModel.stroke = null;
+                            return;
+                        case 'gradient':
+                            this.setProperty(el, "border-image", color.color.css);
+                            this.setProperty(el, "border-color", "none");
+                            break;
+                        default:
+                            this.setProperty(el, "border-image", "none");
+                            this.setProperty(el, "border-color", color.color.css);
+                    }
+                }
+                el.elementModel.stroke = color;
             }
         }
     },
@@ -103,8 +179,9 @@ var ElementController = exports.ElementController = Montage.create(NJComponent,
 
     setStroke: {
         value: function(el, stroke) {
-            var border = stroke.borderWidth + stroke.borderUnits + " " + stroke.borderStyle + " " + stroke.color.color.css;
-            this.application.ninja.stylesController.setElementStyle(el, "border", border);
+            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);
         }
     },
 
diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js
index c5f22138..5efbccd0 100644
--- a/js/controllers/elements/shapes-controller.js
+++ b/js/controllers/elements/shapes-controller.js
@@ -66,8 +66,6 @@ exports.ShapesController = Montage.create(CanvasController, {
     getProperty: {
         value: function(el, p) {
             switch(p) {
-                case "stroke":
-                case "fill":
                 case "strokeSize":
                 case "innerRadius":
                 case "tlRadius":
@@ -76,6 +74,8 @@ exports.ShapesController = Montage.create(CanvasController, {
                 case "brRadius":
                 case "strokeMaterial":
                 case "fillMaterial":
+                case "border":
+                case "background":
                     return this.getShapeProperty(el, p);
                 default:
                     return CanvasController.getProperty(el, p);
@@ -182,30 +182,44 @@ exports.ShapesController = Montage.create(CanvasController, {
     // Routines to get/set color properties
     getColor: {
         value: function(el, isFill) {
+            var color,
+                css;
             if(isFill)
             {
-                return this.getShapeProperty(el, "fill");
+                if(el.elementModel.shapeModel.background)
+                {
+                    return el.elementModel.shapeModel.background;
+                }
+                color = this.getShapeProperty(el, "fill");
             }
             else
             {
-                return this.getShapeProperty(el, "stroke");
+                if(el.elementModel.shapeModel.border)
+                {
+                    return el.elementModel.shapeModel.border;
+                }
+                color = this.getShapeProperty(el, "stroke");
             }
+
+            css = this.application.ninja.colorController.colorModel.webGlToCss(color);
+            return this.application.ninja.colorController.getColorObjFromCss(css);
         }
     },
 
     setColor: {
         value: function(el, color, isFill) {
-            // TODO - Format color for webGL before setting
-            color = color.webGlColor;
+            var webGl = color.webGlColor || color.color.webGlColor;
             if(isFill)
             {
-                el.elementModel.shapeModel.GLGeomObj.setFillColor(color);
-                this.setShapeProperty(el, "fill", color);
+                el.elementModel.shapeModel.GLGeomObj.setFillColor(webGl);
+                this.setShapeProperty(el, "fill", webGl);
+                this.setShapeProperty(el, "background", color);
             }
             else
             {
-                el.elementModel.shapeModel.GLGeomObj.setStrokeColor(color);
+                el.elementModel.shapeModel.GLGeomObj.setStrokeColor(webGl);