aboutsummaryrefslogtreecommitdiff
path: root/js/panels/properties.reel/sections
diff options
context:
space:
mode:
Diffstat (limited to 'js/panels/properties.reel/sections')
-rwxr-xr-xjs/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.js4
-rwxr-xr-xjs/panels/properties.reel/sections/position-size.reel/position-size.html9
-rwxr-xr-xjs/panels/properties.reel/sections/position-size.reel/position-size.js41
-rwxr-xr-xjs/panels/properties.reel/sections/three-d-view.reel/three-d-view.html2
-rwxr-xr-xjs/panels/properties.reel/sections/three-d-view.reel/three-d-view.js55
5 files changed, 104 insertions, 7 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;
8var Component = require("montage/ui/component").Component; 8var Component = require("montage/ui/component").Component;
9 9
10exports.SingleRow = Montage.create(Component, { 10exports.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 5d1a805a..ccc7a159 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
@@ -32,7 +32,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
32 "minValue": -10000 32 "minValue": -10000
33 }, 33 },
34 "bindings": { 34 "bindings": {
35 "value": {"<<->": "@owner.leftPosition"} 35 "value": {"<->": "@owner.leftPosition"}
36 } 36 }
37 }, 37 },
38 "PosY": { 38 "PosY": {
@@ -43,7 +43,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
43 "minValue": -10000 43 "minValue": -10000
44 }, 44 },
45 "bindings": { 45 "bindings": {
46 "value": {"<<->": "@owner.topPosition"} 46 "value": {"<->": "@owner.topPosition"}
47 } 47 }
48 }, 48 },
49 49
@@ -53,7 +53,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
53 "element": {"#": "PosH"} 53 "element": {"#": "PosH"}
54 }, 54 },
55 "bindings": { 55 "bindings": {
56 "value": {"<<->": "@owner.heightSize"} 56 "value": {"<->": "@owner.heightSize"}
57 } 57 }
58 }, 58 },
59 59
@@ -65,7 +65,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
65 "units": "px" 65 "units": "px"
66 }, 66 },
67 "bindings": { 67 "bindings": {
68 "value": {"<<->": "@owner.widthSize"} 68 "value": {"<->": "@owner.widthSize"}
69 } 69 }
70 70
71 }, 71 },
@@ -74,7 +74,6 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
74 "properties": { 74 "properties": {
75 "element": {"#": "posBound"}, 75 "element": {"#": "posBound"},
76 "pressedClass": "lockUp", 76 "pressedClass": "lockUp",
77 "preventFocus": true,
78 "identifier": "ratio" 77 "identifier": "ratio"
79 } 78 }
80 } 79 }
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 7c24e02a..fef2b195 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;
8var Component = require("montage/ui/component").Component; 8var Component = require("montage/ui/component").Component;
9 9
10exports.PositionSize = Montage.create(Component, { 10exports.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 serializable: true
92 },
93
94 zAngleControl: {
95 value: null,
96