aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValerio Virgillito2012-06-11 23:22:20 -0700
committerValerio Virgillito2012-06-11 23:22:20 -0700
commitdc503d002be8fe5f12fd3cc6f848b3190c219659 (patch)
tree7ea89b7e88159d929de98323a1496e2e123f5725
parentb6c88f548c8d3756738e534418732710af733f03 (diff)
downloadninja-dc503d002be8fe5f12fd3cc6f848b3190c219659.tar.gz
removing serializable to the tree and adding a few more missing properties
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
-rwxr-xr-xjs/components/tools-properties/fill-properties.reel/fill-properties.js25
-rwxr-xr-xjs/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.js24
-rwxr-xr-xjs/components/tools-properties/pen-properties.reel/pen-properties.html8
-rwxr-xr-xjs/components/tools-properties/pen-properties.reel/pen-properties.js18
-rw-r--r--js/components/treeview/ninja-branch.reel/ninja-branch.js28
-rw-r--r--js/components/treeview/treeview.reel/treeview.js52
6 files changed, 98 insertions, 57 deletions
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 7331b375..ef1699af 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,31 @@ var Montage = require("montage/core/core").Montage,
10 10
11var FillProperties = exports.FillProperties = Montage.create(ToolProperties, { 11var FillProperties = exports.FillProperties = Montage.create(ToolProperties, {
12 12
13 useFillColor: {
14 value: null,
15 serializable: true
16 },
17
18 _fillColorCtrl: {
19 value: null,
20 serializable: true
21 },
22
23 useWebGL: {
24 value: null,
25 serializable: true
26 },
27
28 _materialsContainer: {
29 value: null,
30 serializable: true
31 },
32
33 fillMaterial: {
34 value: null,
35 serializable: true
36 },
37
13 addedColorChips: { value: false }, 38 addedColorChips: { value: false },
14 39
15 _fill: { 40 _fill: {
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 e52da410..25823d11 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,22 +11,22 @@ var Montage = require("montage/core/core").Montage,
11var InkBottleProperties = exports.InkBottleProperties = Montage.create(ToolProperties, { 11var InkBottleProperties = exports.InkBottleProperties = Montage.create(ToolProperties, {
12 addedColorChips: { value: false }, 12 addedColorChips: { value: false },
13 13
14 _strokeColorCtrl: { 14 useStrokeColor: {
15 value: null, 15 value: null,
16 serializable: true 16 serializable: true
17 }, 17 },
18 18
19 useBorderWidth: { 19 _strokeColorCtrl: {
20 value: null, 20 value: null,
21 serializable: true 21 serializable: true
22 }, 22 },
23 23
24 borderWidthLabel: { 24 borderWidth: {
25 value: null, 25 value: null,
26 serializable: true 26 serializable: true
27 }, 27 },
28 28
29 _borderWidth: { 29 useBorderWidth: {
30 value: null, 30 value: null,
31 serializable: true 31 serializable: true
32 }, 32 },
@@ -36,42 +36,42 @@ var InkBottleProperties = exports.InkBottleProperties = Montage.create(ToolPrope
36 serializable: true 36 serializable: true
37 }, 37 },
38 38
39 borderStyleLabel: { 39 borderStyle: {
40 value: null, 40 value: null,
41 serializable: true 41 serializable: true
42 }, 42 },
43 43
44 _borderStyle: { 44 useStrokeSize: {
45 value: null, 45 value: null,
46 serializable: true 46 serializable: true
47 }, 47 },
48 48
49 useStrokeSize: { 49 strokeSize: {
50 value: null, 50 value: null,
51 serializable: true 51 serializable: true
52 }, 52 },
53 53
54 strokeSizeLabel: { 54 _useWebGL: {
55 value: null, 55 value: null,
56 serializable: true 56 serializable: true
57 }, 57 },
58 58
59 _strokeSize: { 59 useWebGL: {
60 value: null, 60 value: null,
61 serializable: true 61 serializable: true
62 }, 62 },
63 63
64 _useWebGL: { 64 _materialsContainer: {
65 value: null, 65 value: null,
66 serializable: true 66 serializable: true
67 }, 67 },
68 68
69 _materialsContainer: { 69 _strokeMaterial: {
70 value: null, 70 value: null,
71 serializable: true 71 serializable: true
72 }, 72 },
73 73
74 _strokeMaterial: { 74 strokeMaterial: {
75 value: null, 75 value: null,
76 serializable: true 76 serializable: true
77 }, 77 },
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 4ea6aac4..adb5cd7d 100755
--- a/js/components/tools-properties/pen-properties.reel/pen-properties.html
+++ b/js/components/tools-properties/pen-properties.reel/pen-properties.html
@@ -29,14 +29,18 @@
29 "properties": { 29 "properties": {
30 "element": {"#": "penProperties"}, 30 "element": {"#": "penProperties"},
31 31
32 "_penToolRadio": {"#": "penTool"},
33 "_penPlusRadio": {"#": "penPlus"},
34 "_penMinusRadio": {"#": "penMinus"},
35
32 "_fillColorCtrl": {"#": "fillColorCtrl"}, 36 "_fillColorCtrl": {"#": "fillColorCtrl"},
33 "_strokeColorCtrl": {"#": "strokeColorCtrl"}, 37 "_strokeColorCtrl": {"#": "strokeColorCtrl"},
34 "_strokeSize": {"@": "strokeSizeHT"} 38 "_strokeSize": {"@": "strokeSizeHT"}
35 } 39 }
36 } 40 }
37 } 41 }
38 </script> 42 </script>
39 43
40 </head> 44 </head>
41 45
42 <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 5ae03adc..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
10var PenProperties = exports.PenProperties = Montage.create(ToolProperties, { 10var 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