Merge branch 'pentool' into brushtool

2 files changed, 3 insertions, 10 deletions

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 + ":";