diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-11-12 17:57:02 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-11-12 17:57:02 +0100 |
| commit | 21fe46bf8aa741b6a98c97a2a86a12b8577cd917 (patch) | |
| tree | 825d3b679c7af2f188a2955a8e184cd1b9e6c642 /phpBB/assets | |
| parent | f180f9a18149b06667a55a731357bbee3f0a2602 (diff) | |
| parent | d53c5b7e2aa9d9cb91bc9af8d2cac1d660ad76f3 (diff) | |
| download | forums-21fe46bf8aa741b6a98c97a2a86a12b8577cd917.tar forums-21fe46bf8aa741b6a98c97a2a86a12b8577cd917.tar.gz forums-21fe46bf8aa741b6a98c97a2a86a12b8577cd917.tar.bz2 forums-21fe46bf8aa741b6a98c97a2a86a12b8577cd917.tar.xz forums-21fe46bf8aa741b6a98c97a2a86a12b8577cd917.zip | |
Merge branch '3.1.x'
Diffstat (limited to 'phpBB/assets')
| -rw-r--r-- | phpBB/assets/javascript/core.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js index 6a008ba1ec..91f5521c7a 100644 --- a/phpBB/assets/javascript/core.js +++ b/phpBB/assets/javascript/core.js @@ -306,6 +306,10 @@ phpbb.ajaxify = function(options) { alert = phpbb.alert(res.MESSAGE_TITLE, res.MESSAGE_TEXT); } else { $dark.fadeOut(phpbb.alertTime); + + if ($loadingIndicator) { + $loadingIndicator.fadeOut(phpbb.alertTime); + } } if (typeof phpbb.ajaxCallbacks[callback] === 'function') { |