Error message with no response from server in AJAX
This commit is contained in:
parent
6b3e3c2532
commit
ed25431f3c
|
@ -28,6 +28,7 @@ function page_header($title, $error = "", $breadcrumb = array(), $title2 = "") {
|
||||||
<link rel="stylesheet" type="text/css" href="../adminer/static/default.css">
|
<link rel="stylesheet" type="text/css" href="../adminer/static/default.css">
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
var areYouSure = '<?php echo lang('Resend POST data?'); ?>';
|
var areYouSure = '<?php echo lang('Resend POST data?'); ?>';
|
||||||
|
var noResponse = '<?php echo lang('No response from server.'); ?>';
|
||||||
</script>
|
</script>
|
||||||
<script type="text/javascript" src="../adminer/static/functions.js"></script>
|
<script type="text/javascript" src="../adminer/static/functions.js"></script>
|
||||||
<script type="text/javascript" src="static/editing.js"></script>
|
<script type="text/javascript" src="static/editing.js"></script>
|
||||||
|
|
|
@ -279,6 +279,7 @@ $translations = array(
|
||||||
|
|
||||||
// reload confirmation in AJAX
|
// reload confirmation in AJAX
|
||||||
'Resend POST data?' => 'Znovu odeslat POST data?',
|
'Resend POST data?' => 'Znovu odeslat POST data?',
|
||||||
|
'No response from server.' => 'Server neodpověděl.',
|
||||||
|
|
||||||
'Editor' => 'Editor',
|
'Editor' => 'Editor',
|
||||||
// date format in Editor: $1 yyyy, $2 yy, $3 mm, $4 m, $5 dd, $6 d
|
// date format in Editor: $1 yyyy, $2 yy, $3 mm, $4 m, $5 dd, $6 d
|
||||||
|
|
|
@ -335,43 +335,39 @@ function ajaxSend(url, data, popState, noscroll) {
|
||||||
if (originalFavicon) {
|
if (originalFavicon) {
|
||||||
replaceFavicon(originalFavicon);
|
replaceFavicon(originalFavicon);
|
||||||
}
|
}
|
||||||
if (!xmlhttp.status) {
|
if (!popState) {
|
||||||
setHtml('loader', '');
|
if (data || url != location.href) {
|
||||||
} else {
|
history.pushState(data, '', url); //! remember window position
|
||||||
if (!popState) {
|
|
||||||
if (data || url != location.href) {
|
|
||||||
history.pushState(data, '', url); //! remember window position
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (!noscroll && !/&order/.test(url)) {
|
|
||||||
scrollTo(0, 0);
|
|
||||||
}
|
|
||||||
setHtml('content', xmlhttp.responseText);
|
|
||||||
var content = document.getElementById('content');
|
|
||||||
var scripts = content.getElementsByTagName('script');
|
|
||||||
var length = scripts.length; // required to avoid infinite loop
|
|
||||||
for (var i=0; i < length; i++) {
|
|
||||||
var script = document.createElement('script');
|
|
||||||
script.text = scripts[i].text;
|
|
||||||
content.appendChild(script);
|
|
||||||
}
|
|
||||||
|
|
||||||
var as = document.getElementById('menu').getElementsByTagName('a');
|
|
||||||
var href = location.href.replace(/(&(sql=|dump=|(select|table)=[^&]*)).*/, '$1');
|
|
||||||
for (var i=0; i < as.length; i++) {
|
|
||||||
as[i].className = (href == as[i].href ? 'active' : '');
|
|
||||||
}
|
|
||||||
var dump = document.getElementById('dump');
|
|
||||||
if (dump) {
|
|
||||||
var match = /&(select|table)=([^&]+)/.exec(href);
|
|
||||||
dump.href = dump.href.replace(/[^=]+$/, '') + (match ? match[2] : '');
|
|
||||||
}
|
|
||||||
//! modify Change database hidden fields
|
|
||||||
|
|
||||||
if (window.jush) {
|
|
||||||
jush.highlight_tag('code', 0);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (!noscroll && !/&order/.test(url)) {
|
||||||
|
scrollTo(0, 0);
|
||||||
|
}
|
||||||
|
setHtml('content', (xmlhttp.status ? xmlhttp.responseText : '<p class="error">' + noResponse));
|
||||||
|
var content = document.getElementById('content');
|
||||||
|
var scripts = content.getElementsByTagName('script');
|
||||||
|
var length = scripts.length; // required to avoid infinite loop
|
||||||
|
for (var i=0; i < length; i++) {
|
||||||
|
var script = document.createElement('script');
|
||||||
|
script.text = scripts[i].text;
|
||||||
|
content.appendChild(script);
|
||||||
|
}
|
||||||
|
|
||||||
|
var as = document.getElementById('menu').getElementsByTagName('a');
|
||||||
|
var href = location.href.replace(/(&(sql=|dump=|(select|table)=[^&]*)).*/, '$1');
|
||||||
|
for (var i=0; i < as.length; i++) {
|
||||||
|
as[i].className = (href == as[i].href ? 'active' : '');
|
||||||
|
}
|
||||||
|
var dump = document.getElementById('dump');
|
||||||
|
if (dump) {
|
||||||
|
var match = /&(select|table)=([^&]+)/.exec(href);
|
||||||
|
dump.href = dump.href.replace(/[^=]+$/, '') + (match ? match[2] : '');
|
||||||
|
}
|
||||||
|
//! modify Change database hidden fields
|
||||||
|
|
||||||
|
if (window.jush) {
|
||||||
|
jush.highlight_tag('code', 0);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}, data);
|
}, data);
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,6 +4,7 @@ Fix minor parser bug in SQL command with webserver file
|
||||||
Ctrl+click on button opens form to blank window
|
Ctrl+click on button opens form to blank window
|
||||||
SET DEFAULT foreign key action
|
SET DEFAULT foreign key action
|
||||||
Trim table and column names (bug #3405309)
|
Trim table and column names (bug #3405309)
|
||||||
|
Error message with no response from server in AJAX
|
||||||
PostgreSQL: fix alter foreign key
|
PostgreSQL: fix alter foreign key
|
||||||
PostgreSQL over PDO: connect if the eponymous database does not exist (bug #3391619)
|
PostgreSQL over PDO: connect if the eponymous database does not exist (bug #3391619)
|
||||||
Boolean search (Editor)
|
Boolean search (Editor)
|
||||||
|
|
Loading…
Reference in a new issue