mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 08:25:42 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.1.x' into 3.2.x

Browse Source 
* 3.1.x:
  [ticket/15174] Split timeout message to extra method and set timeout to 60s
  [ticket/15174] Increase timeout for loading indicator
This commit is contained in:
Tristan Darricau 2017-04-18 23:42:28 +02:00
commit f4bc0020ca
No known key found for this signature in database
GPG Key ID: 817043C2E29DB881
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
phpBB/assets/javascript/core.js
View File

@ -36,20 +36,27 @@ 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 60 seconds and display an error if nothing has been returned by then.
phpbb.clearLoadingTimeout(); phpbb.clearLoadingTimeout();
phpbbAlertTimer = setTimeout(function() { phpbbAlertTimer = setTimeout(function() {
var $alert = $('#phpbb_alert'); phpbb.showTimeoutMessage();
}, 60000);
if ($loadingIndicator.is(':visible')) {
phpbb.alert($alert.attr('data-l-err'), $alert.attr('data-l-timeout-processing-req'));
}
}, 15000);
} }
return $loadingIndicator; return $loadingIndicator;
}; };
/**
* Show timeout message
*/
phpbb.showTimeoutMessage = function () {
var $alert = $('#phpbb_alert');
if ($loadingIndicator.is(':visible')) {
phpbb.alert($alert.attr('data-l-err'), $alert.attr('data-l-timeout-processing-req'));
}
};
/** /**
* Clear loading alert timeout * Clear loading alert timeout
*/ */