beenull/adminerevo
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Error message with no response from server in AJAX

Browse source
This commit is contained in:
Jakub Vrana 2011-09-17 15:24:18 +02:00
parent 6b3e3c2532
commit ed25431f3c
4 changed files with 34 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
adminer/include/design.inc.php
View file

@ -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>

1
adminer/lang/cs.inc.php
View file

@ -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

6
adminer/static/functions.js
View file

@ -335,9 +335,6 @@ function ajaxSend(url, data, popState, noscroll) {
if (originalFavicon) { if (originalFavicon) {
replaceFavicon(originalFavicon); replaceFavicon(originalFavicon);
} }
if (!xmlhttp.status) {
setHtml('loader', '');
} else {
if (!popState) { if (!popState) {
if (data || url != location.href) { if (data || url != location.href) {
history.pushState(data, '', url); //! remember window position history.pushState(data, '', url); //! remember window position
@ -346,7 +343,7 @@ function ajaxSend(url, data, popState, noscroll) {
if (!noscroll && !/&order/.test(url)) { if (!noscroll && !/&order/.test(url)) {
scrollTo(0, 0); scrollTo(0, 0);
} }
setHtml('content', xmlhttp.responseText); setHtml('content', (xmlhttp.status ? xmlhttp.responseText : '<p class="error">' + noResponse));
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
@ -372,7 +369,6 @@ function ajaxSend(url, data, popState, noscroll) {
jush.highlight_tag('code', 0); jush.highlight_tag('code', 0);
} }
} }
}
}, data); }, data);
} }

1
changes.txt
View file

@ -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)