aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/shape-properties.reel/shape-properties.js
diff options
context:
space:
mode:
authorJon Reid2012-06-15 10:10:41 -0700
committerJon Reid2012-06-15 10:10:41 -0700
commit526ac54f73d53e1e2a3d6a4dbf4f9992c143baf7 (patch)
tree65939e59615aaa10a7db77211e71616ad531bd0e /js/components/tools-properties/shape-properties.reel/shape-properties.js
parentb5b760ee82e5cc4da176914983a6002cbf86c11a (diff)
parent5ee0c89fa0c7acc280ff3b884767e8513fd0b315 (diff)
downloadninja-526ac54f73d53e1e2a3d6a4dbf4f9992c143baf7.tar.gz
Merge remote-tracking branch 'ninja-internal/master' into test-merge
Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
Diffstat (limited to 'js/components/tools-properties/shape-properties.reel/shape-properties.js')
-rwxr-xr-xjs/components/tools-properties/shape-properties.reel/shape-properties.js71
1 files changed, 71 insertions, 0 deletions
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