aboutsummaryrefslogtreecommitdiff
path: root/js/panels/properties.reel/sections/position-size.reel/position-size.html
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-06-12 15:13:09 -0700
committerNivesh Rajbhandari2012-06-12 15:13:09 -0700
commit509092ff335f74517a413cfb2deeb9d2de20f8e3 (patch)
tree86dddcb4b74f04c965da52180cab3c49529148cf /js/panels/properties.reel/sections/position-size.reel/position-size.html
parent6854a72504f57903bd5de003e377f2aefb02d0da (diff)
downloadninja-509092ff335f74517a413cfb2deeb9d2de20f8e3.tar.gz
Fixing properties panel to support px and % for body and other elements.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/panels/properties.reel/sections/position-size.reel/position-size.html')
-rwxr-xr-xjs/panels/properties.reel/sections/position-size.reel/position-size.html16
1 files changed, 13 insertions, 3 deletions
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..bc93da33 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,9 +29,12 @@ 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": {
37 "units": {"<<->": "@owner.leftUnits"},
35 "value": {"<<->": "@owner.leftPosition"} 38 "value": {"<<->": "@owner.leftPosition"}
36 } 39 }
37 }, 40 },
@@ -40,9 +43,12 @@ 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": {
51 "units": {"<<->": "@owner.topUnits"},
46 "value": {"<<->": "@owner.topPosition"} 52 "value": {"<<->": "@owner.topPosition"}
47 } 53 }
48 }, 54 },
@@ -50,9 +56,12 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
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": {
64 "units": {"<<->": "@owner.heightUnits"},
56 "value": {"<<->": "@owner.heightSize"} 65 "value": {"<<->": "@owner.heightSize"}
57 } 66 }
58 }, 67 },
@@ -65,6 +74,7 @@ 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": {
77 "units": {"<<->": "@owner.widthUnits"},
68 "value": {"<<->": "@owner.widthSize"} 78 "value": {"<<->": "@owner.widthSize"}
69 } 79 }
70 80