makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 12:28:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.3.x'

Browse source
This commit is contained in:
Marc Alexander 2020-01-30 21:16:53 +01:00
commit 0922605da8
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
1 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
phpBB/adm/style/ajax.js
View file

@ -201,7 +201,9 @@ function submitPermissions() {
var permissionSubmitSize = 0, var permissionSubmitSize = 0,
permissionRequestCount = 0, permissionRequestCount = 0,
forumIds = [], forumIds = [],
permissionSubmitFailed = false; permissionSubmitFailed = false,
clearIndicator = true,
$loadingIndicator;
if ($submitAllButton !== $submitButton) { if ($submitAllButton !== $submitButton) {
fieldsetList = $form.find('fieldset#' + $submitButton.closest('fieldset.permissions').id); fieldsetList = $form.find('fieldset#' + $submitButton.closest('fieldset.permissions').id);
@ -235,6 +237,8 @@ function submitPermissions() {
} }
}); });
$loadingIndicator = phpbb.loadingIndicator();
/** /**
* Handler for submitted permissions form chunk * Handler for submitted permissions form chunk
* *
@ -250,6 +254,8 @@ function submitPermissions() {
} else if (!permissionSubmitFailed && res.S_USER_NOTICE) { } else if (!permissionSubmitFailed && res.S_USER_NOTICE) {
// Display success message at the end of submitting the form // Display success message at the end of submitting the form
if (permissionRequestCount >= permissionSubmitSize) { if (permissionRequestCount >= permissionSubmitSize) {
clearIndicator = true;
var $alert = phpbb.alert(res.MESSAGE_TITLE, res.MESSAGE_TEXT); var $alert = phpbb.alert(res.MESSAGE_TITLE, res.MESSAGE_TEXT);
var $alertBoxLink = $alert.find('p.alert_text > a'); var $alertBoxLink = $alert.find('p.alert_text > a');
@ -299,6 +305,17 @@ function submitPermissions() {
$form.submit(); $form.submit();
}, res.REFRESH_DATA.time * 1000); // Server specifies time in seconds }, 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);
} }
} }
} }