mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-10 16:35:35 +02:00
Merge branch '3.1.x' into 3.2.x
* 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:
@ -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
|
||||||
*/
|
*/
|
||||||
|
Reference in New Issue
Block a user