diff --git a/js/console.js b/js/console.js index 1df00038cf..39cc5bfb83 100644 --- a/js/console.js +++ b/js/console.js @@ -184,6 +184,11 @@ var PMA_console = { PMA_console.ajaxCallback(data); } catch (e) { console.log("Invalid JSON!" + e.message); + if(AJAX.xhr.status === 0 && AJAX.xhr.statusText !== 'abort') { + PMA_ajaxShowMessage($('
',{class:'error',html:PMA_messages.strRequestFailed+' ( '+AJAX.xhr.statusText+' )'})); + AJAX.active = false; + AJAX.xhr = null; + } } }); diff --git a/js/messages.php b/js/messages.php index 29f2ae6ddd..a314952d37 100644 --- a/js/messages.php +++ b/js/messages.php @@ -258,6 +258,7 @@ $js_messages['strCancel'] = __('Cancel'); $js_messages['strLoading'] = __('Loading…'); $js_messages['strAbortedRequest'] = __('Request Aborted!!'); $js_messages['strProcessingRequest'] = __('Processing Request'); +$js_messages['strRequestFailed'] = __('Request Failed!!'); $js_messages['strErrorProcessingRequest'] = __('Error in Processing Request'); $js_messages['strErrorCode'] = __('Error code: %s'); $js_messages['strErrorText'] = __('Error text: %s');