aboutsummaryrefslogtreecommitdiff
path: root/js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.js
diff options
context:
space:
mode:
authorArmen Kesablyan2012-05-23 14:34:58 -0700
committerArmen Kesablyan2012-05-23 14:34:58 -0700
commitc21db7f1e4a0582777bdb5366df5d023a915b779 (patch)
treec4d29cb4686101d4a480ae836d20187879cf5400 /js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.js
parent3ed95247e9ea4b0a7833401ed6809647b7c4acbf (diff)
parent1a7e347810401e6262d9d7bad1c3583e6773993b (diff)
downloadninja-c21db7f1e4a0582777bdb5366df5d023a915b779.tar.gz
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts: js/data/panels-data.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
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 + ":";