aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/pen-properties.reel
diff options
context:
space:
mode:
authorValerio Virgillito2012-06-06 00:25:27 -0700
committerValerio Virgillito2012-06-06 00:25:27 -0700
commit0e1a276f19ea70009c5a649e9667861d7c346a7e (patch)
tree6db7675bbe89746ba47002bba306da42a7261312 /js/components/tools-properties/pen-properties.reel
parentf7e4257745ccd44b8d24555f0ef787429d6e472c (diff)
downloadninja-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/pen-properties.reel')
-rwxr-xr-xjs/components/tools-properties/pen-properties.reel/pen-properties.html4
-rwxr-xr-xjs/components/tools-properties/pen-properties.reel/pen-properties.js15
2 files changed, 15 insertions, 4 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..4ea6aac4 100755
--- a/js/components/tools-properties/pen-properties.reel/pen-properties.html
+++ b/js/components/tools-properties/pen-properties.reel/pen-properties.html
@@ -29,10 +29,6 @@
29 "properties": { 29 "properties": {
30 "element": {"#": "penProperties"}, 30 "element": {"#": "penProperties"},
31 31
32 "_penToolRadio": {"#": "penTool"},
33 "_penPlusRadio": {"#": "penPlus"},
34 "_penMinusRadio": {"#": "penMinus"},
35
36 "_fillColorCtrl": {"#": "fillColorCtrl"}, 32 "_fillColorCtrl": {"#": "fillColorCtrl"},
37 "_strokeColorCtrl": {"#": "strokeColorCtrl"}, 33 "_strokeColorCtrl": {"#": "strokeColorCtrl"},
38 "_strokeSize": {"@": "strokeSizeHT"} 34 "_strokeSize": {"@": "strokeSizeHT"}
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 cd205e07..2bb4d3e9 100755
--- a/js/components/tools-properties/pen-properties.reel/pen-properties.js
+++ b/js/components/tools-properties/pen-properties.reel/pen-properties.js
@@ -10,6 +10,21 @@ var ToolProperties = require("js/components/tools-properties/tool-properties").T
10var PenProperties = exports.PenProperties = Montage.create(ToolProperties, { 10var PenProperties = exports.PenProperties = Montage.create(ToolProperties, {
11 addedColorChips: { value: false }, 11 addedColorChips: { value: false },
12 12
13 _fillColorCtrl: {
14 value: null,
15 serializable: true
16 },
17
18 _strokeColorCtrl: {
19 value: null,
20 serializable: true
21 },
22
23 _strokeSize: {
24 value: null,
25 serializable: true
26 },
27
13 _fill: { 28 _fill: {
14 enumerable: false, 29 enumerable: false,
15 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] } 30 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] }