diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-10-24 14:08:27 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-10-24 14:08:27 +0200 |
| commit | 6a2fef97d5f55bad92898b34db9810afe1dd106d (patch) | |
| tree | a7e64fa1c7a9ef626fe4c6c6fa0fb50e7f88bf9a /phpBB/assets/javascript/core.js | |
| parent | d612041cd19d5bea7d08f80a2d952123699aa30e (diff) | |
| parent | 963dbed106bf4662fe5317baf1c56e901a3d7ba6 (diff) | |
| download | forums-6a2fef97d5f55bad92898b34db9810afe1dd106d.tar forums-6a2fef97d5f55bad92898b34db9810afe1dd106d.tar.gz forums-6a2fef97d5f55bad92898b34db9810afe1dd106d.tar.bz2 forums-6a2fef97d5f55bad92898b34db9810afe1dd106d.tar.xz forums-6a2fef97d5f55bad92898b34db9810afe1dd106d.zip | |
Merge remote-tracking branch 'prototech/ticket/11138' into develop
* prototech/ticket/11138:
[ticket/11138] Do not use AJAX for ACP resync features.
[ticket/11138] Increase AJAX timeout period to 15 seconds.
[ticket/11872] Template syntax typos in oauth templates
Diffstat (limited to 'phpBB/assets/javascript/core.js')
| -rw-r--r-- | phpBB/assets/javascript/core.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js index ab0891e70c..7bd3b85d7d 100644 --- a/phpBB/assets/javascript/core.js +++ b/phpBB/assets/javascript/core.js @@ -27,12 +27,12 @@ phpbb.loadingAlert = function() { } else { loadingAlert.show(); dark.fadeIn(phpbb.alertTime, function() { - // Wait five seconds and display an error if nothing has been returned by then. + // Wait fifteen seconds and display an error if nothing has been returned by then. phpbbAlertTimer = setTimeout(function() { if (loadingAlert.is(':visible')) { phpbb.alert($('#phpbb_alert').attr('data-l-err'), $('#phpbb_alert').attr('data-l-timeout-processing-req')); } - }, 5000); + }, 15000); }); } |