diff options
author | Jonathan Duran | 2012-02-27 11:22:51 -0800 |
---|---|---|
committer | Jonathan Duran | 2012-02-27 11:22:51 -0800 |
commit | ab10898c78f2bd5d765d9c915848ed8c8e08c5a3 (patch) | |
tree | b1ebb87e9c101c558108e1cec043d64a03cc50a1 /js/panels/Panel.reel/Panel.js | |
parent | fb8aacbadba8dffb9619eb16e4626c197dc9264d (diff) | |
parent | da60be29baab67440535b6b2b71fe7de989dfed0 (diff) | |
download | ninja-ab10898c78f2bd5d765d9c915848ed8c8e08c5a3.tar.gz |
Merge branch 'refs/heads/integration-candidate' into Timeline
Diffstat (limited to 'js/panels/Panel.reel/Panel.js')
-rwxr-xr-x | js/panels/Panel.reel/Panel.js | 4 |
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 | } |