diff options
| author | Nivesh Rajbhandari | 2012-06-13 13:51:39 -0700 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-06-13 13:51:39 -0700 |
| commit | 263ecfc95bd7eb5c726cd5688c3d74eb10296811 (patch) | |
| tree | 7c907dd58e9b4f4a1d4802d8d22b9c84d3c2edf3 /js/panels/properties.reel/sections/position-size.reel/position-size.html | |
| parent | 1bb2778224982aea7b9781c6559bb659983a400f (diff) | |
| parent | a827f2769d75848c0ba0bff03a927c1f2706322b (diff) | |
| download | ninja-263ecfc95bd7eb5c726cd5688c3d74eb10296811.tar.gz | |
Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixes
Conflicts:
js/panels/properties.reel/sections/position-size.reel/position-size.html
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
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 | 17 |
1 files changed, 8 insertions, 9 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 bc93da33..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 | |||
| @@ -34,8 +34,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 34 | "units": "px" | 34 | "units": "px" |
| 35 | }, | 35 | }, |
| 36 | "bindings": { | 36 | "bindings": { |
| 37 | "units": {"<<->": "@owner.leftUnits"}, | 37 | "units": {"<->": "@owner.leftUnits"}, |
| 38 | "value": {"<<->": "@owner.leftPosition"} | 38 | "value": {"<->": "@owner.leftPosition"} |
| 39 | } | 39 | } |
| 40 | }, | 40 | }, |
| 41 | "PosY": { | 41 | "PosY": { |
| @@ -48,8 +48,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 48 | "units": "px" | 48 | "units": "px" |
| 49 | }, | 49 | }, |
| 50 | "bindings": { | 50 | "bindings": { |
| 51 | "units": {"<<->": "@owner.topUnits"}, | 51 | "units": {"<->": "@owner.topUnits"}, |
| 52 | "value": {"<<->": "@owner.topPosition"} | 52 | "value": {"<->": "@owner.topPosition"} |
| 53 | } | 53 | } |
| 54 | }, | 54 | }, |
| 55 | 55 | ||
| @@ -61,8 +61,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 61 | "units": "px" | 61 | "units": "px" |
| 62 | }, | 62 | }, |
| 63 | "bindings": { | 63 | "bindings": { |
| 64 | "units": {"<<->": "@owner.heightUnits"}, | 64 | "units": {"<->": "@owner.heightUnits"}, |
| 65 | "value": {"<<->": "@owner.heightSize"} | 65 | "value": {"<->": "@owner.heightSize"} |
| 66 | } | 66 | } |
| 67 | }, | 67 | }, |
| 68 | 68 | ||
| @@ -74,8 +74,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 74 | "units": "px" | 74 | "units": "px" |
| 75 | }, | 75 | }, |
| 76 | "bindings": { | 76 | "bindings": { |
| 77 | "units": {"<<->": "@owner.widthUnits"}, | 77 | "units": {"<->": "@owner.widthUnits"}, |
| 78 | "value": {"<<->": "@owner.widthSize"} | 78 | "value": {"<->": "@owner.widthSize"} |
| 79 | } | 79 | } |
| 80 | 80 | ||
| 81 | }, | 81 | }, |
| @@ -84,7 +84,6 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 84 | "properties": { | 84 | "properties": { |
| 85 | "element": {"#": "posBound"}, | 85 | "element": {"#": "posBound"}, |
| 86 | "pressedClass": "lockUp", | 86 | "pressedClass": "lockUp", |
| 87 | "preventFocus": true, | ||
| 88 | "identifier": "ratio" | 87 | "identifier": "ratio" |
| 89 | } | 88 | } |
| 90 | } | 89 | } |