aboutsummaryrefslogtreecommitdiff
path: root/js/panels
diff options
context:
space:
mode:
authorValerio Virgillito2012-06-26 09:31:15 -0700
committerValerio Virgillito2012-06-26 09:31:15 -0700
commitb44afd503cac5c400ebc8918d16daae56bc9e9e7 (patch)
treef5ae9fbad5bc1eb0d34c5fae906d85eb97ecd78a /js/panels
parentb4ca7c50790381bddeebb417c1d0477344c77cff (diff)
parent48bb94a72126e7be712b2c4ca9be2f03ecb65aea (diff)
downloadninja-b44afd503cac5c400ebc8918d16daae56bc9e9e7.tar.gz
Merge pull request #336 from mqg734/IKNinja_1688
IKNinja-1688 - Creating a banner file after a code file causes body div to shift to the right and has different scroll bars.
Diffstat (limited to 'js/panels')
-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 }