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/pen-properties.reel | |
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/pen-properties.reel')
-rwxr-xr-x | js/components/tools-properties/pen-properties.reel/pen-properties.html | 4 | ||||
-rwxr-xr-x | js/components/tools-properties/pen-properties.reel/pen-properties.js | 33 |
2 files changed, 32 insertions, 5 deletions
diff --git a/js/components/tools-properties/pen-properties.reel/pen-properties.html b/js/components/tools-properties/pen-properties.reel/pen-properties.html index e720eb84..adb5cd7d 100755 --- a/js/components/tools-properties/pen-properties.reel/pen-properties.html +++ b/js/components/tools-properties/pen-properties.reel/pen-properties.html | |||
@@ -38,9 +38,9 @@ | |||
38 | "_strokeSize": {"@": "strokeSizeHT"} | 38 | "_strokeSize": {"@": "strokeSizeHT"} |
39 | } | 39 | } |
40 | } | 40 | } |
41 | } | 41 | } |
42 | </script> | 42 | </script> |
43 | 43 | ||
44 | </head> | 44 | </head> |
45 | 45 | ||
46 | <body> | 46 | <body> |
diff --git a/js/components/tools-properties/pen-properties.reel/pen-properties.js b/js/components/tools-properties/pen-properties.reel/pen-properties.js index c37359e1..78065b99 100755 --- a/js/components/tools-properties/pen-properties.reel/pen-properties.js +++ b/js/components/tools-properties/pen-properties.reel/pen-properties.js | |||
@@ -9,9 +9,21 @@ var ToolProperties = require("js/components/tools-properties/tool-properties").T | |||
9 | 9 | ||
10 | var PenProperties = exports.PenProperties = Montage.create(ToolProperties, { | 10 | var PenProperties = exports.PenProperties = Montage.create(ToolProperties, { |
11 | addedColorChips: { value: false }, | 11 | addedColorChips: { value: false }, |
12 | _penToolRadio: { value: null, enumerable: false }, | 12 | |
13 | _penPlusRadio: { value: null, enumerable: false }, | 13 | _penToolRadio: { |
14 | _penMinusRadio: { value: null, enumerable: false }, | 14 | value: null, |
15 | serializable: true | ||
16 | }, | ||
17 | |||
18 | _penPlusRadio: { | ||
19 | value: null, | ||
20 | serializable: true | ||
21 | }, | ||
22 | |||
23 | _penMinusRadio: { | ||
24 | value: null, | ||
25 | serializable: true | ||
26 | }, | ||
15 | 27 | ||
16 | _subPrepare: { | 28 | _subPrepare: { |
17 | value: function() { | 29 | value: function() { |
@@ -21,6 +33,21 @@ var PenProperties = exports.PenProperties = Montage.create(ToolProperties, { | |||
21 | } | 33 | } |
22 | }, | 34 | }, |
23 | 35 | ||
36 | _fillColorCtrl: { | ||
37 | value: null, | ||
38 | serializable: true | ||
39 | }, | ||
40 | |||
41 | _strokeColorCtrl: { | ||
42 | value: null, | ||
43 | serializable: true | ||
44 | }, | ||
45 | |||
46 | _strokeSize: { | ||
47 | value: null, | ||
48 | serializable: true | ||
49 | }, | ||
50 | |||
24 | _fill: { | 51 | _fill: { |
25 | enumerable: false, | 52 | enumerable: false, |
26 | value: { colorMode: 'rgb', color: { r: 255, g: 255, b: 255, a: 1, css: 'rgb(255,255,255)', mode: 'rgb', wasSetByCode: true, type: 'change' }, webGlColor: [1, 1, 1, 1] } | 53 | value: { colorMode: 'rgb', color: { r: 255, g: 255, b: 255, a: 1, css: 'rgb(255,255,255)', mode: 'rgb', wasSetByCode: true, type: 'change' }, webGlColor: [1, 1, 1, 1] } |