From 5ff69b98ab62d2faf4d9dc9b9cb9168408270bcd Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Thu, 13 Jun 2013 15:17:14 +0200 Subject: [PATCH] LeftAndMain.js: Fix 'X-Reload' for IE10 (fixes #647) --- admin/javascript/LeftAndMain.js | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/admin/javascript/LeftAndMain.js b/admin/javascript/LeftAndMain.js index 6cd4d703f..a41bc8051 100644 --- a/admin/javascript/LeftAndMain.js +++ b/admin/javascript/LeftAndMain.js @@ -461,7 +461,8 @@ jQuery.noConflict(); // Support a full reload 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; } @@ -469,12 +470,6 @@ jQuery.noConflict(); // case we'll ignore the response 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 var title = xhr.getResponseHeader('X-Title'); if(title) document.title = decodeURIComponent(title.replace(/\+/g, ' '));