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

LeftAndMain.js: Fix 'X-Reload' for IE10 (fixes #647)

Browse Source
This commit is contained in:
Ingo Schommer 2013-06-13 15:17:14 +02:00
parent d42cbdd613
commit 5ff69b98ab
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
admin/javascript/LeftAndMain.js
View File

@ -461,7 +461,8 @@ jQuery.noConflict();
// Support a full reload // Support a full reload
if(xhr.getResponseHeader('X-Reload') && xhr.getResponseHeader('X-ControllerURL')) { if(xhr.getResponseHeader('X-Reload') && xhr.getResponseHeader('X-ControllerURL')) {
document.location.href = xhr.getResponseHeader('X-ControllerURL'); document.location.href = $('base').attr('href').replace(/\/*$/, '')
+ '/' + xhr.getResponseHeader('X-ControllerURL');
return; return;
} }
@ -469,12 +470,6 @@ jQuery.noConflict();
// case we'll ignore the response // case we'll ignore the response
if(!data) return; if(!data) return;
// Support a full reload
if(xhr.getResponseHeader('X-Reload') && xhr.getResponseHeader('X-ControllerURL')) {
document.location.href = xhr.getResponseHeader('X-ControllerURL');
return;
}
// Update title // Update title
var title = xhr.getResponseHeader('X-Title'); var title = xhr.getResponseHeader('X-Title');
if(title) document.title = decodeURIComponent(title.replace(/\+/g, ' ')); if(title) document.title = decodeURIComponent(title.replace(/\+/g, ' '));