diff options
| author | Cesar G <prototech91@gmail.com> | 2013-10-30 19:43:31 -0700 |
|---|---|---|
| committer | Cesar G <prototech91@gmail.com> | 2014-04-25 12:10:46 -0700 |
| commit | 5cc0f50d28d4f0866a16848a61978068df642b03 (patch) | |
| tree | 8f3bed5e57ffc77c2f9f60fc6d67ecc5355a9768 /phpBB | |
| parent | fe768d460d54d68aeecc392a75a1438b3f3bad34 (diff) | |
| download | forums-5cc0f50d28d4f0866a16848a61978068df642b03.tar forums-5cc0f50d28d4f0866a16848a61978068df642b03.tar.gz forums-5cc0f50d28d4f0866a16848a61978068df642b03.tar.bz2 forums-5cc0f50d28d4f0866a16848a61978068df642b03.tar.xz forums-5cc0f50d28d4f0866a16848a61978068df642b03.zip | |
[ticket/11339] Always clear timeout functions on subsequent AJAX calls
PHPBB3-11339
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/assets/javascript/core.js | 3 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/ajax.js | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js index ac866f7c78..4920a1167f 100644 --- a/phpBB/assets/javascript/core.js +++ b/phpBB/assets/javascript/core.js @@ -26,6 +26,7 @@ phpbb.loadingIndicator = function() { if (!loadingIndicator.is(':visible')) { loadingIndicator.fadeIn(phpbb.alertTime); // Wait fifteen seconds and display an error if nothing has been returned by then. + phpbb.clearLoadingTimeout(); phpbbAlertTimer = setTimeout(function() { if (loadingIndicator.is(':visible')) { phpbb.alert($('#phpbb_alert').attr('data-l-err'), $('#phpbb_alert').attr('data-l-timeout-processing-req')); @@ -315,7 +316,7 @@ phpbb.ajaxify = function(options) { refresh = false; } - setTimeout(function() { + phpbbAlertTimer = setTimeout(function() { if (refresh) { window.location = res.REFRESH_DATA.url; } diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js index 4df38f4275..bc68e5ae0c 100644 --- a/phpBB/styles/prosilver/template/ajax.js +++ b/phpBB/styles/prosilver/template/ajax.js @@ -8,7 +8,7 @@ * @param int Delay in ms until darkenwrapper's click event is triggered */ phpbb.closeDarkenWrapper = function(delay) { - setTimeout(function() { + phpbbAlertTimer = setTimeout(function() { $('#darkenwrapper').trigger('click'); }, delay); }; |