mirror/php-adminer
1
0
Fork 0
mirror of https://github.com/vrana/adminer.git synced 2025-08-16 03:24:01 +02:00
Code Issues Releases Wiki Activity

Push AJAX state after transfer

Browse Source
This commit is contained in:
Jakub Vrana
2011-03-11 16:50:36 +01:00
parent 6fee8048e0
commit 2edd575767
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
adminer/static/functions.js
View File

@@ -283,6 +283,9 @@ function ajaxSend(url, data, popState) {
setHtml('loader', '<img src="../adminer/static/loader.gif" alt="">'); setHtml('loader', '<img src="../adminer/static/loader.gif" alt="">');
return ajax(url, function (text) { return ajax(url, function (text) {
if (currentState == ajaxState) { if (currentState == ajaxState) {
if (!popState) {
history.pushState(data, '', url);
}
scrollTo(0, 0); scrollTo(0, 0);
setHtml('content', text); setHtml('content', text);
var content = document.getElementById('content'); 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))) { if (!history.pushState || (event && (event.ctrlKey || event.shiftKey || event.altKey || event.metaKey))) {
return false; return false;
} }
history.pushState(data, '', url);
return ajaxSend(url, data); return ajaxSend(url, data);
} }
@@ -336,7 +338,7 @@ function ajaxMain(url, data, event) {
*/ */
window.onpopstate = function (event) { window.onpopstate = function (event) {
if (ajaxState || event.state) { if (ajaxState || event.state) {
ajaxSend(location.href, event.state); ajaxSend(location.href, event.state, 1); // 1 - disable pushState
} }
} }