mirror/php-adminer
1
0
Fork 0
mirror of https://github.com/vrana/adminer.git synced 2025-08-12 09:34:10 +02:00
Code Issues Releases Wiki Activity

Title and redirect only in correct AJAX state

Browse Source
This commit is contained in:
Jakub Vrana
2011-03-12 00:33:06 +01:00
parent f6e29f78f6
commit d1f6fa9a3a
1 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
adminer/static/functions.js
View File

@@ -224,7 +224,7 @@ function editingKeydown(event) {
/** Create AJAX request /** Create AJAX request
* @param string * @param string
* @param function (text) * @param function (XMLHttpRequest)
* @param [string] * @param [string]
* @return XMLHttpRequest or false in case of an error * @return XMLHttpRequest or false in case of an error
*/ */
@@ -238,18 +238,7 @@ function ajax(url, callback, data) {
xmlhttp.setRequestHeader('X-Requested-With', 'XMLHttpRequest'); xmlhttp.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
xmlhttp.onreadystatechange = function () { xmlhttp.onreadystatechange = function () {
if (xmlhttp.readyState == 4) { if (xmlhttp.readyState == 4) {
var redirect = xmlhttp.getResponseHeader('X-AJAX-Redirect'); callback(xmlhttp);
if (redirect) {
if (history.replaceState) {
history.replaceState(null, '', redirect);
}
return ajaxSend(redirect);
}
var title = xmlhttp.getResponseHeader('X-AJAX-Title');
if (title) {
document.title = decodeURIComponent(title);
}
callback(xmlhttp.status ? xmlhttp.responseText : undefined);
} }
}; };
xmlhttp.send(data); xmlhttp.send(data);
@@ -262,10 +251,12 @@ function ajax(url, callback, data) {
* @return XMLHttpRequest or false in case of an error * @return XMLHttpRequest or false in case of an error
*/ */
function ajaxSetHtml(url) { function ajaxSetHtml(url) {
return ajax(url, function (text) { return ajax(url, function (xmlhttp) {
var data = eval('(' + text + ')'); if (xmlhttp.status) {
for (var key in data) { var data = eval('(' + xmlhttp.responseText + ')');
setHtml(key, data[key]); for (var key in data) {
setHtml(key, data[key]);
}
} }
}); });
} }
@@ -294,10 +285,21 @@ function ajaxSend(url, data, popState) {
var currentState = ++ajaxState; var currentState = ++ajaxState;
var favicon = replaceFavicon('../adminer/static/loader.gif'); var favicon = replaceFavicon('../adminer/static/loader.gif');
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 (xmlhttp) {
if (currentState == ajaxState) { if (currentState == ajaxState) {
var title = xmlhttp.getResponseHeader('X-AJAX-Title');
if (title) {
document.title = decodeURIComponent(title);
}
var redirect = xmlhttp.getResponseHeader('X-AJAX-Redirect');
if (redirect) {
if (history.replaceState) {
history.replaceState(null, '', redirect);
}
return ajaxSend(redirect);
}
replaceFavicon(favicon); replaceFavicon(favicon);
if (text === undefined) { if (!xmlhttp.status) {
setHtml('loader', ''); setHtml('loader', '');
} else { } else {
if (!popState) { if (!popState) {
@@ -306,7 +308,7 @@ function ajaxSend(url, data, popState) {
} }
scrollTo(0, 0); scrollTo(0, 0);
} }
setHtml('content', text); setHtml('content', xmlhttp.responseText);
var content = document.getElementById('content'); var content = document.getElementById('content');
var scripts = content.getElementsByTagName('script'); var scripts = content.getElementsByTagName('script');
var length = scripts.length; // required to avoid infinite loop var length = scripts.length; // required to avoid infinite loop
@@ -422,9 +424,11 @@ function selectDblClick(td, event, text) {
td.appendChild(input); td.appendChild(input);
input.focus(); input.focus();
if (text == 2) { // long text if (text == 2) { // long text
return ajax(location.href + '&' + encodeURIComponent(td.id) + '=', function (text) { return ajax(location.href + '&' + encodeURIComponent(td.id) + '=', function (xmlhttp) {
input.value = text; if (xmlhttp.status) {
input.name = td.id; input.value = xmlhttp.responseText;
input.name = td.id;
}
}); });
} }
input.value = value; input.value = value;