From f30e5613e37ec6858fe4b56d289fafb9f1b9b9f8 Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Fri, 18 May 2012 16:12:30 -0700
Subject: Fixing button controls in the Properties Panel for changes in montage
 v.10 drawing.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
 .../sections/custom-rows/dual-row.reel/dual-row.html           | 10 ++--------
 .../sections/custom-rows/dual-row.reel/dual-row.js             |  3 +--
 2 files changed, 3 insertions(+), 10 deletions(-)

(limited to 'js/panels/properties.reel/sections')

diff --git a/js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html b/js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html
index bdcbff7f..c3af0668 100755
--- a/js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html
+++ b/js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html
@@ -22,10 +22,7 @@
                 "element": { "#": "slotElement" }
             },
             "bindings": {
-                "content" : {
-                    "boundObject": {"@": "owner"},
-                    "boundObjectPropertyPath": "content"
-                }
+                "content": {"<-": "@owner.content"}
             }
         },
         "slot2": {
@@ -34,10 +31,7 @@
                 "element": { "#": "slotElement2" }
             },
             "bindings": {
-                "content" : {
-                    "boundObject": {"@": "owner"},
-                    "boundObjectPropertyPath": "content2"
-                }
+                "content": {"<-": "@owner.content2"}
             }
         }
     }
diff --git a/js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.js b/js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.js
index 4c5c80d7..2f81aa2e 100755
--- a/js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.js
+++ b/js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.js
@@ -44,8 +44,7 @@ exports.DualRow = Montage.create(Component, {
             }
             if(this.label2 !== null) {
                 if(this.content2.type === "button") {
-                    this.content2.element = document.createElement("button");
-                    this.content2.element.classList.add("nj-skinned");
+                    this.content2.label = this.label2;
                     this.element.getElementsByClassName("lbl")[1].style.display = "none";
                 } else {
                     this.element.getElementsByClassName("lbl")[1].innerHTML = this.label2 + ":";
-- 
cgit v1.2.3


From a341522e3603c18ab3b93defa894e3be702dd0f4 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Tue, 22 May 2012 17:45:35 -0700
Subject: fixing the undefined 'color' issue

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 js/panels/properties.reel/sections/custom.reel/custom.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js/panels/properties.reel/sections')

diff --git a/js/panels/properties.reel/sections/custom.reel/custom.js b/js/panels/properties.reel/sections/custom.reel/custom.js
index 49b4414e..b1fd910d 100755
--- a/js/panels/properties.reel/sections/custom.reel/custom.js
+++ b/js/panels/properties.reel/sections/custom.reel/custom.js
@@ -400,7 +400,7 @@ exports.CustomSection = Montage.create(Component, {
             this.controls[aField.id] = obj;
 
             // TODO - Hack for now to reference the color select object to unregister color chips
-            this.controls["stageBackground"] = obj;
+            this.controls["background"] = obj;
 
             return obj;
         }
-- 
cgit v1.2.3