4 files changed, 30 insertions, 28 deletions
diff --git a/js/panels/properties.reel/sections/custom.reel/custom.js b/js/panels/properties.reel/sections/custom.reel/custom.js
index 876fe110..3ab32888 100755
--- a/js/panels/properties.reel/sections/custom.reel/custom.js
+++ b/js/panels/properties.reel/sections/custom.reel/custom.js
@@ -19,7 +19,7 @@ var HT = require("js/components/hottext.reel").HotText;
 var Dropdown = require("js/components/combobox.reel").Combobox;
 var TextField = require("js/components/textfield.reel").TextField;
 var FileInput = require("js/components/ui/file-input.reel").FileInput;
-var Checkbox = require("js/components/checkbox.reel").Checkbox;
+var LabelCheckbox = require("js/components/ui/label-checkbox.reel").LabelCheckbox;
 var ColorChip = require("js/components/ui/color-chip.reel").ColorChip;
 var Button = require("montage/ui/button.reel").Button;
@@ -77,7 +77,7 @@ exports.CustomSection = Montage.create(Component, {
                    this.rows.push(tmpRow);
                } else if(this._fields[i].length === 3) {
-                    
                }
            }
@@ -103,7 +103,7 @@ exports.CustomSection = Montage.create(Component, {
    handleChange: {
                value:function(event) {
            if(event._event.wasSetByCode) return;
-            
            var obj = event.currentTarget;
            this._dispatchPropEvent({"type": "change", "id": obj.id, "prop": obj.prop, "value": obj.value, "control": obj});
                }
@@ -349,7 +349,7 @@ exports.CustomSection = Montage.create(Component, {
        value: function(aField) {
            // Generate Textfield
-            var obj = Checkbox.create();
+            var obj = LabelCheckbox.create();
            // Set Values for TextField
            if (aField.id)          obj.id = aField.id;
diff --git a/js/panels/properties.reel/sections/position-and-size.reel/position-and-size.css b/js/panels/properties.reel/sections/position-size.reel/position-size.css
index 7f8fdbc2..7f8fdbc2 100755
--- a/js/panels/properties.reel/sections/position-and-size.reel/position-and-size.css
+++ b/js/panels/properties.reel/sections/position-size.reel/position-size.css
diff --git a/js/panels/properties.reel/sections/position-and-size.reel/position-and-size.html b/js/panels/properties.reel/sections/position-size.reel/position-size.html
index a7aac84e..5d1a805a 100755
--- a/js/panels/properties.reel/sections/position-and-size.reel/position-and-size.html
+++ b/js/panels/properties.reel/sections/position-size.reel/position-size.html
@@ -6,11 +6,11 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 </copyright> -->
 <html lang="en">
 <head>
-    <link rel="stylesheet" href="position-and-size.css" type="text/css">
+    <link rel="stylesheet" href="position-size.css" type="text/css">
    <script type="text/montage-serialization">
    {
        "owner": {
-            "prototype" : "js/panels/properties.reel/sections/position-and-size.reel[PosSize]",
+            "prototype" : "js/panels/properties.reel/sections/position-size.reel",
            "properties" : {
                "element" :         {"#": "section"},
                "position":         {"#": "position"},
@@ -23,6 +23,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
                "bindButton":       {"@": "bindButton"}
            }
        },
        "PosX": {
            "prototype": "js/components/hottextunit.reel[HotTextUnit]",
            "properties": {
@@ -31,11 +32,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
                "minValue": -10000
            },
            "bindings": {
-                "value": {
+                "value": {"<<->": "@owner.leftPosition"}
-                    "boundObject": {"@": "owner"},
-                    "boundObjectPropertyPath": "leftPosition",
-                    "oneway": false
-                }
            }
        },
        "PosY": {
@@ -46,38 +43,31 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
                "minValue": -10000
            },
            "bindings": {
-                "value": {
+                "value": {"<<->": "@owner.topPosition"}
-                    "boundObject": {"@": "owner"},
-                    "boundObjectPropertyPath": "topPosition",
-                    "oneway": false
-                }
            }
        },
        "PosH": {
            "prototype": "js/components/hottextunit.reel[HotTextUnit]",
            "properties": {
                "element": {"#": "PosH"}
            },
            "bindings": {
-                "value": {
+                "value": {"<<->": "@owner.heightSize"}
-                    "boundObject": {"@": "owner"},
-                    "boundObjectPropertyPath": "heightSize",
-                    "oneway": false
-                }
            }
        },
        "PosW": {
            "prototype": "js/components/hottextunit.reel[HotTextUnit]",
            "properties": {
-                "element": {"#": "PosW"}
+                "element": {"#": "PosW"},
+                "acceptableUnits" : ["px", "%"],
+                "units": "px"
            },
            "bindings": {
-                "value": {
+                "value": {"<<->": "@owner.widthSize"}
-                    "boundObject": {"@": "owner"},
-                    "boundObjectPropertyPath": "widthSize",
-                    "oneway": false
-                }
            }
        },
        "bindButton": {
            "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-size.reel/position-size.js
index 1e47916f..10e084be 100755
--- a/js/panels/properties.reel/sections/position-and-size.reel/position-and-size.js
+++ b/js/panels/properties.reel/sections/position-size.reel/position-size.js
@@ -7,7 +7,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 var Montage = require("montage/core/core").Montage;
 var Component = require("montage/ui/component").Component;
-exports.PosSize = Montage.create(Component, {
+exports.PositionSize = Montage.create(Component, {
    leftPosition: {
        value: 0
    },
@@ -23,7 +23,19 @@ exports.PosSize = Montage.create(Component, {
    widthSize: {
        value: 0
    },
+/*
+    widthSize: {
+        get: function() { return this._widthSize;},
+        set: function(value) {
+            this._widthSize = parseInt(value);
+            this.widthUnit = value;
+        }
+    },
+    widthUnit: {
+        value: "px"
+    },
+*/
    savedPosition: {
        value: null
    },