diff options
author | Armen Kesablyan | 2012-02-07 16:51:14 -0800 |
---|---|---|
committer | Armen Kesablyan | 2012-02-07 16:51:14 -0800 |
commit | 8110e01dc5093ac6baf621103dcaa5f769e5be92 (patch) | |
tree | ecf339e3097b6ba25d81cbe44d913ee67591bf4b /js/panels/PanelContainer | |
parent | 5f506542d28e12b707c3bfa41b53383519838477 (diff) | |
parent | 668510892537eaaeb2e11520831d87b44b2489b7 (diff) | |
download | ninja-8110e01dc5093ac6baf621103dcaa5f769e5be92.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Diffstat (limited to 'js/panels/PanelContainer')
-rw-r--r-- | js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js | 4 |
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 | } |