makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'remotes/prototech/ticket/11339' into develop-ascraeus

Browse source 
# By Cesar G
# Via Cesar G
* remotes/prototech/ticket/11339:
  [ticket/11339] Always clear timeout functions on subsequent AJAX calls
This commit is contained in:
Nathaniel Guse 2014-05-01 21:35:40 -05:00
commit 621023e4ae
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
phpBB/assets/javascript/core.js
View file

@ -26,6 +26,7 @@ phpbb.loadingIndicator = function() {
if (!loadingIndicator.is(':visible')) { if (!loadingIndicator.is(':visible')) {
loadingIndicator.fadeIn(phpbb.alertTime); loadingIndicator.fadeIn(phpbb.alertTime);
// Wait fifteen seconds and display an error if nothing has been returned by then. // Wait fifteen seconds and display an error if nothing has been returned by then.
phpbb.clearLoadingTimeout();
phpbbAlertTimer = setTimeout(function() { phpbbAlertTimer = setTimeout(function() {
if (loadingIndicator.is(':visible')) { if (loadingIndicator.is(':visible')) {
phpbb.alert($('#phpbb_alert').attr('data-l-err'), $('#phpbb_alert').attr('data-l-timeout-processing-req')); 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; refresh = false;
} }
setTimeout(function() { phpbbAlertTimer = setTimeout(function() {
if (refresh) { if (refresh) {
window.location = res.REFRESH_DATA.url; window.location = res.REFRESH_DATA.url;
} }

2
phpBB/styles/prosilver/template/ajax.js
View file

@ -8,7 +8,7 @@
* @param int Delay in ms until darkenwrapper's click event is triggered * @param int Delay in ms until darkenwrapper's click event is triggered
*/ */
phpbb.closeDarkenWrapper = function(delay) { phpbb.closeDarkenWrapper = function(delay) {
setTimeout(function() { phpbbAlertTimer = setTimeout(function() {
$('#darkenwrapper').trigger('click'); $('#darkenwrapper').trigger('click');
}, delay); }, delay);
}; };