diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2017-04-17 09:59:22 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2017-04-17 09:59:22 +0200 |
| commit | f6458653338c1e4c6dee690f3b1317f89d333ed0 (patch) | |
| tree | 47915a65854df43bfab87c1a79979d63e3aa3edd | |
| parent | 8a624c4dccbfa174d567e343f871939d5fd9e1a5 (diff) | |
| download | forums-f6458653338c1e4c6dee690f3b1317f89d333ed0.tar forums-f6458653338c1e4c6dee690f3b1317f89d333ed0.tar.gz forums-f6458653338c1e4c6dee690f3b1317f89d333ed0.tar.bz2 forums-f6458653338c1e4c6dee690f3b1317f89d333ed0.tar.xz forums-f6458653338c1e4c6dee690f3b1317f89d333ed0.zip | |
[ticket/15174] Split timeout message to extra method and set timeout to 60s
PHPBB3-15174
| -rw-r--r-- | phpBB/assets/javascript/core.js | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js index aa2cc70636..b079043396 100644 --- a/phpBB/assets/javascript/core.js +++ b/phpBB/assets/javascript/core.js @@ -33,21 +33,28 @@ 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. + // Wait 60 seconds and display an error if nothing has been returned by then. phpbb.clearLoadingTimeout(); phpbbAlertTimer = setTimeout(function() { - var $alert = $('#phpbb_alert'); - - if ($loadingIndicator.is(':visible')) { - phpbb.alert($alert.attr('data-l-err'), $alert.attr('data-l-timeout-processing-req')); - } - }, 25000); + phpbb.showTimeoutMessage(); + }, 60000); } 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 */ phpbb.clearLoadingTimeout = function() { |