Merge branch 'refs/heads/ninja-internal' into WebGLMaterials

3 files changed, 22 insertions, 16 deletions

diff --git a/js/controllers/elements/element-controller.js b/js/controllers/elements/element-controller.js
index 35a543ac..452d09f1 100755
--- a/js/controllers/elements/element-controller.js
+++ b/js/controllers/elements/element-controller.js
@@ -152,16 +152,24 @@ exports.ElementController = Montage.create(Component, {
                             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);
+                                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);
+                                }
                             }
                             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);
+                                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);
+                                }
                             }
                     }
                 }
diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js
index e9dde5fc..8d7b74f0 100755
--- a/js/controllers/elements/shapes-controller.js
+++ b/js/controllers/elements/shapes-controller.js
@@ -20,8 +20,10 @@ exports.ShapesController = Montage.create(CanvasController, {
                 color;
             switch(p) {
                 case "strokeSize":
-                    // TODO - For now, just handling px units.
                     this.setShapeProperty(el, "strokeSize", value);
+                    var strokeInfo = njModule.NJUtils.getValueAndUnits(value);
+                    val = this.GetValueInPixels(strokeInfo[0], strokeInfo[1]);
+
                     // TODO - For now, just handle Line, Rectangle and Oval. Eventually, move this into each class's
                     // setStrokeWidth code like SubPath and BrushStroke do.
                     var geomType = el.elementModel.shapeModel.GLGeomObj.geomType();
@@ -527,16 +529,6 @@ exports.ShapesController = Montage.create(CanvasController, {
             }
             else
             {
-                // Support for ink-bottle tool
-                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);
-                }
-
                 if(mode)
                 {
                     switch (mode) {
@@ -559,6 +551,12 @@ 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.documentController.activeDocument.needsSave = true;
diff --git a/js/controllers/elements/stage-controller.js b/js/controllers/elements/stage-controller.js
index 3ef7dacc..e9779c81 100755
--- a/js/controllers/elements/stage-controller.js
+++ b/js/controllers/elements/stage-controller.js
@@ -182,5 +182,5 @@ exports.StageController = Montage.create(ElementController, {
                 return dist;
             }
         }
-    },
+    }
 });