aboutsummaryrefslogtreecommitdiff
path: root/js/panels/properties.reel
diff options
context:
space:
mode:
Diffstat (limited to 'js/panels/properties.reel')
-rwxr-xr-xjs/panels/properties.reel/properties.html9
-rwxr-xr-xjs/panels/properties.reel/properties.js19
-rwxr-xr-xjs/panels/properties.reel/section.reel/section.js1
-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
8 files changed, 124 insertions, 16 deletions
diff --git a/js/panels/properties.reel/properties.html b/js/panels/properties.reel/properties.html
index b9aa206b..a737bd39 100755
--- a/js/panels/properties.reel/properties.html
+++ b/js/panels/properties.reel/properties.html
@@ -13,24 +13,21 @@
13 "elementName": { 13 "elementName": {
14 "prototype": "montage/ui/textfield.reel", 14 "prototype": "montage/ui/textfield.reel",
15 "properties": { 15 "properties": {
16 "element": {"#": "elementName"}, 16 "element": {"#": "elementName"}
17 "readOnly": true
18 } 17 }
19 }, 18 },
20 19
21 "elementId": { 20 "elementId": {
22 "prototype": "montage/ui/textfield.reel", 21 "prototype": "montage/ui/textfield.reel",
23 "properties": { 22 "properties": {
24 "element": {"#": "elementId"}, 23 "element": {"#": "elementId"}
25 "readOnly": false
26 } 24 }
27 }, 25 },
28 26
29 "elementClass": { 27 "elementClass": {
30 "prototype": "montage/ui/textfield.reel", 28 "prototype": "montage/ui/textfield.reel",
31 "properties": { 29 "properties": {
32 "element": {"#": "elementClass"}, 30 "element": {"#": "elementClass"}
33 "readOnly": false
34 } 31 }
35 }, 32 },
36 33
diff --git a/js/panels/properties.reel/properties.js b/js/panels/properties.reel/properties.js
index cc99ca6c..e9d9472e 100755
--- a/js/panels/properties.reel/properties.js
+++ b/js/panels/properties.reel/properties.js
@@ -43,15 +43,28 @@ exports.Properties = Montage.create(Component, {
43 }, 43 },
44 44
45 elementName: { 45 elementName: {
46 value: null 46 value: null,
47 serializable: true
47 }, 48 },
48 49
49 elementId: { 50 elementId: {
50 value: null 51 value: null,
52 serializable: true
51 }, 53 },
52 54
53 elementClass: { 55 elementClass: {
54 value: null 56 value: null,
57 serializable: true
58 },
59
60 positionSize: {
61 value: null,
62 serializable: true
63 },
64
65 threeD: {
66 value: null,
67 serializable: true
55 }, 68 },
56 69
57 customSections: { 70 customSections: {
diff --git a/js/panels/properties.reel/section.reel/section.js b/js/panels/properties.reel/section.reel/section.js
index b246c171..310bc48f 100755
--- a/js/panels/properties.reel/section.reel/section.js
+++ b/js/panels/properties.reel/section.reel/section.js
@@ -11,6 +11,7 @@ exports.Section = Montage.create(Component, {
11 11
12 name: { 12 name: {
13 value: "Panel" 13 value: "Panel"
14
14 }, 15 },
15 16
16 slot: { 17 slot: {
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