aboutsummaryrefslogtreecommitdiff
path: root/js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.js
diff options
context:
space:
mode:
authorPushkar Joshi2012-05-31 12:20:03 -0700
committerPushkar Joshi2012-05-31 12:20:03 -0700
commit4bc52365b1f81a386c3c59fd7c6ad874bb387cb5 (patch)
treec5b17297aba04bd54a59cf6214d29486e089031b /js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.js
parent75a862d305bc4502e22bc5aa65fa271143b8cf6c (diff)
parent6042bdc5f2aada4412912fd01602d32c9088dc26 (diff)
downloadninja-4bc52365b1f81a386c3c59fd7c6ad874bb387cb5.tar.gz
Merge branch 'master' into pentool
Diffstat (limited to 'js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.js')
-rwxr-xr-xjs/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.js3
1 files changed, 1 insertions, 2 deletions
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, {
44 } 44 }
45 if(this.label2 !== null) { 45 if(this.label2 !== null) {
46 if(this.content2.type === "button") { 46 if(this.content2.type === "button") {
47 this.content2.element = document.createElement("button"); 47 this.content2.label = this.label2;
48 this.content2.element.classList.add("nj-skinned");
49 this.element.getElementsByClassName("lbl")[1].style.display = "none"; 48 this.element.getElementsByClassName("lbl")[1].style.display = "none";
50 } else { 49 } else {
51 this.element.getElementsByClassName("lbl")[1].innerHTML = this.label2 + ":"; 50 this.element.getElementsByClassName("lbl")[1].innerHTML = this.label2 + ":";