diff options
author | hwc487 | 2012-04-13 11:52:13 -0700 |
---|---|---|
committer | hwc487 | 2012-04-13 11:52:13 -0700 |
commit | 4f2fb5764703cab4ce3ada719b1395ed1e2f3b7c (patch) | |
tree | 3dc2e3c5a041179eed38eab1a00f851554e50005 /js/data | |
parent | 521df0ed9242efff45715998837068c87aca7efd (diff) | |
parent | 4b900ea5cd6bb77eb30cec8c03b9ec9fa662c1e9 (diff) | |
download | ninja-4f2fb5764703cab4ce3ada719b1395ed1e2f3b7c.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Snapping_II
Conflicts:
js/helper-classes/3D/view-utils.js
js/panels/presets/animations-presets.reel/animations-presets.js
js/panels/presets/style-presets.reel/style-presets.js
js/panels/presets/transitions-presets.reel/transitions-presets.js
js/tools/Translate3DToolBase.js
Diffstat (limited to 'js/data')
-rwxr-xr-x | js/data/pi/pi-data.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js index 7edc90d8..157c54ec 100755 --- a/js/data/pi/pi-data.js +++ b/js/data/pi/pi-data.js | |||
@@ -131,6 +131,8 @@ exports.PiData = Montage.create( Montage, { | |||
131 | type : "hottext", | 131 | type : "hottext", |
132 | id : "borderWidth", | 132 | id : "borderWidth", |
133 | prop : "border-width", | 133 | prop : "border-width", |
134 | defaultValue: 0, | ||
135 | valueMutator: parseFloat, | ||
134 | label : "Border", | 136 | label : "Border", |
135 | min : 0, | 137 | min : 0, |
136 | max : 100, | 138 | max : 100, |
@@ -578,7 +580,7 @@ exports.PiData = Montage.create( Montage, { | |||
578 | valueMutator: parseFloat, | 580 | valueMutator: parseFloat, |
579 | value : 0, | 581 | value : 0, |
580 | min : 0, | 582 | min : 0, |
581 | max : 100, | 583 | max : 99, |
582 | unit : "%", | 584 | unit : "%", |
583 | acceptableUnits: ["%"] | 585 | acceptableUnits: ["%"] |
584 | 586 | ||