diff options
author | Nivesh Rajbhandari | 2012-04-16 16:06:24 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-04-16 16:06:24 -0700 |
commit | c253192a08b499ea7be46fa5438d273e51f7ec5a (patch) | |
tree | 18a1f0e3679c0eb993a9dedb537035d3861f49ac /js/panels/properties.reel/sections/custom-rows/dual-row.reel | |
parent | e19376c54eedd1f1c457ba405b2f110be376a559 (diff) | |
parent | 4b900ea5cd6bb77eb30cec8c03b9ec9fa662c1e9 (diff) | |
download | ninja-c253192a08b499ea7be46fa5438d273e51f7ec5a.tar.gz |
Merge branch 'refs/heads/ninja-internal' into WebGLFixes
Diffstat (limited to 'js/panels/properties.reel/sections/custom-rows/dual-row.reel')
-rwxr-xr-x | js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.js | 8 |
1 files changed, 7 insertions, 1 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 72d216ca..4c5c80d7 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 | |||
@@ -43,7 +43,13 @@ exports.DualRow = Montage.create(Component, { | |||
43 | this.element.getElementsByClassName("lbl")[0].innerHTML = this.label + ":"; | 43 | this.element.getElementsByClassName("lbl")[0].innerHTML = this.label + ":"; |
44 | } | 44 | } |
45 | if(this.label2 !== null) { | 45 | if(this.label2 !== null) { |
46 | this.element.getElementsByClassName("lbl")[1].innerHTML = this.label2 + ":"; | 46 | if(this.content2.type === "button") { |
47 | this.content2.element = document.createElement("button"); | ||
48 | this.content2.element.classList.add("nj-skinned"); | ||
49 | this.element.getElementsByClassName("lbl")[1].style.display = "none"; | ||
50 | } else { | ||
51 | this.element.getElementsByClassName("lbl")[1].innerHTML = this.label2 + ":"; | ||
52 | } | ||
47 | } else { | 53 | } else { |
48 | this.element.getElementsByClassName("lbl")[1].style.display = "none"; | 54 | this.element.getElementsByClassName("lbl")[1].style.display = "none"; |
49 | } | 55 | } |