diff options
author | Eric Guzman | 2012-05-18 21:51:08 -0700 |
---|---|---|
committer | Eric Guzman | 2012-05-18 21:51:08 -0700 |
commit | 84097be9d7dd3403a0ac12f8c039d3ffc5281cfc (patch) | |
tree | 4f03ddf6620be09d4a755bdf647da2adc1df8908 /js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.js | |
parent | 13da56e791b7478ad3dbb8162a583a6b2c8c4b6b (diff) | |
parent | 10471fc02fa75040baf337bc62ff683854793f81 (diff) | |
download | ninja-84097be9d7dd3403a0ac12f8c039d3ffc5281cfc.tar.gz |
Merge branch 'dom-architecture' of github.com:Motorola-Mobility/ninja-internal into CSSPanelUpdates
Diffstat (limited to 'js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.js')
-rwxr-xr-x | js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.js | 3 |
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 + ":"; |