aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-02-02 18:00:45 -0800
committerJose Antonio Marquez2012-02-02 18:00:45 -0800
commit04d89daed90c35a4393773ca2e2d0ac3a4c15cd4 (patch)
treed0041abc7379ef38b20cce148e5dea6f531b8569 /js/components/tools-properties
parent4d8306b638c53899403a4f0328c02bf1ab893e8f (diff)
parentc630ead20487c3948fa36448d3e7d5f7b5cba782 (diff)
downloadninja-04d89daed90c35a4393773ca2e2d0ac3a4c15cd4.tar.gz
Merge branch 'refs/heads/NinjaInternal' into FileIO
Conflicts: .gitignore js/ninja.reel/ninja.js
Diffstat (limited to 'js/components/tools-properties')
-rwxr-xr-xjs/components/tools-properties/rect-properties.reel/rect-properties.js2
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 100755
--- 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;