diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2017-04-18 23:42:28 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2017-04-18 23:42:28 +0200 |
| commit | f4bc0020ca6c4194d60c7f81dbb8be136e1b222c (patch) | |
| tree | f25af1bc498627ee5c01c2e0fc11eec4d5b426c3 /phpBB/assets/javascript | |
| parent | e0ae49d8a5cda64744c8e08317a5c5329deb2472 (diff) | |
| parent | 67995e1e096d44069d3c76efc5c7ab90aef73398 (diff) | |
| download | forums-f4bc0020ca6c4194d60c7f81dbb8be136e1b222c.tar forums-f4bc0020ca6c4194d60c7f81dbb8be136e1b222c.tar.gz forums-f4bc0020ca6c4194d60c7f81dbb8be136e1b222c.tar.bz2 forums-f4bc0020ca6c4194d60c7f81dbb8be136e1b222c.tar.xz forums-f4bc0020ca6c4194d60c7f81dbb8be136e1b222c.zip | |
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
Diffstat (limited to 'phpBB/assets/javascript')
| -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 b00da3caff..7dcedaef80 100644 --- a/phpBB/assets/javascript/core.js +++ b/phpBB/assets/javascript/core.js @@ -36,21 +36,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() { |