aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/styles
diff options
context:
space:
mode:
authorCallum Macrae <callum@lynxphp.com>2011-08-19 17:39:35 +0100
committerIgor Wiedler <igor@wiedler.ch>2012-03-31 02:09:13 +0200
commit83095c2a2d31b81a5f8a9bf5b61f8f2f3976e38a (patch)
tree927bb992ab03125b1ab0a9d95fb308832996ae9f /phpBB/styles
parentdce38f44de04bd7a1f91f8e57f6d266bd5e1af86 (diff)
downloadforums-83095c2a2d31b81a5f8a9bf5b61f8f2f3976e38a.tar
forums-83095c2a2d31b81a5f8a9bf5b61f8f2f3976e38a.tar.gz
forums-83095c2a2d31b81a5f8a9bf5b61f8f2f3976e38a.tar.bz2
forums-83095c2a2d31b81a5f8a9bf5b61f8f2f3976e38a.tar.xz
forums-83095c2a2d31b81a5f8a9bf5b61f8f2f3976e38a.zip
[ticket/10270] Lengthened the timeout on the AJAX request error.
It was at 3 seconds before, now it is at 5 seconds from when the popup has faded in. PHPBB3-10270
Diffstat (limited to 'phpBB/styles')
-rw-r--r--phpBB/styles/script.js17
1 files changed, 9 insertions, 8 deletions
diff --git a/phpBB/styles/script.js b/phpBB/styles/script.js
index 3ed12bfee8..04e768e21e 100644
--- a/phpBB/styles/script.js
+++ b/phpBB/styles/script.js
@@ -33,15 +33,16 @@ phpbb.loading_alert = function() {
else
{
loading_alert.show();
- dark.fadeIn();
+ dark.fadeIn(function() {
+ setTimeout(function() {
+ if (loading_alert.is(':visible'))
+ {
+ phpbb.alert('Error', 'Error processing your request. Please try again.');
+ }
+ }, 5000);
+ });
}
-
- setTimeout(function() {
- if (loading_alert.is(':visible'))
- {
- phpbb.alert('Error', 'Error processing your request. Please try again.');
- }
- }, 3000);
+
return loading_alert;
}