diff options
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/adm/style/ajax.js | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/phpBB/adm/style/ajax.js b/phpBB/adm/style/ajax.js index 39b63e4696..3702c94ca8 100644 --- a/phpBB/adm/style/ajax.js +++ b/phpBB/adm/style/ajax.js @@ -201,7 +201,9 @@ function submitPermissions() { var permissionSubmitSize = 0, permissionRequestCount = 0, forumIds = [], - permissionSubmitFailed = false; + permissionSubmitFailed = false, + clearIndicator = true, + $loadingIndicator; if ($submitAllButton !== $submitButton) { fieldsetList = $form.find('fieldset#' + $submitButton.closest('fieldset.permissions').id); @@ -235,6 +237,8 @@ function submitPermissions() { } }); + $loadingIndicator = phpbb.loadingIndicator(); + /** * Handler for submitted permissions form chunk * @@ -250,6 +254,8 @@ function submitPermissions() { } else if (!permissionSubmitFailed && res.S_USER_NOTICE) { // Display success message at the end of submitting the form if (permissionRequestCount >= permissionSubmitSize) { + clearIndicator = true; + var $alert = phpbb.alert(res.MESSAGE_TITLE, res.MESSAGE_TEXT); var $alertBoxLink = $alert.find('p.alert_text > a'); @@ -299,6 +305,17 @@ function submitPermissions() { $form.submit(); }, res.REFRESH_DATA.time * 1000); // Server specifies time in seconds } + } else { + // Still more forms to submit, so do not clear indicator + clearIndicator = false; + } + } + + if (clearIndicator) { + phpbb.clearLoadingTimeout(); + + if ($loadingIndicator) { + $loadingIndicator.fadeOut(phpbb.alertTime); } } } |