Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAtul Pratap Singh <atulpratapsingh05@gmail.com>2015-03-23 16:18:19 +0300
committerAtul Pratap Singh <atulpratapsingh05@gmail.com>2015-03-23 16:18:19 +0300
commit35be80ca8876e4a07717def0d43d36eb1dd41e6f (patch)
tree4a054874211809bff9c4356f2ad99e127f99a4cf /js/console.js
parentd86c511ed0ff8fb33073d6498581c510dd4d849b (diff)
parent8847df101a13c9dfe2ff29b5758aedde4b630dd8 (diff)
Merge branch 'QA_4_4'
Diffstat (limited to 'js/console.js')
-rw-r--r--js/console.js5
1 files changed, 5 insertions, 0 deletions
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($('<div />',{class:'error',html:PMA_messages.strRequestFailed+' ( '+AJAX.xhr.statusText+' )'}));
+ AJAX.active = false;
+ AJAX.xhr = null;
+ }
}
});