Hopiu/wagtail
1
0
Fork 0
mirror of https://github.com/Hopiu/wagtail.git synced 2026-05-27 08:04:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

falling back to just closing the window and re-opening it.

Browse source
This commit is contained in:
Dave Cranwell 2014-12-17 16:33:10 +00:00
parent 67f2db1e61
commit e3f300ab71
1 changed files with 6 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
wagtail/wagtailadmin/static/wagtailadmin/js/page-editor.js
View file

@ -341,29 +341,21 @@ $(function() {
/* Set up behaviour of preview button */
var previewWindow = null;
var previewOnloadRun = false;
$('.action-preview').click(function(e) {
e.preventDefault();
var $this = $(this);
if(!previewWindow || previewWindow.closed){
previewOnloadRun = false;
previewWindow = window.open($this.data('placeholder'), $this.data('windowname'));
if(previewWindow){
previewWindow.close();
}
previewWindow = window.open($this.data('placeholder'), $this.data('windowname'));
if(/MSIE/.test(navigator.userAgent)){
// If IE, load contents immediately without fancy effects
submitPreview.call($this, false);
} else {
// If not IE, check if the onload has already fired
if(!previewOnloadRun){
// This only runs once per new window creation
previewWindow.onload = function(){
previewOnloadRun = true;
submitPreview.call($this, true);
}
}else{
previewWindow.onload = function(){
submitPreview.call($this, true);
}
}
@ -371,16 +363,6 @@ $(function() {
function submitPreview(enhanced){
var previewDoc = previewWindow.document;
// If onload already fired, make window appear like it's loading the content again
var spinner = previewDoc.getElementById('loading-spinner-wrapper');
previewWindow.focus();
if(spinner){
spinner.className = spinner.className.replace('remove','');
}
$.ajax({
type: "POST",
url: $this.data('action'),
@ -396,7 +378,7 @@ $(function() {
frame.document.close();
var hideTimeout = setTimeout(function(){
spinner.className += ' remove';
previewDoc.getElementById('loading-spinner-wrapper').className += ' remove';;
clearTimeout(hideTimeout);
}) // just enough to give effect without adding discernible slowness
} else {