diff options
| author | Armen Kesablyan | 2012-02-07 16:55:34 -0800 |
|---|---|---|
| committer | Armen Kesablyan | 2012-02-07 16:55:34 -0800 |
| commit | 10f0ad4c15f090b2d0d50d11e4c7aaf291e9eb0e (patch) | |
| tree | 12b31910a3c7c7fa2ee0b26d8aaa611710e139a5 /js/components/tools-properties | |
| parent | 7f8730c3add146f1ba107e6fc22d1f5a8348ed8b (diff) | |
| parent | 668510892537eaaeb2e11520831d87b44b2489b7 (diff) | |
| download | ninja-10f0ad4c15f090b2d0d50d11e4c7aaf291e9eb0e.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into text-tool
Conflicts:
_scss/compass_app_log.txt
css/ninja.css
Diffstat (limited to 'js/components/tools-properties')
| -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; |