Merge branch 'refs/heads/master' into CSSPanelUpdates

6 files changed, 47 insertions, 5 deletions

diff --git a/js/controllers/color-controller.js b/js/controllers/color-controller.js
index e3b15f1c..a6e41dd3 100755
--- a/js/controllers/color-controller.js
+++ b/js/controllers/color-controller.js
@@ -322,7 +322,19 @@ exports.ColorController = Montage.create(Component, {
                         //Simple solid color
                         color = this.parseCssToColor(css);
                 }
-                //Returning color object (or null if none)
+            // TODO - Hack for inconsistent color object -- some workflows set color.color and some color.value
+            if(color)
+            {
+                if(color.value && !color.color)
+                {
+                    color.color = color.value;
+                }
+                else if(color.color && !color.value)
+                {
+                    color.value = color.color;
+                }
+            }
+            //Returning color object (or null if none)
                 return color;
         }
     },
diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index fa611de4..1c9d9d59 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -84,8 +84,13 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
         //
     handleAppLoaded: {
         value: function() {
-            //Adding an intercept to resources loaded to ensure user assets load from cloud simulator
-            if (window.chrome.app.isInstalled) {
+            //Checking for app to be loaded through extension
+            var check;
+            if (chrome && chrome.app) {
+                check = chrome.app.getDetails();
+            }
+            if (check !== null) {
+                //Adding an intercept to resources loaded to ensure user assets load from cloud simulator
                 chrome.webRequest.onBeforeRequest.addListener(this.handleWebRequest.bind(this), {urls: ["<all_urls>"]}, ["blocking"]);
             }
         }
diff --git a/js/controllers/elements/element-controller.js b/js/controllers/elements/element-controller.js
index ac14def4..46e82ace 100755
--- a/js/controllers/elements/element-controller.js
+++ b/js/controllers/elements/element-controller.js
@@ -118,6 +118,7 @@ var ElementController = exports.ElementController = Montage.create(NJComponent,
             }
             else
             {
+                // TODO - Need to update border style and width also
                 el.elementModel.stroke = colorObj;
             }
 
@@ -162,10 +163,22 @@ var ElementController = exports.ElementController = Montage.create(NJComponent,
                         case 'gradient':
                             this.setProperty(el, "border-image", color.color.css);
                             this.setProperty(el, "border-color", "none");
+                            if(color.borderInfo)
+                            {
+                                this.setProperty(el, "border-width", color.borderInfo.borderWidth +
+                                                                        color.borderInfo.borderUnits);
+                                this.setProperty(el, "border-style", color.borderInfo.borderStyle);
+                            }
                             break;
                         default:
                             this.setProperty(el, "border-image", "none");
                             this.setProperty(el, "border-color", color.color.css);
+                            if(color.borderInfo)
+                            {
+                                this.setProperty(el, "border-width", color.borderInfo.borderWidth +
+                                                                        color.borderInfo.borderUnits);
+                                this.setProperty(el, "border-style", color.borderInfo.borderStyle);
+                            }
                     }
                 }
                 el.elementModel.stroke = color;
diff --git a/js/controllers/elements/image-controller.js b/js/controllers/elements/image-controller.js
index 5abce13e..25ca8da6 100755
--- a/js/controllers/elements/image-controller.js
+++ b/js/controllers/elements/image-controller.js
@@ -19,7 +19,7 @@ exports.ImageController = Montage.create(ElementController, {
                     return el.getAttribute(prop);
                     break;
                 default:
-                    return ElementController.getProperty(el, prop);
+                    return ElementController.getProperty(el, prop, true);
             }
         }
     },
diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js
index 15a18a51..e0bff70c 100755
--- a/js/controllers/elements/shapes-controller.js
+++ b/js/controllers/elements/shapes-controller.js
@@ -250,6 +250,10 @@ exports.ShapesController = Montage.create(CanvasController, {
     setColor: {
         value: function(el, color, isFill) {
             var webGl = color.webGlColor || color.color.webGlColor;
+            if(!webGl)
+            {
+                webGl = this.application.ninja.colorController.colorModel.colorToWebGl(color.color);
+            }
             if(isFill)
             {
                 el.elementModel.shapeModel.GLGeomObj.setFillColor(webGl);
@@ -261,6 +265,14 @@ exports.ShapesController = Montage.create(CanvasController, {
                 el.elementModel.shapeModel.GLGeomObj.setStrokeColor(webGl);
                 this.setShapeProperty(el, "stroke", webGl);
                 this.setShapeProperty(el, "border", color);
+                if(color.strokeInfo)
+                {
+                    var strokeWidth = this.GetValueInPixels(color.strokeInfo.strokeSize,
+                                                            color.strokeInfo.strokeUnits);
+                    el.elementModel.shapeModel.GLGeomObj.setStrokeWidth(strokeWidth);
+                    this.setShapeProperty(el, "strokeSize", color.strokeInfo.strokeSize + " "
+                                                                + color.strokeInfo.strokeUnits);
+                }
             }
             el.elementModel.shapeModel.GLWorld.render();
         }
diff --git a/js/controllers/elements/stage-controller.js b/js/controllers/elements/stage-controller.js
index a8546662..abad3736 100755
--- a/js/controllers/elements/stage-controller.js
+++ b/js/controllers/elements/stage-controller.js
@@ -76,7 +76,7 @@ exports.StageController = Montage.create(ElementController, {
         value: function(el, p) {
             switch(p) {
                 case "background" :
-                    return el.elementModel.stageBackground.style.getProperty(p);
+                    return this.application.ninja.colorController.getColorObjFromCss(el.elementModel.stageBackground.style.getProperty(p));
                 case "border":
                     return el.elementModel.stageView.style.getProperty(p);
                 case "height":