From 2edd5757674faf6155baa201d497b5dde85d7373 Mon Sep 17 00:00:00 2001 From: Jakub Vrana Date: Fri, 11 Mar 2011 16:50:36 +0100 Subject: [PATCH] Push AJAX state after transfer --- adminer/static/functions.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/adminer/static/functions.js b/adminer/static/functions.js index 3cf1c5fe..30de8a52 100644 --- a/adminer/static/functions.js +++ b/adminer/static/functions.js @@ -283,6 +283,9 @@ function ajaxSend(url, data, popState) { setHtml('loader', ''); return ajax(url, function (text) { if (currentState == ajaxState) { + if (!popState) { + history.pushState(data, '', url); + } scrollTo(0, 0); setHtml('content', text); var content = document.getElementById('content'); @@ -327,7 +330,6 @@ function ajaxMain(url, data, event) { if (!history.pushState || (event && (event.ctrlKey || event.shiftKey || event.altKey || event.metaKey))) { return false; } - history.pushState(data, '', url); return ajaxSend(url, data); } @@ -336,7 +338,7 @@ function ajaxMain(url, data, event) { */ window.onpopstate = function (event) { if (ajaxState || event.state) { - ajaxSend(location.href, event.state); + ajaxSend(location.href, event.state, 1); // 1 - disable pushState } }