diff options
author | Valerio Virgillito | 2012-06-06 00:25:27 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-06-06 00:25:27 -0700 |
commit | 0e1a276f19ea70009c5a649e9667861d7c346a7e (patch) | |
tree | 6db7675bbe89746ba47002bba306da42a7261312 /js/components/tools-properties | |
parent | f7e4257745ccd44b8d24555f0ef787429d6e472c (diff) | |
download | ninja-0e1a276f19ea70009c5a649e9667861d7c346a7e.tar.gz |
first iteration of adding serializable to ninja plus other changes to run the latest montage
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/components/tools-properties')
17 files changed, 385 insertions, 71 deletions
diff --git a/js/components/tools-properties/brush-properties.reel/brush-properties.js b/js/components/tools-properties/brush-properties.reel/brush-properties.js index 7a0d21f1..1af128af 100755 --- a/js/components/tools-properties/brush-properties.reel/brush-properties.js +++ b/js/components/tools-properties/brush-properties.reel/brush-properties.js | |||
@@ -11,6 +11,46 @@ var ToolProperties = require("js/components/tools-properties/tool-properties").T | |||
11 | var BrushProperties = exports.BrushProperties = Montage.create(ToolProperties, { | 11 | var BrushProperties = exports.BrushProperties = Montage.create(ToolProperties, { |
12 | addedColorChips: { value: false }, | 12 | addedColorChips: { value: false }, |
13 | 13 | ||
14 | _fillColorCtrl: { | ||
15 | value: null, | ||
16 | serializable: true | ||
17 | }, | ||
18 | |||
19 | _strokeSize: { | ||
20 | value: null, | ||
21 | serializable: true | ||
22 | }, | ||
23 | |||
24 | _strokeHardness: { | ||
25 | value: null, | ||
26 | serializable: true | ||
27 | }, | ||
28 | |||
29 | _doSmoothing: { | ||
30 | value: null, | ||
31 | serializable: true | ||
32 | }, | ||
33 | |||
34 | _smoothingAmount: { | ||
35 | value: null, | ||
36 | serializable: true | ||
37 | }, | ||
38 | |||
39 | _useCalligraphic: { | ||
40 | value: null, | ||
41 | serializable: true | ||
42 | }, | ||
43 | |||
44 | _strokeAngle: { | ||
45 | value: null, | ||
46 | serializable: true | ||
47 | }, | ||
48 | |||
49 | _angleLabel: { | ||
50 | value: null, | ||
51 | serializable: true | ||
52 | }, | ||
53 | |||
14 | _fill: { | 54 | _fill: { |
15 | enumerable: false, | 55 | enumerable: false, |
16 | value: { colorMode: 'rgb', color: { r: 0, g: 0, b: 0, a: 1, css: 'rgb(0,0,0)', mode: 'rgb', wasSetByCode: true, type: 'change' }, webGlColor: [0, 0, 0, 1] } | 56 | value: { colorMode: 'rgb', color: { r: 0, g: 0, b: 0, a: 1, css: 'rgb(0,0,0)', mode: 'rgb', wasSetByCode: true, type: 'change' }, webGlColor: [0, 0, 0, 1] } |
diff --git a/js/components/tools-properties/fill-properties.reel/fill-properties.js b/js/components/tools-properties/fill-properties.reel/fill-properties.js index ae136956..616badb0 100755 --- a/js/components/tools-properties/fill-properties.reel/fill-properties.js +++ b/js/components/tools-properties/fill-properties.reel/fill-properties.js | |||
@@ -10,6 +10,26 @@ var Montage = require("montage/core/core").Montage, | |||
10 | 10 | ||
11 | var FillProperties = exports.FillProperties = Montage.create(ToolProperties, { | 11 | var FillProperties = exports.FillProperties = Montage.create(ToolProperties, { |
12 | 12 | ||
13 | _fillColorCtrl: { | ||
14 | value: null, | ||
15 | serializable: true | ||
16 | }, | ||
17 | |||
18 | _useWebGL: { | ||
19 | value: null, | ||
20 | serializable: true | ||
21 | }, | ||
22 | |||
23 | _materialsContainer: { | ||
24 | value: null, | ||
25 | serializable: true | ||
26 | }, | ||
27 | |||
28 | _fillMaterial: { | ||
29 | value: null, | ||
30 | serializable: true | ||
31 | }, | ||
32 | |||
13 | _use3D: { value: false }, | 33 | _use3D: { value: false }, |
14 | addedColorChips: { value: false }, | 34 | addedColorChips: { value: false }, |
15 | 35 | ||
diff --git a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js index 945df857..8b4cc327 100755 --- a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js +++ b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js | |||
@@ -11,6 +11,71 @@ var Montage = require("montage/core/core").Montage, | |||
11 | var InkBottleProperties = exports.InkBottleProperties = Montage.create(ToolProperties, { | 11 | var InkBottleProperties = exports.InkBottleProperties = Montage.create(ToolProperties, { |
12 | addedColorChips: { value: false }, | 12 | addedColorChips: { value: false }, |
13 | 13 | ||
14 | _strokeColorCtrl: { | ||
15 | value: null, | ||
16 | serializable: true | ||
17 | }, | ||
18 | |||
19 | useBorderWidth: { | ||
20 | value: null, | ||
21 | serializable: true | ||
22 | }, | ||
23 | |||
24 | borderWidthLabel: { | ||
25 | value: null, | ||
26 | serializable: true | ||
27 | }, | ||
28 | |||
29 | _borderWidth: { | ||
30 | value: null, | ||
31 | serializable: true | ||
32 | }, | ||
33 | |||
34 | useBorderStyle: { | ||
35 | value: null, | ||
36 | serializable: true | ||
37 | }, | ||
38 | |||
39 | borderStyleLabel: { | ||
40 | value: null, | ||
41 | serializable: true | ||
42 | }, | ||
43 | |||
44 | _borderStyle: { | ||
45 | value: null, | ||
46 | serializable: true | ||
47 | }, | ||
48 | |||
49 | useStrokeSize: { | ||
50 | value: null, | ||
51 | serializable: true | ||
52 | }, | ||
53 | |||
54 | strokeSizeLabel: { | ||
55 | value: null, | ||
56 | serializable: true | ||
57 | }, | ||
58 | |||
59 | _strokeSize: { | ||
60 | value: null, | ||
61 | serializable: true | ||
62 | }, | ||
63 | |||
64 | _useWebGL: { | ||
65 | value: null, | ||
66 | serializable: true | ||
67 | }, | ||
68 | |||
69 | _materialsContainer: { | ||
70 | value: null, | ||
71 | serializable: true | ||
72 | }, | ||
73 | |||
74 | _strokeMaterial: { | ||
75 | value: null, | ||
76 | serializable: true | ||
77 | }, | ||
78 | |||
14 | _stroke: { | 79 | _stroke: { |
15 | enumerable: false, | 80 | enumerable: false, |
16 | 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] } | 81 | 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] } |
diff --git a/js/components/tools-properties/line-properties.reel/line-properties.js b/js/components/tools-properties/line-properties.reel/line-properties.js index ce8c0494..8c845432 100755 --- a/js/components/tools-properties/line-properties.reel/line-properties.js +++ b/js/components/tools-properties/line-properties.reel/line-properties.js | |||
@@ -9,7 +9,10 @@ var Montage = require("montage/core/core").Montage, | |||
9 | 9 | ||
10 | exports.LineProperties = Montage.create(ToolProperties, { | 10 | exports.LineProperties = Montage.create(ToolProperties, { |
11 | 11 | ||
12 | base: { value: null }, | 12 | base: { |
13 | value: null, | ||
14 | serializable: true | ||
15 | }, | ||
13 | 16 | ||
14 | _subPrepare: { | 17 | _subPrepare: { |
15 | value: function() { |