diff options
author | hwc487 | 2012-06-13 14:04:09 -0700 |
---|---|---|
committer | hwc487 | 2012-06-13 14:04:09 -0700 |
commit | 3e481dd581e0305dd8b572ed0d17e86622223464 (patch) | |
tree | aca2b28aa72857a52e047fb94090c34ab8dd1c2c /js/components/tools-properties/rect-properties.reel/rect-properties.js | |
parent | a7aa51e6b91623772eef54b827616432838b560e (diff) | |
parent | 682f4917d6badd105998c3dd84d031c38b51f017 (diff) | |
download | ninja-3e481dd581e0305dd8b572ed0d17e86622223464.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Diffstat (limited to 'js/components/tools-properties/rect-properties.reel/rect-properties.js')
-rwxr-xr-x | js/components/tools-properties/rect-properties.reel/rect-properties.js | 20 |
1 files changed, 14 insertions, 6 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 2f8ea4dd..94c674a2 100755 --- a/js/components/tools-properties/rect-properties.reel/rect-properties.js +++ b/js/components/tools-properties/rect-properties.reel/rect-properties.js | |||
@@ -8,12 +8,20 @@ var Montage = require("montage/core/core").Montage, | |||
8 | ToolProperties = require("js/components/tools-properties/tool-properties").ToolProperties; | 8 | ToolProperties = require("js/components/tools-properties/tool-properties").ToolProperties; |
9 | 9 | ||
10 | exports.RectProperties = Montage.create(ToolProperties, { | 10 | exports.RectProperties = Montage.create(ToolProperties, { |
11 | base: { value: null }, | 11 | base: { |
12 | lockButton: { value: null, enumerable: false}, | 12 | value: null, |
13 | TLRadiusControl: { value: null, enumerable: false }, | 13 | serializable: true |
14 | TRRadiusControl: { value: null, enumerable: false }, | 14 | }, |
15 | BLRadiusControl: { value: null, enumerable: false }, | 15 | |
16 | BRRadiusControl: { value: null, enumerable: false }, | 16 | lockButton: { |
17 | value: null, | ||
18 | serializable: true | ||
19 | }, | ||
20 | |||
21 | TLRadiusControl: { value: null, serializable: true }, | ||
22 | TRRadiusControl: { value: null, serializable: true }, | ||
23 | BLRadiusControl: { value: null, serializable: true }, | ||
24 | BRRadiusControl: { value: null, serializable: true }, | ||
17 | 25 | ||
18 | _unlocked: { value: false, enumerable: false}, | 26 | _unlocked: { value: false, enumerable: false}, |
19 | 27 | ||