aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Panel.reel/Panel.js
diff options
context:
space:
mode:
authorhwc4872012-02-28 12:58:09 -0800
committerhwc4872012-02-28 12:58:09 -0800
commit347fc28227d822e9fea3fa823fae79cf14ea041c (patch)
tree180e7ee1ad092397b05c0452e75d456fa0a3abb7 /js/panels/Panel.reel/Panel.js
parented16298e4323b733f6dc957c307dc07036fa3569 (diff)
parent7c9291a5bab4abd849547f8878f6fb962fc88250 (diff)
downloadninja-347fc28227d822e9fea3fa823fae79cf14ea041c.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into integration
Diffstat (limited to 'js/panels/Panel.reel/Panel.js')
-rwxr-xr-xjs/panels/Panel.reel/Panel.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/js/panels/Panel.reel/Panel.js b/js/panels/Panel.reel/Panel.js
index efa287c5..c8dd0456 100755
--- a/js/panels/Panel.reel/Panel.js
+++ b/js/panels/Panel.reel/Panel.js
@@ -188,6 +188,8 @@ exports.Panel = Montage.create(Component, {
188 //Resized Event 188 //Resized Event
189 if(typeof this.resizer.value == "number") this.panelBase.contentHeight = this.resizer.value; 189 if(typeof this.resizer.value == "number") this.panelBase.contentHeight = this.resizer.value;
190 this.resizer.element.addEventListener("mouseup",this.resized.bind(this),false); 190 this.resizer.element.addEventListener("mouseup",this.resized.bind(this),false);
191
192 this.panelContent.content = this.panelBase.content;
191 } 193 }
192 } 194 }
193 }, 195 },
@@ -226,7 +228,7 @@ exports.Panel = Montage.create(Component, {
226 else pContentDiv.style.overflow = "hidden"; 228 else pContentDiv.style.overflow = "hidden";
227 this.element.getElementsByClassName("panelTitle")[0].innerHTML = this.panelBase.panelName; 229 this.element.getElementsByClassName("panelTitle")[0].innerHTML = this.panelBase.panelName;
228 //pContentDiv.appendChild(this.panelBase.content); 230 //pContentDiv.appendChild(this.panelBase.content);
229 this.panelContent.content = this.panelBase.content; 231 //this.panelContent.content = this.panelBase.content;
230 232
231 } 233 }
232 } 234 }