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 --- .../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