aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Splitter.js
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-06-26 11:01:51 -0700
committerJose Antonio Marquez2012-06-26 11:01:51 -0700
commit879dc3285feef07bc532d3f51fdb8cdba8048313 (patch)
tree59c66dd62e20d2a1f01a284564d82e66d62f7ca3 /js/panels/Splitter.js
parentdde59258c3979b990913ad1f14b0e55828a38906 (diff)
parentdea90d1bb0b903a7497cdf7de9ae60799e60d5b1 (diff)
downloadninja-879dc3285feef07bc532d3f51fdb8cdba8048313.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into Color
Diffstat (limited to 'js/panels/Splitter.js')
-rwxr-xr-xjs/panels/Splitter.js8
1 files changed, 6 insertions, 2 deletions
diff --git a/js/panels/Splitter.js b/js/panels/Splitter.js
index c6d46911..4f2a137e 100755
--- a/js/panels/Splitter.js
+++ b/js/panels/Splitter.js
@@ -156,7 +156,7 @@ exports.Splitter = Montage.create(Component, {
156 } 156 }
157 }, 157 },
158 restore:{ 158 restore:{
159 value: function() { 159 value: function(onSwitchFromCodeDocument) {
160 //Get splitter initial value from SettingManager 160 //Get splitter initial value from SettingManager
161 var storedData = this.application.localStorage.getItem(this.element.getAttribute("data-montage-id")), temp = this.collapsed; 161 var storedData = this.application.localStorage.getItem(this.element.getAttribute("data-montage-id")), temp = this.collapsed;
162 if(storedData && this.element.getAttribute("data-montage-id") !== null) { 162 if(storedData && this.element.getAttribute("data-montage-id") !== null) {
@@ -172,7 +172,11 @@ exports.Splitter = Montage.create(Component, {
172 this.panel.addEventListener("webkitTransitionEnd", this, false); 172 this.panel.addEventListener("webkitTransitionEnd", this, false);
173 } 173 }
174 this.disabled = false; 174 this.disabled = false;
175 this.needsDraw = true; 175 if(onSwitchFromCodeDocument) {
176 this.draw(); // When switching from code document, draw immediately so stage size is correct
177 } else {
178 this.needsDraw = true;
179 }
176 } 180 }
177 } 181 }
178 } 182 }