From 0e1a276f19ea70009c5a649e9667861d7c346a7e Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Wed, 6 Jun 2012 00:25:27 -0700
Subject: first iteration of adding serializable to ninja plus other changes to
 run the latest montage

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 .../sections/position-size.reel/position-size.html               | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'js/panels/properties.reel/sections/position-size.reel/position-size.html')

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..ccc7a159 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
@@ -32,7 +32,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
                 "minValue": -10000
             },
             "bindings": {
-                "value": {"<<->": "@owner.leftPosition"}
+                "value": {"<->": "@owner.leftPosition"}
             }
         },
         "PosY": {
@@ -43,7 +43,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
                 "minValue": -10000
             },
             "bindings": {
-                "value": {"<<->": "@owner.topPosition"}
+                "value": {"<->": "@owner.topPosition"}
             }
         },
 
@@ -53,7 +53,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
                 "element": {"#": "PosH"}
             },
             "bindings": {
-                "value": {"<<->": "@owner.heightSize"}
+                "value": {"<->": "@owner.heightSize"}
             }
         },
 
@@ -65,7 +65,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
                 "units": "px"
             },
             "bindings": {
-                "value": {"<<->": "@owner.widthSize"}
+                "value": {"<->": "@owner.widthSize"}
             }
 
         },
@@ -74,7 +74,6 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
             "properties": {
                 "element": {"#": "posBound"},
                 "pressedClass": "lockUp",
-                "preventFocus": true,
                 "identifier": "ratio"
             }
         }
-- 
cgit v1.2.3


From 509092ff335f74517a413cfb2deeb9d2de20f8e3 Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Tue, 12 Jun 2012 15:13:09 -0700
Subject: Fixing properties panel to support px and % for body and other
 elements.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
 .../sections/position-size.reel/position-size.html       | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

(limited to 'js/panels/properties.reel/sections/position-size.reel/position-size.html')

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
             "properties": {
                 "element": {"#": "PosX"},
                 "maxValue": 10000,
-                "minValue": -10000
+                "minValue": -10000,
+                "acceptableUnits" : ["px", "%"],
+                "units": "px"
             },
             "bindings": {
+                "units": {"<<->": "@owner.leftUnits"},
                 "value": {"<<->": "@owner.leftPosition"}
             }
         },
@@ -40,9 +43,12 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
             "properties": {
                 "element": {"#": "PosY"},
                 "maxValue": 10000,
-                "minValue": -10000
+                "minValue": -10000,
+                "acceptableUnits" : ["px", "%"],
+                "units": "px"
             },
             "bindings": {
+                "units": {"<<->": "@owner.topUnits"},
                 "value": {"<<->": "@owner.topPosition"}
             }
         },
@@ -50,9 +56,12 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
         "PosH": {
             "prototype": "js/components/hottextunit.reel[HotTextUnit]",
             "properties": {
-                "element": {"#": "PosH"}
+                "element": {"#": "PosH"},
+                "acceptableUnits" : ["px", "%"],
+                "units": "px"
             },
             "bindings": {
+                "units": {"<<->": "@owner.heightUnits"},
                 "value": {"<<->": "@owner.heightSize"}
             }
         },
@@ -65,6 +74,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
                 "units": "px"
             },
             "bindings": {
+                "units": {"<<->": "@owner.widthUnits"},
                 "value": {"<<->": "@owner.widthSize"}
             }
 
-- 
cgit v1.2.3