From 8847df101a13c9dfe2ff29b5758aedde4b630dd8 Mon Sep 17 00:00:00 2001 From: Kushagra Pandey Date: Mon, 23 Mar 2015 18:14:07 +0530 Subject: [PATCH] Handling failed AJAX requests Signed-off-by: Kushagra Pandey --- js/console.js | 5 +++++ js/messages.php | 1 + 2 files changed, 6 insertions(+) diff --git a/js/console.js b/js/console.js index 687c78e98c..a2b7bd44a2 100644 --- a/js/console.js +++ b/js/console.js @@ -173,6 +173,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 cea8ee5ca8..05b9ee4ae4 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');