diff options
Diffstat (limited to 'js/panels/properties.reel/sections')
5 files changed, 108 insertions, 11 deletions
diff --git a/js/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.js b/js/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.js index b606d6b8..a11cd3f6 100755 --- a/js/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.js +++ b/js/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.js | |||
@@ -8,6 +8,10 @@ var Montage = require("montage/core/core").Montage; | |||
8 | var Component = require("montage/ui/component").Component; | 8 | var Component = require("montage/ui/component").Component; |
9 | 9 | ||
10 | exports.SingleRow = Montage.create(Component, { | 10 | exports.SingleRow = Montage.create(Component, { |
11 | slot: { | ||
12 | value: null | ||
13 | }, | ||
14 | |||
11 | id: { | 15 | id: { |
12 | value: null | 16 | value: null |
13 | }, | 17 | }, |
diff --git a/js/panels/properties.reel/sections/position-size.reel/position-size.html b/js/panels/properties.reel/sections/position-size.reel/position-size.html index bc93da33..d322f826 100755 --- a/js/panels/properties.reel/sections/position-size.reel/position-size.html +++ b/js/panels/properties.reel/sections/position-size.reel/position-size.html | |||
@@ -34,8 +34,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
34 | "units": "px" | 34 | "units": "px" |
35 | }, | 35 | }, |
36 | "bindings": { | 36 | "bindings": { |
37 | "units": {"<<->": "@owner.leftUnits"}, | 37 | "units": {"<->": "@owner.leftUnits"}, |
38 | "value": {"<<->": "@owner.leftPosition"} | 38 | "value": {"<->": "@owner.leftPosition"} |
39 | } | 39 | } |
40 | }, | 40 | }, |
41 | "PosY": { | 41 | "PosY": { |
@@ -48,8 +48,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
48 | "units": "px" | 48 | "units": "px" |
49 | }, | 49 | }, |
50 | "bindings": { | 50 | "bindings": { |
51 | "units": {"<<->": "@owner.topUnits"}, | 51 | "units": {"<->": "@owner.topUnits"}, |
52 | "value": {"<<->": "@owner.topPosition"} | 52 | "value": {"<->": "@owner.topPosition"} |
53 | } | 53 | } |
54 | }, | 54 | }, |
55 | 55 | ||
@@ -61,8 +61,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
61 | "units": "px" | 61 | "units": "px" |
62 | }, | 62 | }, |
63 | "bindings": { | 63 | "bindings": { |
64 | "units": {"<<->": "@owner.heightUnits"}, | 64 | "units": {"<->": "@owner.heightUnits"}, |
65 | "value": {"<<->": "@owner.heightSize"} | 65 | "value": {"<->": "@owner.heightSize"} |
66 | } | 66 | } |
67 | }, | 67 | }, |
68 | 68 | ||
@@ -74,8 +74,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
74 | "units": "px" | 74 | "units": "px" |
75 | }, | 75 | }, |
76 | "bindings": { | 76 | "bindings": { |
77 | "units": {"<<->": "@owner.widthUnits"}, | 77 | "units": {"<->": "@owner.widthUnits"}, |
78 | "value": {"<<->": "@owner.widthSize"} | 78 | "value": {"<->": "@owner.widthSize"} |
79 | } | 79 | } |
80 | 80 | ||
81 | }, | 81 | }, |
@@ -84,7 +84,6 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
84 | "properties": { | 84 | "properties": { |
85 | "element": {"#": "posBound"}, | 85 | "element": {"#": "posBound"}, |
86 | "pressedClass": "lockUp", | 86 | "pressedClass": "lockUp", |
87 | "preventFocus": true, | ||
88 | "identifier": "ratio" | 87 | "identifier": "ratio" |
89 | } | 88 | } |
90 | } | 89 | } |
diff --git a/js/panels/properties.reel/sections/position-size.reel/position-size.js b/js/panels/properties.reel/sections/position-size.reel/position-size.js index d9fd629c..94c0bbf2 100755 --- a/js/panels/properties.reel/sections/position-size.reel/position-size.js +++ b/js/panels/properties.reel/sections/position-size.reel/position-size.js | |||
@@ -8,6 +8,47 @@ var Montage = require("montage/core/core").Montage; | |||
8 | var Component = require("montage/ui/component").Component; | 8 | var Component = require("montage/ui/component").Component; |
9 | 9 | ||
10 | exports.PositionSize = Montage.create(Component, { | 10 | exports.PositionSize = Montage.create(Component, { |
11 | |||
12 | position: { | ||
13 | value: null, | ||
14 | serializable: true | ||
15 | }, | ||
16 | |||
17 | leftLabel: { | ||
18 | value: null, | ||
19 | serializable: true | ||
20 | }, | ||
21 | |||
22 | leftControl: { | ||
23 | value: null, | ||
24 | serializable: true | ||
25 | }, | ||
26 | |||
27 | topLabel: { | ||
28 | value: null, | ||
29 | serializable: true | ||
30 | }, | ||
31 | |||
32 | topControl: { | ||
33 | value: null, | ||
34 | serializable: true | ||
35 | }, | ||
36 | |||
37 | heightControl: { | ||
38 | value: null, | ||
39 | serializable: true | ||
40 | }, | ||
41 | |||
42 | widthControl: { | ||
43 | value: null, | ||
44 | serializable: true | ||
45 | }, | ||
46 | |||
47 | bindButton: { | ||
48 | value: null, | ||
49 | serializable: true | ||
50 | }, | ||
51 | |||
11 | leftPosition: { | 52 | leftPosition: { |
12 | value: 0 | 53 | value: 0 |
13 | }, | 54 | }, |
diff --git a/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html b/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html index 5ef13fab..572e5a60 100755 --- a/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html +++ b/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html | |||
@@ -219,7 +219,6 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
219 | "properties": { | 219 | "properties": { |
220 | "element": {"#": "rdioLocal"}, | 220 | "element": {"#": "rdioLocal"}, |
221 | "label": "Local", | 221 | "label": "Local", |
222 | "value": "Local", | ||
223 | "group": {"@": "axisModeGroup"}, | 222 | "group": {"@": "axisModeGroup"}, |
224 | "checked": true | 223 | "checked": true |
225 | } | 224 | } |
@@ -229,7 +228,6 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
229 | "properties": { | 228 | "properties": { |
230 | "element": {"#": "rdioGlobal"}, | 229 | "element": {"#": "rdioGlobal"}, |
231 | "label": "Global", | 230 | "label": "Global", |
232 | "value": "Global", | ||
233 | "group": {"@": "axisModeGroup"} | 231 | "group": {"@": "axisModeGroup"} |
234 | } | 232 | } |
235 | }, | 233 | }, |
diff --git a/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js b/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js index f8d158ce..5839ac64 100755 --- a/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js +++ b/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js | |||
@@ -51,6 +51,61 @@ exports.ThreeD = Montage.create(Component, { | |||
51 | } | 51 | } |
52 | }, | 52 | }, |
53 | 53 | ||
54 | x3DControl: { | ||
55 | value: null, | ||
56 | serializable: true | ||
57 | }, | ||
58 | |||
59 | y3DControl: { | ||
60 | value: null, | ||
61 | serializable: true | ||
62 | }, | ||
63 | |||
64 | z3DControl: { | ||
65 | value: null, | ||
66 | serializable: true | ||
67 | }, | ||
68 | |||
69 | x3DLabel: { | ||
70 | value: null, | ||
71 | serializable: true | ||
72 | }, | ||
73 | |||
74 | y3DLabel: { | ||
75 | value: null, | ||
76 | serializable: true | ||
77 | }, | ||
78 | |||
79 | z3DLabel: { | ||
80 | value: null, | ||
81 | serializable: true | ||
82 | }, | ||
83 | |||
84 | xAngleControl: { | ||
85 | value: null, | ||
86 | serializable: true | ||
87 | }, | ||
88 | |||
89 | yAngleControl: { | ||
90 | value: null, | ||
91< |