diff options
Diffstat (limited to 'js/panels/properties.reel/sections/position-and-size.reel')
-rwxr-xr-x | js/panels/properties.reel/sections/position-and-size.reel/position-and-size.html | 30 | ||||
-rwxr-xr-x | js/panels/properties.reel/sections/position-and-size.reel/position-and-size.js | 12 |
2 files changed, 21 insertions, 21 deletions
diff --git a/js/panels/properties.reel/sections/position-and-size.reel/position-and-size.html b/js/panels/properties.reel/sections/position-and-size.reel/position-and-size.html index a7aac84e..75cb2944 100755 --- a/js/panels/properties.reel/sections/position-and-size.reel/position-and-size.html +++ b/js/panels/properties.reel/sections/position-and-size.reel/position-and-size.html | |||
@@ -23,6 +23,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
23 | "bindButton": {"@": "bindButton"} | 23 | "bindButton": {"@": "bindButton"} |
24 | } | 24 | } |
25 | }, | 25 | }, |
26 | |||
26 | "PosX": { | 27 | "PosX": { |
27 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", | 28 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", |
28 | "properties": { | 29 | "properties": { |
@@ -31,11 +32,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
31 | "minValue": -10000 | 32 | "minValue": -10000 |
32 | }, | 33 | }, |
33 | "bindings": { | 34 | "bindings": { |
34 | "value": { | 35 | "value": {"<<->": "@owner.leftPosition"} |
35 | "boundObject": {"@": "owner"}, | ||
36 | "boundObjectPropertyPath": "leftPosition", | ||
37 | "oneway": false | ||
38 | } | ||
39 | } | 36 | } |
40 | }, | 37 | }, |
41 | "PosY": { | 38 | "PosY": { |
@@ -46,11 +43,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
46 | "minValue": -10000 | 43 | "minValue": -10000 |
47 | }, | 44 | }, |
48 | "bindings": { | 45 | "bindings": { |
49 | "value": { | 46 | "value": {"<<->": "@owner.topPosition"} |
50 | "boundObject": {"@": "owner"}, | ||
51 | "boundObjectPropertyPath": "topPosition", | ||
52 | "oneway": false | ||
53 | } | ||
54 | } | 47 | } |
55 | }, | 48 | }, |
56 | "PosH": { | 49 | "PosH": { |
@@ -59,25 +52,20 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
59 | "element": {"#": "PosH"} | 52 | "element": {"#": "PosH"} |
60 | }, | 53 | }, |
61 | "bindings": { | 54 | "bindings": { |
62 | "value": { | 55 | "value": {"<<->": "@owner.heightSize"} |
63 | "boundObject": {"@": "owner"}, | ||
64 | "boundObjectPropertyPath": "heightSize", | ||
65 | "oneway": false | ||
66 | } | ||
67 | } | 56 | } |
68 | }, | 57 | }, |
69 | "PosW": { | 58 | "PosW": { |
70 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", | 59 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", |
71 | "properties": { | 60 | "properties": { |
72 | "element": {"#": "PosW"} | 61 | "element": {"#": "PosW"}, |
62 | "acceptableUnits" : ["px", "%"], | ||
63 | "units": "px" | ||
73 | }, | 64 | }, |
74 | "bindings": { | 65 | "bindings": { |
75 | "value": { | 66 | "value": {"<<->": "@owner.widthSize"} |
76 | "boundObject": {"@": "owner"}, | ||
77 | "boundObjectPropertyPath": "widthSize", | ||
78 | "oneway": false | ||
79 | } | ||
80 | } | 67 | } |
68 | |||
81 | }, | 69 | }, |
82 | "bindButton": { | 70 | "bindButton": { |
83 | "prototype": "montage/ui/toggle-button.reel", | 71 | "prototype": "montage/ui/toggle-button.reel", |
diff --git a/js/panels/properties.reel/sections/position-and-size.reel/position-and-size.js b/js/panels/properties.reel/sections/position-and-size.reel/position-and-size.js index 1e47916f..8842558b 100755 --- a/js/panels/properties.reel/sections/position-and-size.reel/position-and-size.js +++ b/js/panels/properties.reel/sections/position-and-size.reel/position-and-size.js | |||
@@ -23,7 +23,19 @@ exports.PosSize = Montage.create(Component, { | |||
23 | widthSize: { | 23 | widthSize: { |
24 | value: 0 | 24 | value: 0 |
25 | }, | 25 | }, |
26 | /* | ||
27 | widthSize: { | ||
28 | get: function() { return this._widthSize;}, | ||
29 | set: function(value) { | ||
30 | this._widthSize = parseInt(value); | ||
31 | this.widthUnit = value; | ||
32 | } | ||
33 | }, | ||
26 | 34 | ||
35 | widthUnit: { | ||
36 | value: "px" | ||
37 | }, | ||
38 | */ | ||
27 | savedPosition: { | 39 | savedPosition: { |
28 | value: null | 40 | value: null |
29 | }, | 41 | }, |