8 files changed, 127 insertions, 57 deletions

diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js
index 74353454..c3099459 100755
--- a/js/controllers/elements/shapes-controller.js
+++ b/js/controllers/elements/shapes-controller.js
@@ -138,6 +138,10 @@ exports.ShapesController = Montage.create(CanvasController, {
                     this.application.ninja.elementMediator.replaceElement(canvas, el);
                     break;
                 case "strokeMaterial":
+                    // skip shape types that don't support WebGL
+                    if(!el.elementModel.shapeModel.useWebGl) {
+                        return;
+                    }
                     m = Object.create(MaterialsModel.getMaterial(value));
                     if(m)
                     {
@@ -152,6 +156,10 @@ exports.ShapesController = Montage.create(CanvasController, {
                     }
                     break;
                 case "fillMaterial":
+                    // skip shape types that don't support WebGL or fill color
+                    if(!el.elementModel.shapeModel.GLGeomObj.canFill || !el.elementModel.shapeModel.useWebGl) {
+                        return;
+                    }
                     m = Object.create(MaterialsModel.getMaterial(value));
                     if(m)
                     {
@@ -445,17 +453,17 @@ exports.ShapesController = Montage.create(CanvasController, {
 
             if(gradientM)
             {
-            if(isFill)
-            {
+                if(isFill)
+                {
                     el.elementModel.shapeModel.GLGeomObj.setFillMaterial(gradientM);
                 }
                 else
                 {
                     el.elementModel.shapeModel.GLGeomObj.setStrokeMaterial(gradientM);
                 }
-                        el.elementModel.shapeModel.GLGeomObj.buildBuffers();
-                    }
-                }
+                el.elementModel.shapeModel.GLGeomObj.buildBuffers();
+            }
+        }
     },
 
     _setFlatMaterial: {
@@ -472,10 +480,13 @@ exports.ShapesController = Montage.create(CanvasController, {
             }
 
             if(!m || ((m.getName() === "Linear Gradient") || m.getName() === "Radial Gradient") )
-                {
+            {
+                // Uber Material also supports solid colors, so don't change from Uber to Flat Material
+                if(m && (m.getName() === "Uber")) { return; }
+
                 flatM = Object.create(MaterialsModel.getMaterial("Flat"));
                 if(flatM)
-                    {
+                {
                     if(isFill)
                     {
                         el.elementModel.shapeModel.GLGeomObj.setFillMaterial(flatM);
@@ -484,10 +495,10 @@ exports.ShapesController = Montage.create(CanvasController, {
                     {
                         el.elementModel.shapeModel.GLGeomObj.setStrokeMaterial(flatM);
                     }
-                        el.elementModel.shapeModel.GLGeomObj.buildBuffers();
-                    }
+                    el.elementModel.shapeModel.GLGeomObj.buildBuffers();
                 }
             }
+        }
     },
 
     setColor: {
@@ -597,14 +608,31 @@ exports.ShapesController = Montage.create(CanvasController, {
 
     setStroke: {
         value: function(el, stroke, eventType, source) {
-            if(stroke.colorInfo) {
-                this.setColor(el, stroke.colorInfo, false);
-            }
             if(stroke.shapeInfo) {
                 this.setProperty(el, "strokeSize", stroke.shapeInfo.strokeSize + " " + stroke.shapeInfo.strokeUnits, eventType, source);
             }
+            var m;
             if(stroke.webGLInfo) {
-                this.setProperty(el, "strokeMaterial", stroke.webGLInfo.material);
+                m = stroke.webGLInfo.material;
+                this.setProperty(el, "strokeMaterial", m);
+                if((m === "Linear Gradient") || (m === "Radial Gradient")) {
+                    // Just use the default gradient material values
+                    return;
+                }
+            }
+            if(stroke.colorInfo) {
+                if(el.elementModel.shapeModel.useWebGl) {
+                    m = el.elementModel.shapeModel.GLGeomObj.getStrokeMaterial().getName();
+                    if( ((stroke.colorInfo.mode === "gradient") && (m !== "Linear Gradient") && (m !== "Radial Gradient")) ||
+                        ((stroke.colorInfo.mode !== "gradient") && ((m === "Linear Gradient") || (m === "Radial Gradient"))))
+                    {
+                        return;
+                    } else {
+                        this.setColor(el, stroke.colorInfo, false);
+                    }
+                } else {
+                    this.setColor(el, stroke.colorInfo, false);
+                }
             }
         }
     },
@@ -638,11 +666,28 @@ exports.ShapesController = Montage.create(CanvasController, {
 
     setFill: {
         value: function(el, fill) {
-            if(fill.colorInfo) {
-                this.setColor(el, fill.colorInfo, true);
-            }
+            var m;
             if(fill.webGLInfo) {
-                this.setProperty(el, "fillMaterial", fill.webGLInfo.material);
+                m = fill.webGLInfo.material;
+                this.setProperty(el, "fillMaterial", m);
+                if((m === "Linear Gradient") || (m === "Radial Gradient")) {
+                    // Just use the default gradient material values
+                    return;
+                }
+            }
+            if(fill.colorInfo) {
+                if(el.elementModel.shapeModel.useWebGl) {
+                    m = el.elementModel.shapeModel.GLGeomObj.getFillMaterial().getName();
+                    if( ((fill.colorInfo.mode === "gradient") && (m !== "Linear Gradient") && (m !== "Radial Gradient")) ||
+                        ((fill.colorInfo.mode !== "gradient") && ((m === "Linear Gradient") || (m === "Radial Gradient"))))
+                    {
+                        return;
+                    } else {
+                        this.setColor(el, fill.colorInfo, true);
+                    }
+                } else {
+                    this.setColor(el, fill.colorInfo, true);
+                }
             }
         }
     },
diff --git a/js/controllers/styles-controller.js b/js/controllers/styles-controller.js
index b50f43cc..6e363798 100755
--- a/js/controllers/styles-controller.js
+++ b/js/controllers/styles-controller.js
@@ -213,6 +213,9 @@ var stylesController = exports.StylesController = Montage.create(Component, {
             
             stylesheet.insertRule(ruleText, index);
 
+            ///// Invalidate cache because rule dominance is affected
+            this._clearCache();
+
             this.styleSheetModified(stylesheet);
             
             rule = stylesheet.rules[index];
@@ -791,7 +794,7 @@ var stylesController = exports.StylesController = Montage.create(Component, {
             var a = this._getMostSpecificSelectorForElement(element, rule1[this.CONST.SPECIFICITY_KEY]),
                 b = this._getMostSpecificSelectorForElement(element, rule2[this.CONST.SPECIFICITY_KEY]),
                 win = element.ownerDocument.defaultView,
-                order;
+                order, sheetAIndex, sheetBIndex, ruleAIndex, ruleBIndex;
 
               order = this.compareSpecificity(a.specificity, b.specificity);
 
@@ -802,9 +805,9 @@ var stylesController = exports.StylesController = Montage.create(Component, {
                  /// If tied again (same sheet), determine which is further down in the sheet
                 if(sheetAIndex === sheetBIndex) {
                      ruleAIndex = this.getRuleIndex(rule1); ruleBIndex = this.getRuleIndex(rule2);
-                   return ruleAIndex < ruleBIndex ? 1 : (ruleAIndex > ruleBIndex) ? -1 : 0;
+                   return ruleAIndex < ruleBIndex ? false : (ruleAIndex > ruleBIndex) ? true : false;
                  } else {
-                     return sheetAIndex < sheetBIndex ? 1 : (sheetAIndex > sheetBIndex) ? -1 : 0;
+                     return sheetAIndex < sheetBIndex ? false : (sheetAIndex > sheetBIndex) ? true : false;
                 }