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>

8 files changed, 128 insertions, 20 deletions

diff --git a/js/panels/properties.reel/properties.html b/js/panels/properties.reel/properties.html
index b9aa206b..a737bd39 100755
--- a/js/panels/properties.reel/properties.html
+++ b/js/panels/properties.reel/properties.html
@@ -13,24 +13,21 @@
             "elementName": {
                 "prototype": "montage/ui/textfield.reel",
                 "properties": {
-                    "element": {"#": "elementName"},
-                    "readOnly": true
+                    "element": {"#": "elementName"}
                 }
             },
 
             "elementId": {
                 "prototype": "montage/ui/textfield.reel",
                 "properties": {
-                    "element": {"#": "elementId"},
-                    "readOnly": false
+                    "element": {"#": "elementId"}
                 }
             },
 
             "elementClass": {
                 "prototype": "montage/ui/textfield.reel",
                 "properties": {
-                    "element": {"#": "elementClass"},
-                    "readOnly": false
+                    "element": {"#": "elementClass"}
                 }
             },
 
diff --git a/js/panels/properties.reel/properties.js b/js/panels/properties.reel/properties.js
index 97dc017d..43c92b74 100755
--- a/js/panels/properties.reel/properties.js
+++ b/js/panels/properties.reel/properties.js
@@ -43,15 +43,28 @@ exports.Properties = Montage.create(Component, {
     },
 
     elementName: {
-        value: null
+        value: null,
+        serializable: true
     },
 
     elementId: {
-        value: null
+        value: null,
+        serializable: true
     },
 
     elementClass: {
-        value: null
+        value: null,
+        serializable: true
+    },
+
+    positionSize: {
+        value: null,
+        serializable: true
+    },
+
+    threeD: {
+        value: null,
+        serializable: true
     },
 
     customSections: {
diff --git a/js/panels/properties.reel/section.reel/section.js b/js/panels/properties.reel/section.reel/section.js
index b246c171..310bc48f 100755
--- a/js/panels/properties.reel/section.reel/section.js
+++ b/js/panels/properties.reel/section.reel/section.js
@@ -11,6 +11,7 @@ exports.Section = Montage.create(Component, {
 
     name: {
         value: "Panel"
+
     },
 
     slot: {
diff --git a/js/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.js b/js/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.js
index b606d6b8..a11cd3f6 100755
--- a/js/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.js
+++ b/js/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.js
@@ -8,6 +8,10 @@ var Montage = require("montage/core/core").Montage;
 var Component = require("montage/ui/component").Component;
 
 exports.SingleRow = Montage.create(Component, {
+    slot: {
+        value: null
+    },
+
     id: {
         value: null
     },
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
                 "units": "px"
             },
             "bindings": {
-                "units": {"<<->": "@owner.leftUnits"},
-                "value": {"<<->": "@owner.leftPosition"}
+                "units": {"<->": "@owner.leftUnits"},
+                "value": {"<->": "@owner.leftPosition"}
             }
         },
         "PosY": {
@@ -48,8 +48,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
                 "units": "px"
             },
             "bindings": {
-                "units": {"<<->": "@owner.topUnits"},
-                "value": {"<<->": "@owner.topPosition"}
+                "units": {"<->": "@owner.topUnits"},
+                "value": {"<->": "@owner.topPosition"}
             }
         },
 
@@ -61,8 +61,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
                 "units": "px"
             },
             "bindings": {
-                "units": {"<<->": "@owner.heightUnits"},
-                "value": {"<<->": "@owner.heightSize"}
+                "units": {"<->": "@owner.heightUnits"},
+                "value": {"<->": "@owner.heightSize"}
             }
         },
 
@@ -74,8 +74,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
                 "units": "px"
             },
             "bindings": {
-                "units": {"<<->": "@owner.widthUnits"},
-                "value": {"<<->": "@owner.widthSize"}
+                "units": {"<->": "@owner.widthUnits"},
+                "value": {"<->": "@owner.widthSize"}
             }
 
         },
@@ -84,7 +84,6 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
             "properties": {
                 "element": {"#": "posBound"},
                 "pressedClass": "lockUp",
-                "preventFocus": true,
                 "identifier": "ratio"
             }
         }
diff --git a/js/panels/properties.reel/sections/position-size.reel/position-size.js b/js/panels/properties.reel/sections/position-size.reel/position-size.js
index d9fd629c..94c0bbf2 100755
--- a/js/panels/properties.reel/sections/position-size.reel/position-size.js
+++ b/js/panels/properties.reel/sections/position-size.reel/position-size.js
@@ -8,6 +8,47 @@ var Montage = require("montage/core/core").Montage;
 var Component = require("montage/ui/component").Component;
 
 exports.PositionSize = Montage.create(Component, {
+
+    position: {
+        value: null,
+        serializable: true
+    },
+
+    leftLabel: {
+        value: null,
+        serializable: true
+    },
+
+    leftControl: {
+        value: null,
+        serializable: true
+    },
+
+    topLabel: {
+        value: null,
+        serializable: true
+    },
+
+    topControl: {
+        value: null,
+        serializable: true