tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

MINOR Changed execution order in preview JS to fix layout issues with collapsed preview panel in IE7 (SSF-42)

Browse Source
This commit is contained in:
Ingo Schommer 2011-12-12 21:30:16 +01:00
parent 02d1ff80a9
commit 0dd32baf1e
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
admin/javascript/LeftAndMain.Preview.js
View File

@ -33,13 +33,10 @@
// Create layout and controls // Create layout and controls
this.find('iframe').addClass('center'); this.find('iframe').addClass('center');
this.layout({type: 'border'});
this.find('iframe').bind('load', function() { this.find('iframe').bind('load', function() {
self._fixIframeLinks(); self._fixIframeLinks();
self.loadCurrentPage(); self.loadCurrentPage();
}); });
self._fixIframeLinks();
var updateAfterXhr = function() { var updateAfterXhr = function() {
// var url = ui.xmlhttp.getResponseHeader('x-frontend-url'); // var url = ui.xmlhttp.getResponseHeader('x-frontend-url');
@ -67,6 +64,8 @@
self.collapse(); self.collapse();
}); });
this.layout({type: 'border'});
if(this.hasClass('is-expanded')) this.expand(); if(this.hasClass('is-expanded')) this.expand();
else this.collapse(); else this.collapse();
@ -74,6 +73,8 @@
this.append('<div class="cms-preview-overlay ui-widget-overlay-light"></div>'); this.append('<div class="cms-preview-overlay ui-widget-overlay-light"></div>');
this.find('.cms-preview-overlay-light').hide(); this.find('.cms-preview-overlay-light').hide();
self._fixIframeLinks();
this._super(); this._super();
}, },