diff options
author | Valerio Virgillito | 2012-08-15 14:52:25 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-08-15 14:52:25 -0700 |
commit | 34804fa77191a08fcdaa8ca1992b38e60094f3ae (patch) | |
tree | 9eafadc20bb792b4058572ff1e12440428fe7c74 /js/components/tools-properties | |
parent | a9ff54e7490761a7c0ad572d060ee386179d11df (diff) | |
parent | c88752d621069b12f978c1fd88ffdd52537a4657 (diff) | |
download | ninja-34804fa77191a08fcdaa8ca1992b38e60094f3ae.tar.gz |
Merge branch 'refs/heads/v0.7.2'
Diffstat (limited to 'js/components/tools-properties')
-rwxr-xr-x | js/components/tools-properties/shape-properties.reel/shape-properties.html | 2 | ||||
-rwxr-xr-x | js/components/tools-properties/shape-properties.reel/shape-properties.js | 2 |
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. | |||
66 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", | 66 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", |
67 | "properties": { | 67 | "properties": { |
68 | "element": {"#": "strokeControl"}, | 68 | "element": {"#": "strokeControl"}, |
69 | "minValue": 1, | 69 | "minValue": 0, |
70 | "maxValue": 100, | 70 | "maxValue": 100, |
71 | "value": 1, | 71 | "value": 1, |
72 | "decimalPlace": 10, | 72 | "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, { | |||
209 | this._fillColorCtrlIcon.style["display"] = "none"; | 209 | this._fillColorCtrlIcon.style["display"] = "none"; |
210 | this._fillColorCtrlIcon.visible = false; | 210 | this._fillColorCtrlIcon.visible = false; |
211 | this.endDivider.style["display"] = "none"; | 211 | this.endDivider.style["display"] = "none"; |
212 | this._strokeSize.minValue = 1; | ||
212 | } else { | 213 | } else { |
213 | this._fillColorCtrlContainer.style["display"] = ""; | 214 | this._fillColorCtrlContainer.style["display"] = ""; |
214 | this._fillColorCtrlContainer.visible = true; | 215 | this._fillColorCtrlContainer.visible = true; |
215 | this._fillColorCtrlIcon.style["display"] = ""; | 216 | this._fillColorCtrlIcon.style["display"] = ""; |
216 | this._fillColorCtrlIcon.visible = true; | 217 | this._fillColorCtrlIcon.visible = true; |
217 | this.endDivider.style["display"] = ""; | 218 | this.endDivider.style["display"] = ""; |
219 | this._strokeSize.minValue = 0; | ||
218 | } | 220 | } |
219 | 221 | ||
220 | if (this._useWebGL.checked) { | 222 | if (this._useWebGL.checked) { |