mirror/php-adminer
1
0
Fork 0
mirror of https://github.com/vrana/adminer.git synced 2025-08-25 23:36:20 +02:00
Code Issues Releases Wiki Activity

Report offline and other AJAX errors (bug #419)

Browse Source
This commit is contained in:
Jakub Vrana
2014-09-14 14:46:54 -07:00
parent a987a2a4de
commit 37c8a3a123
6 changed files with 31 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
adminer/static/functions.js
View File

@@ -503,11 +503,19 @@ function fieldChange(field) {
* @param string
* @param function (XMLHttpRequest)
* @param [string]
* @param [string]
* @return XMLHttpRequest or false in case of an error
*/
function ajax(url, callback, data) {
function ajax(url, callback, data, message) {
var request = (window.XMLHttpRequest ? new XMLHttpRequest() : (window.ActiveXObject ? new ActiveXObject('Microsoft.XMLHTTP') : false));
if (request) {
var ajaxStatus = document.getElementById('ajaxstatus');
if (message) {
ajaxStatus.innerHTML = '<div class="message">' + message + '</div>';
ajaxStatus.className = ajaxStatus.className.replace(/ hidden/g, '');
} else {
ajaxStatus.className += ' hidden';
}
request.open((data ? 'POST' : 'GET'), url);
if (data) {
request.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
@@ -515,7 +523,12 @@ function ajax(url, callback, data) {
request.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
request.onreadystatechange = function () {
if (request.readyState == 4) {
callback(request);
if (/^2/.test(request.status)) {
callback(request);
} else {
ajaxStatus.innerHTML = (request.status ? request.responseText : '<div class="error">' + offlineMessage + '</div>');
ajaxStatus.className = ajaxStatus.className.replace(/ hidden/g, '');
}
}
};
request.send(data);
@@ -529,11 +542,9 @@ function ajax(url, callback, data) {
*/
function ajaxSetHtml(url) {
return ajax(url, function (request) {
if (request.status) {
var data = eval('(' + request.responseText + ')');
for (var key in data) {
setHtml(key, data[key]);
}
var data = eval('(' + request.responseText + ')');
for (var key in data) {
setHtml(key, data[key]);
}
});
}
@@ -560,18 +571,17 @@ function ajaxForm(form, message, button) {
}
data = data.join('&');
setHtml('message', '<div class="message">' + message + '</div>');
var url = form.action;
if (!/post/i.test(form.method)) {
url = url.replace(/\?.*/, '') + '?' + data;
data = '';
}
return ajax(url, function (request) {
setHtml('message', request.responseText);
setHtml('ajaxstatus', request.responseText);
if (window.jush) {
jush.highlight_tag(document.getElementById('message').getElementsByTagName('code'), 0);
jush.highlight_tag(document.getElementById('ajaxstatus').getElementsByTagName('code'), 0);
}
}, data);
}, data, message);
}
@@ -629,7 +639,7 @@ function selectClick(td, event, text, warning) {
input.focus();
if (text == 2) { // long text
return ajax(location.href + '&' + encodeURIComponent(td.id) + '=', function (request) {
if (request.status && request.responseText) {
if (request.responseText) {
input.value = request.responseText;
input.name = td.id;
}