Merge branch 'refs/heads/master' into minorFixes_7.1

2 files changed, 3 insertions, 1 deletions

diff --git a/js/components/tools-properties/shape-properties.reel/shape-properties.html b/js/components/tools-properties/shape-properties.reel/shape-properties.html
index 7503f257..959feec6 100755
--- a/js/components/tools-properties/shape-properties.reel/shape-properties.html
+++ b/js/components/tools-properties/shape-properties.reel/shape-properties.html
@@ -66,7 +66,7 @@ POSSIBILITY OF SUCH DAMAGE.
                 "prototype": "js/components/hottextunit.reel[HotTextUnit]",
                 "properties": {
                     "element": {"#": "strokeControl"},
-                    "minValue": 1,
+                    "minValue": 0,
                     "maxValue": 100,
                     "value": 1,
                     "decimalPlace": 10,
diff --git a/js/components/tools-properties/shape-properties.reel/shape-properties.js b/js/components/tools-properties/shape-properties.reel/shape-properties.js
index 40ad0dd0..c5b22188 100755
--- a/js/components/tools-properties/shape-properties.reel/shape-properties.js
+++ b/js/components/tools-properties/shape-properties.reel/shape-properties.js
@@ -209,12 +209,14 @@ var ShapeProperties = exports.ShapeProperties = Montage.create(ToolProperties, {
                     this._fillColorCtrlIcon.style["display"] = "none";
                     this._fillColorCtrlIcon.visible = false;
                     this.endDivider.style["display"] = "none";
+                    this._strokeSize.minValue = 1;
                 } else {
                     this._fillColorCtrlContainer.style["display"] = "";
                     this._fillColorCtrlContainer.visible = true;
                     this._fillColorCtrlIcon.style["display"] = "";
                     this._fillColorCtrlIcon.visible = true;
                     this.endDivider.style["display"] = "";
+                    this._strokeSize.minValue = 0;
                 }
 
                 if (this._useWebGL.checked) {