aboutsummaryrefslogtreecommitdiff
path: root/js/panels/PanelContainer
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-02-03 11:21:09 -0800
committerNivesh Rajbhandari2012-02-03 11:21:09 -0800
commitc203ea7413b5a2b2232d7f8346cd1b9932f2575b (patch)
tree866f72ecc4af2f4a28b5f948ee9b03af2d32fce0 /js/panels/PanelContainer
parentdb73f720b692d63b55f7c773579fe23336ec0486 (diff)
parentc630ead20487c3948fa36448d3e7d5f7b5cba782 (diff)
downloadninja-c203ea7413b5a2b2232d7f8346cd1b9932f2575b.tar.gz
Merge branch 'refs/heads/master' into ToolFixes
Diffstat (limited to 'js/panels/PanelContainer')
-rw-r--r--js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js b/js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js
index 57187af1..66333cc0 100644
--- a/js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js
+++ b/js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js
@@ -91,7 +91,7 @@ exports.PanelContainer = Montage.create(Component, {
91 this.panelSplitter.disabled = true; 91 this.panelSplitter.disabled = true;
92 } 92 }
93 93
94 this.needsDraw = true; 94// this.needsDraw = true;
95 95
96 this.addEventListener("change@appModel.PropertiesPanel", this, false); 96 this.addEventListener("change@appModel.PropertiesPanel", this, false);
97 this.addEventListener("change@appModel.ProjectPanel", this, false); 97 this.addEventListener("change@appModel.ProjectPanel", this, false);
@@ -198,7 +198,7 @@ exports.PanelContainer = Montage.create(Component, {
198 minHeights += this.repeater.childComponents[i].element.offsetHeight; 198 minHeights += this.repeater.childComponents[i].element.offsetHeight;
199 } else { 199 } else {
200 this._panels[i].isLocked = false; 200 this._panels[i].isLocked = false;
201 this.repeater.childComponents[i].needsDraw = true; 201 if(this.repeater.childComponents[i]) this.repeater.childComponents[i].needsDraw = true;
202 minHeights += this._panels[i].minHeight; 202 minHeights += this._panels[i].minHeight;
203 } 203 }
204 } 204 }