diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-07-10 13:14:08 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-07-10 13:14:08 +0200 |
| commit | 8df16ed92c65228593167d3f187a05ccf85f5a9d (patch) | |
| tree | 2b056a4873dfa04dedb546767513be83763cdcf6 | |
| parent | 46e6a4e61fa6a38540aa87f37200f3007f10f13f (diff) | |
| parent | 05f1476fc99e1c3c5142cf228b00b48b4e0e133e (diff) | |
| download | forums-8df16ed92c65228593167d3f187a05ccf85f5a9d.tar forums-8df16ed92c65228593167d3f187a05ccf85f5a9d.tar.gz forums-8df16ed92c65228593167d3f187a05ccf85f5a9d.tar.bz2 forums-8df16ed92c65228593167d3f187a05ccf85f5a9d.tar.xz forums-8df16ed92c65228593167d3f187a05ccf85f5a9d.zip | |
Merge branch '3.1.x'
| -rw-r--r-- | phpBB/assets/javascript/core.js | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js index 953b6be0bd..36e881f5fd 100644 --- a/phpBB/assets/javascript/core.js +++ b/phpBB/assets/javascript/core.js @@ -394,8 +394,11 @@ phpbb.ajaxify = function(options) { error: errorHandler, cache: false }); + request.always(function() { - $loadingIndicator.fadeOut(phpbb.alertTime); + if ($loadingIndicator && $loadingIndicator.is(':visible')) { + $loadingIndicator.fadeOut(phpbb.alertTime); + } }); }; |