diff options
author | Jose Antonio Marquez | 2012-06-13 14:03:00 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-06-13 14:03:00 -0700 |
commit | efbe5f83157a8dcbcc209c88877d9cd0113d4d20 (patch) | |
tree | 50565e097fe4a9db59e554af179f66938fa59f1c /js/components/tools-properties/pen-properties.reel/pen-properties.js | |
parent | ae90152ae2889a10d44c22e1eeb5bff16cc44a19 (diff) | |
parent | 682f4917d6badd105998c3dd84d031c38b51f017 (diff) | |
download | ninja-efbe5f83157a8dcbcc209c88877d9cd0113d4d20.tar.gz |
Merge branch 'refs/heads/Ninja-Internal' into Color
Diffstat (limited to 'js/components/tools-properties/pen-properties.reel/pen-properties.js')
-rwxr-xr-x | js/components/tools-properties/pen-properties.reel/pen-properties.js | 33 |
1 files changed, 30 insertions, 3 deletions
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] } |