aboutsummaryrefslogtreecommitdiff
path: root/js/panels/PanelContainer
diff options
context:
space:
mode:
authorAnanya Sen2012-02-03 09:57:41 -0800
committerAnanya Sen2012-02-03 09:57:41 -0800
commitc093dd13a84ce6eb3e00a672c38a808093c5d966 (patch)
tree5dfd4a800bbbe02a8cbcb3ffeee542686bc258bb /js/panels/PanelContainer
parent79b0173eeca079dec42ff1480182656dbe3af44f (diff)
parent8e06b63e5eab5558823f4923e20a832c8b36cbe2 (diff)
downloadninja-c093dd13a84ce6eb3e00a672c38a808093c5d966.tar.gz
Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO
Conflicts: js/io/document/document-controller.js js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js js/io/ui/save-as-dialog.reel/save-as-dialog.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/panels/PanelContainer')
-rwxr-xr-xjs/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 100755
--- 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 }