aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/selection-properties.reel
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/selection-properties.reel
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/selection-properties.reel')
-rwxr-xr-xjs/components/tools-properties/selection-properties.reel/selection-properties.js86
1 files changed, 85 insertions, 1 deletions
diff --git a/js/components/tools-properties/selection-properties.reel/selection-properties.js b/js/components/tools-properties/selection-properties.reel/selection-properties.js
index 43622960..c036c4a3 100755
--- a/js/components/tools-properties/selection-properties.reel/selection-properties.js
+++ b/js/components/tools-properties/selection-properties.reel/selection-properties.js
@@ -10,7 +10,91 @@ var ToolProperties = require("js/components/tools-properties/tool-properties").T
10 10
11exports.SelectionProperties = Montage.create(ToolProperties, { 11exports.SelectionProperties = Montage.create(ToolProperties, {
12 12
13 transform: { value: null }, 13 transform: {
14 value: null,
15 serializable: true
16 },
17
18 topAlign: {
19 value: null,
20 serializable: true
21 },
22
23 middleAlign: {
24 value: null,
25 serializable: true
26 },
27
28 bottomAlign: {
29 value: null,
30 serializable: true
31 },
32
33 leftAlign: {
34 value: null,
35 serializable: true
36 },
37
38 centerAlign: {
39 value: null,
40 serializable: true
41 },
42
43 rightAlign: {
44 value: null,
45 serializable: true
46 },
47
48 distTop: {
49 value: null,
50 serializable: true
51 },
52
53 distMiddle: {
54 value: null,
55 serializable: true
56 },
57
58 distBottom: {
59 value: null,
60 serializable: true
61 },
62
63 distLeft: {
64 value: null,
65 serializable: true
66 },
67
68 distCenter: {
69 value: null,
70 serializable: true
71 },
72
73 distRight: {
74 value: null,
75 serializable: true
76 },
77
78 arrangeBringForward: {
79 value: null,
80 serializable: true
81 },
82
83 arrangeSendBackward: {
84 value: null,
85 serializable: true
86 },
87
88 arrangeBringToFront: {
89 value: null,
90 serializable: true
91 },
92
93 arrangeSendToBack: {
94 value: null,
95 serializable: true
96 },
97
14 _controls: { value: false }, 98 _controls: { value: false },
15 99
16 _subPrepare: { 100 _subPrepare: {