Merge remote-tracking branch 'remotes/prototech/ticket/11339' into de…

…velop-ascraeus # By Cesar G # Via Cesar G * remotes/prototech/ticket/11339: [ticket/11339] Always clear timeout functions on subsequent AJAX calls
kigh143 · May 2, 2014 · 621023e · 621023e
2 parents 83cdad7 + 5cc0f50
commit 621023e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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);
 };