diff options
author | hwc487 | 2012-06-13 14:04:09 -0700 |
---|---|---|
committer | hwc487 | 2012-06-13 14:04:09 -0700 |
commit | 3e481dd581e0305dd8b572ed0d17e86622223464 (patch) | |
tree | aca2b28aa72857a52e047fb94090c34ab8dd1c2c /js/panels/properties.reel/sections/position-size.reel/position-size.html | |
parent | a7aa51e6b91623772eef54b827616432838b560e (diff) | |
parent | 682f4917d6badd105998c3dd84d031c38b51f017 (diff) | |
download | ninja-3e481dd581e0305dd8b572ed0d17e86622223464.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Diffstat (limited to 'js/panels/properties.reel/sections/position-size.reel/position-size.html')
-rwxr-xr-x | js/panels/properties.reel/sections/position-size.reel/position-size.html | 25 |
1 files changed, 17 insertions, 8 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..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 | } |