diff options
| author | Jose Antonio Marquez | 2012-02-02 18:04:37 -0800 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-02-02 18:04:37 -0800 |
| commit | 7959d2ecc6e8b1799307de1ceab1112b8ab58e8d (patch) | |
| tree | ce4e32578e1af4d49b8375933a6b7edd0a095b0f /js/components/tools-properties/rect-properties.reel/rect-properties.js | |
| parent | 83ac41dd75ec551cdb03252e0bf3081182517d05 (diff) | |
| parent | c630ead20487c3948fa36448d3e7d5f7b5cba782 (diff) | |
| download | ninja-7959d2ecc6e8b1799307de1ceab1112b8ab58e8d.tar.gz | |
Merge branch 'refs/heads/NinjaInternal' into Color
Conflicts:
js/controllers/elements/shapes-controller.js
js/data/pi/pi-data.js
js/panels/properties/content.reel/content.js
Diffstat (limited to 'js/components/tools-properties/rect-properties.reel/rect-properties.js')
| -rw-r--r-- | js/components/tools-properties/rect-properties.reel/rect-properties.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/components/tools-properties/rect-properties.reel/rect-properties.js b/js/components/tools-properties/rect-properties.reel/rect-properties.js index 8d0cd21f..1e717f88 100644 --- a/js/components/tools-properties/rect-properties.reel/rect-properties.js +++ b/js/components/tools-properties/rect-properties.reel/rect-properties.js | |||
| @@ -113,7 +113,7 @@ exports.RectProperties = Montage.create(ToolProperties, { | |||
| 113 | 113 | ||
| 114 | handleChange: { | 114 | handleChange: { |
| 115 | value: function(event) { | 115 | value: function(event) { |
| 116 | var hotTxt = event.currentTarget | 116 | var hotTxt = event.currentTarget; |
| 117 | if(hotTxt.units === "%") { | 117 | if(hotTxt.units === "%") { |
| 118 | if(hotTxt.value > 50) { | 118 | if(hotTxt.value > 50) { |
| 119 | hotTxt.maxValue = 50; | 119 | hotTxt.maxValue = 50; |