diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-11-12 17:56:59 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-11-12 17:56:59 +0100 |
| commit | d53c5b7e2aa9d9cb91bc9af8d2cac1d660ad76f3 (patch) | |
| tree | f0769b2494e62208f4acceb7534f33ad0585312a /phpBB/assets | |
| parent | 224efba459f073e0e954a047f0dd2e70cdba0c75 (diff) | |
| parent | da6ce7a668b14c1d0bf1c09544725c3a5e8e2b81 (diff) | |
| download | forums-d53c5b7e2aa9d9cb91bc9af8d2cac1d660ad76f3.tar forums-d53c5b7e2aa9d9cb91bc9af8d2cac1d660ad76f3.tar.gz forums-d53c5b7e2aa9d9cb91bc9af8d2cac1d660ad76f3.tar.bz2 forums-d53c5b7e2aa9d9cb91bc9af8d2cac1d660ad76f3.tar.xz forums-d53c5b7e2aa9d9cb91bc9af8d2cac1d660ad76f3.zip | |
Merge pull request #4028 from prototech/ticket/14287
[ticket/14287] Always remove loading indicator after confirming action.
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 36e881f5fd..228230ff71 100644 --- a/phpBB/assets/javascript/core.js +++ b/phpBB/assets/javascript/core.js @@ -303,6 +303,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') { |