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/custom.reel/custom.js12
-rwxr-xr-xjs/panels/properties.reel/sections/position-size.reel/position-size.html25
-rwxr-xr-xjs/panels/properties.reel/sections/position-size.reel/position-size.js81
-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.js121
6 files changed, 214 insertions, 31 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/custom.reel/custom.js b/js/panels/properties.reel/sections/custom.reel/custom.js
index 9df16112..08434b01 100755
--- a/js/panels/properties.reel/sections/custom.reel/custom.js
+++ b/js/panels/properties.reel/sections/custom.reel/custom.js
@@ -116,7 +116,11 @@ exports.CustomSection = Montage.create(Component, {
116 value: function(event) { 116 value: function(event) {
117 // Change the stage color for now 117 // Change the stage color for now
118 //console.log(this, event); 118 //console.log(this, event);
119 ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], this.id, [event._event.color.css], "Change", "pi", ''); 119 if (event._event.color && event._event.color.css) {
120 ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], this.id, [event._event.color.css], "Change", "pi", '');
121 } else {
122 ElementsMediator.setProperty([this.application.ninja.currentDocument.model.documentRoot], this.id, ['none'], "Change", "pi", '');
123 }
120 /* 124 /*
121 var propEvent = document.createEvent("CustomEvent"); 125 var propEvent = document.createEvent("CustomEvent");
122 propEvent.initEvent("propertyChange", true, true); 126 propEvent.initEvent("propertyChange", true, true);
@@ -233,6 +237,12 @@ exports.CustomSection = Montage.create(Component, {
233 boundObjectPropertyPath: "value" 237 boundObjectPropertyPath: "value"
234 }); 238 });
235 239
240 //Bind object value to controls list so it can be manipulated
241 Object.defineBinding(this.controls, aField.id + "Units", {
242 boundObject: obj,
243 boundObjectPropertyPath: "units"
244 });
245
236 return obj; 246 return obj;
237 } 247 }
238 }, 248 },
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..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
@@ -29,10 +29,13 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
29 "properties": { 29 "properties": {
30 "element": {"#": "PosX"}, 30 "element": {"#": "PosX"},
31 "maxValue": 10000, 31 "maxValue": 10000,
32 "minValue": -10000 32 "minValue": -10000,
33 "acceptableUnits" : ["px", "%"],
34 "units": "px"
33 }, 35 },
34 "bindings": { 36 "bindings": {
35 "value": {"<<->": "@owner.leftPosition"} 37 "units": {"<->": "@owner.leftUnits"},
38 "value": {"<->": "@owner.leftPosition"}
36 } 39 }
37 }, 40 },
38 "PosY": { 41 "PosY": {
@@ -40,20 +43,26 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
40 "properties": { 43 "properties": {
41 "element": {"#": "PosY"}, 44 "element": {"#": "PosY"},
42 "maxValue": 10000, 45 "maxValue": 10000,
43 "minValue": -10000 46 "minValue": -10000,
47 "acceptableUnits" : ["px", "%"],
48 "units": "px"
44 }, 49 },
45 "bindings": { 50 "bindings": {
46 "value": {"<<->": "@owner.topPosition"} 51 "units": {"<->": "@owner.topUnits"},
52 "value": {"<->": "@owner.topPosition"}
47 } 53 }
48 }, 54 },
49 55
50 "PosH": { 56 "PosH": {
51 "prototype": "js/components/hottextunit.reel[HotTextUnit]", 57 "prototype": "js/components/hottextunit.reel[HotTextUnit]",
52 "properties": { 58 "properties": {
53 "element": {"#": "PosH"} 59 "element": {"#": "PosH"},
60 "acceptableUnits" : ["px", "%"],
61 "units": "px"
54 }, 62 },
55 "bindings": { 63 "bindings": {
56 "value": {"<<->": "@owner.heightSize"} 64 "units": {"<->": "@owner.heightUnits"},
65 "value": {"<->": "@owner.heightSize"}
57 } 66 }
58 }, 67 },
59 68
@@ -65,7 +74,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
65 "units": "px" 74 "units": "px"
66 }, 75 },
67 "bindings": { 76 "bindings": {
68 "value": {"<<->": "@owner.widthSize"} 77 "units": {"<->": "@owner.widthUnits"},
78 "value": {"<->": "@owner.widthSize"}
69 } 79 }
70 80
71 }, 81 },
@@ -74,7 +84,6 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
74 "properties": { 84 "properties": {
75 "element": {"#": "posBound"}, 85 "element": {"#": "posBound"},
76 "pressedClass": "lockUp", 86 "pressedClass": "lockUp",
77 "preventFocus": true,
78 "identifier": "ratio" 87 "identifier": "ratio"
79 } 88 }
80 } 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 7c24e02a..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,21 +8,78 @@ 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 },
14 55
56 leftUnits: {
57 value: "px"
58 },
59
15 topPosition: { 60 topPosition: {
16 value: 0 61 value: 0
17 }, 62 },
18 63
64 topUnits: {
65 value: "px"
66 },
67