gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #835 from zixtor/QA_4_1

Browse Source 
Fix bug#3780: Allow aborting ajax request if user clicks on new link in ...
This commit is contained in:
Madhura Jayaratne 2014-01-07 20:24:41 -08:00
commit 9e32dddb93
2 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
js/ajax.js
View File

@ -12,6 +12,10 @@ var AJAX = {
* @var object source The object whose event initialized the request
*/
source: null,
/**
* @var object xhr A reference to the ajax request that is currently running
*/
xhr: null,
/**
* @var function Callback to execute after a successful request
* Used by PMA_commonFunctions from common.js
@ -157,11 +161,25 @@ var AJAX = {
event.stopImmediatePropagation();
}
if (AJAX.active === true) {
// Silently bail out, there is already a request in progress.
// TODO: save a reference to the request and cancel the old request
// when the user requests something else. Something like this is
// already implemented in the PMA_fastFilter object in navigation.js
return false;
// Cancel the old request if abortable, when the user requests
// something else. Otherwise silently bail out, as there is already
// a request well in progress.
if (AJAX.xhr) {
//In case of a link request, attempt aborting
AJAX.xhr.abort();
if(AJAX.xhr.status === 0 && AJAX.xhr.statusText === 'abort') {
//If aborted
AJAX.$msgbox = PMA_ajaxShowMessage(PMA_messages.strAbortedRequest);
AJAX.active = false;
AJAX.xhr = null;
} else {
//If can't abort
return false;
}
} else {
//In case submitting a form, don't attempt aborting
return false;
}
}
AJAX.source = $(this);
@ -184,7 +202,8 @@ var AJAX = {
if (isLink) {
AJAX.active = true;
AJAX.$msgbox = PMA_ajaxShowMessage();
$.get(url, params, AJAX.responseHandler);
//Save reference for the new link request
AJAX.xhr = $.get(url, params, AJAX.responseHandler);
} else {
/**
* Manually fire the onsubmit event for the form, if any.
@ -222,6 +241,7 @@ var AJAX = {
if (data._redirect) {
PMA_ajaxShowMessage(data._redirect, false);
AJAX.active = false;
AJAX.xhr = null;
return;
}
@ -311,6 +331,7 @@ var AJAX = {
} else {
PMA_ajaxShowMessage(data.error, false);
AJAX.active = false;
AJAX.xhr = null;
}
},
/**

1
js/messages.php
View File

@ -227,6 +227,7 @@ $js_messages['strCancel'] = __('Cancel');
/* For Ajax Notifications */
$js_messages['strLoading'] = __('Loading…');
$js_messages['strAbortedRequest'] = __('Request Aborted!!');
$js_messages['strProcessingRequest'] = __('Processing Request');
$js_messages['strErrorProcessingRequest'] = __('Error in Processing Request');
$js_messages['strErrorCode'] = __('Error code: %s');