diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2017-04-18 23:41:34 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2017-04-18 23:41:34 +0200 |
| commit | 67995e1e096d44069d3c76efc5c7ab90aef73398 (patch) | |
| tree | 327fa7dd224b235f0cac668ce7c86ff0d827e744 /phpBB/assets/javascript/core.js | |
| parent | 2d33b6adc69db9deec9f7fc58f92c59f6f8525bd (diff) | |
| parent | f6458653338c1e4c6dee690f3b1317f89d333ed0 (diff) | |
| download | forums-67995e1e096d44069d3c76efc5c7ab90aef73398.tar forums-67995e1e096d44069d3c76efc5c7ab90aef73398.tar.gz forums-67995e1e096d44069d3c76efc5c7ab90aef73398.tar.bz2 forums-67995e1e096d44069d3c76efc5c7ab90aef73398.tar.xz forums-67995e1e096d44069d3c76efc5c7ab90aef73398.zip | |
Merge pull request #4796 from marc1706/ticket/15174
[ticket/15174] Increase timeout for loading indicator
* github.com:phpbb/phpbb:
[ticket/15174] Split timeout message to extra method and set timeout to 60s
[ticket/15174] Increase timeout for loading indicator
Diffstat (limited to 'phpBB/assets/javascript/core.js')
| -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 f7ace80705..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')); - } - }, 15000); + 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() { |