aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/shape-properties.reel
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-06-13 13:51:39 -0700
committerNivesh Rajbhandari2012-06-13 13:51:39 -0700
commit263ecfc95bd7eb5c726cd5688c3d74eb10296811 (patch)
tree7c907dd58e9b4f4a1d4802d8d22b9c84d3c2edf3 /js/components/tools-properties/shape-properties.reel
parent1bb2778224982aea7b9781c6559bb659983a400f (diff)
parenta827f2769d75848c0ba0bff03a927c1f2706322b (diff)
downloadninja-263ecfc95bd7eb5c726cd5688c3d74eb10296811.tar.gz
Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixes
Conflicts: js/panels/properties.reel/sections/position-size.reel/position-size.html Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/components/tools-properties/shape-properties.reel')
-rwxr-xr-xjs/components/tools-properties/shape-properties.reel/shape-properties.html7
-rwxr-xr-xjs/components/tools-properties/shape-properties.reel/shape-properties.js71
2 files changed, 72 insertions, 6 deletions
diff --git a/js/components/tools-properties/shape-properties.reel/shape-properties.html b/js/components/tools-properties/shape-properties.reel/shape-properties.html
index 9b523a3f..ea246ea8 100755
--- a/js/components/tools-properties/shape-properties.reel/shape-properties.html
+++ b/js/components/tools-properties/shape-properties.reel/shape-properties.html
@@ -118,12 +118,7 @@
118 "rectProperties": {"@": "rectProperties1"}, 118 "rectProperties": {"@": "rectProperties1"},
119 "lineProperties": {"@": "lineProperties1"}, 119 "lineProperties": {"@": "lineProperties1"},
120 120
121 "endDivider": {"#": "endDivider"}, 121 "endDivider": {"#": "endDivider"}
122
123 "components": [
124 {"@": "repetition1"}
125 ]
126
127 } 122 }
128 123
129 } 124 }
diff --git a/js/components/tools-properties/shape-properties.reel/shape-properties.js b/js/components/tools-properties/shape-properties.reel/shape-properties.js
index bd0cf8cf..5829634c 100755
--- a/js/components/tools-properties/shape-properties.reel/shape-properties.js
+++ b/js/components/tools-properties/shape-properties.reel/shape-properties.js
@@ -10,6 +10,77 @@ var Montage = require("montage/core/core").Montage,
10 10
11var ShapeProperties = exports.ShapeProperties = Montage.create(ToolProperties, { 11var ShapeProperties = exports.ShapeProperties = Montage.create(ToolProperties, {
12 toolsData: { value: null }, 12 toolsData: { value: null },
13
14 _strokeMaterial: {
15 value: null,
16 serializable: true
17 },
18
19 _fillIcon: {
20 value: null,
21 serializable: true
22 },
23
24 _fillMaterial: {
25 value: null,
26 serializable: true
27 },
28
29 _useWebGL: {
30 value: null,
31 serializable: true
32 },
33
34 _materialLabel: {
35 value: null,
36 serializable: true
37 },
38
39 _strokeIcon: {
40 value: null,
41 serializable: true
42 },
43
44 _fillColorCtrlIcon: {
45 value: null,
46 serializable: true
47 },
48
49 _fillColorCtrl: {
50 value: null,
51 serializable: true
52 },
53
54 _strokeColorCtrl: {
55 value: null,
56 serializable: true
57 },
58
59 _strokeSize: {
60 value: null,
61 serializable: true
62 },
63
64 ovalProperties: {
65 value: null,
66 serializable: true
67 },
68
69 rectProperties: {
70 value: null,
71 serializable: true
72 },
73
74 lineProperties: {
75 value: null,
76 serializable: true
77 },
78
79 endDivider: {
80 value: null,
81 serializable: true
82 },
83
13 _use3D: { value: false }, 84 _use3D: { value: false },
14 addedColorChips: { value: false }, 85 addedColorChips: { value: false },
15 86