mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-13 22:55:07 +01:00
ec49aa8175
Conflicts:
- `.github/dependabot.yml`:
Updated upstream, we deleted it to not be flooded by Depandabot.
Kept deleted.
- `Gemfile.lock`:
Puma updated on both sides, went for the most recent version.
- `app/controllers/api/v1/mutes_controller.rb`:
Upstream updated the serializer to support timed mutes, while
glitch-soc added a custom API ages ago to get information that
is already available elsewhere.
Dropped the glitch-soc-specific API, went with upstream changes.
- `app/javascript/core/admin.js`:
Conflict due to changing how assets are loaded. Went with upstream.
- `app/javascript/packs/public.js`:
Conflict due to changing how assets are loaded. Went with upstream.
- `app/models/mute.rb`:
🤷
- `app/models/user.rb`:
New user setting added upstream while we have glitch-soc-specific
user settings. Added upstream's user setting.
- `config/settings.yml`:
Upstream added a new user setting close to a user setting we had
changed the defaults for. Added the new upstream setting.
- `package.json`:
Upstream dependency updated “too close” to a glitch-soc-specific
dependency. No real conflict. Updated the dependency.
77 lines
3.0 KiB
JavaScript
77 lines
3.0 KiB
JavaScript
// This file will be loaded on admin pages, regardless of theme.
|
|
|
|
import './public-path';
|
|
import { delegate } from '@rails/ujs';
|
|
import ready from '../mastodon/ready';
|
|
|
|
const batchCheckboxClassName = '.batch-checkbox input[type="checkbox"]';
|
|
|
|
delegate(document, '#batch_checkbox_all', 'change', ({ target }) => {
|
|
[].forEach.call(document.querySelectorAll(batchCheckboxClassName), (content) => {
|
|
content.checked = target.checked;
|
|
});
|
|
});
|
|
|
|
delegate(document, batchCheckboxClassName, 'change', () => {
|
|
const checkAllElement = document.querySelector('#batch_checkbox_all');
|
|
|
|
if (checkAllElement) {
|
|
checkAllElement.checked = [].every.call(document.querySelectorAll(batchCheckboxClassName), (content) => content.checked);
|
|
checkAllElement.indeterminate = !checkAllElement.checked && [].some.call(document.querySelectorAll(batchCheckboxClassName), (content) => content.checked);
|
|
}
|
|
});
|
|
|
|
delegate(document, '.media-spoiler-show-button', 'click', () => {
|
|
[].forEach.call(document.querySelectorAll('button.media-spoiler'), (element) => {
|
|
element.click();
|
|
});
|
|
});
|
|
|
|
delegate(document, '.media-spoiler-hide-button', 'click', () => {
|
|
[].forEach.call(document.querySelectorAll('.spoiler-button.spoiler-button--visible button'), (element) => {
|
|
element.click();
|
|
});
|
|
});
|
|
|
|
delegate(document, '.filter-subset--with-select select', 'change', ({ target }) => {
|
|
target.form.submit();
|
|
});
|
|
|
|
const onDomainBlockSeverityChange = (target) => {
|
|
const rejectMediaDiv = document.querySelector('.input.with_label.domain_block_reject_media');
|
|
const rejectReportsDiv = document.querySelector('.input.with_label.domain_block_reject_reports');
|
|
|
|
if (rejectMediaDiv) {
|
|
rejectMediaDiv.style.display = (target.value === 'suspend') ? 'none' : 'block';
|
|
}
|
|
|
|
if (rejectReportsDiv) {
|
|
rejectReportsDiv.style.display = (target.value === 'suspend') ? 'none' : 'block';
|
|
}
|
|
};
|
|
|
|
delegate(document, '#domain_block_severity', 'change', ({ target }) => onDomainBlockSeverityChange(target));
|
|
|
|
const onEnableBootstrapTimelineAccountsChange = (target) => {
|
|
const bootstrapTimelineAccountsField = document.querySelector('#form_admin_settings_bootstrap_timeline_accounts');
|
|
|
|
if (bootstrapTimelineAccountsField) {
|
|
bootstrapTimelineAccountsField.disabled = !target.checked;
|
|
if (target.checked) {
|
|
bootstrapTimelineAccountsField.parentElement.classList.remove('disabled');
|
|
} else {
|
|
bootstrapTimelineAccountsField.parentElement.classList.add('disabled');
|
|
}
|
|
}
|
|
};
|
|
|
|
delegate(document, '#form_admin_settings_enable_bootstrap_timeline_accounts', 'change', ({ target }) => onEnableBootstrapTimelineAccountsChange(target));
|
|
|
|
ready(() => {
|
|
const domainBlockSeverityInput = document.getElementById('domain_block_severity');
|
|
if (domainBlockSeverityInput) onDomainBlockSeverityChange(domainBlockSeverityInput);
|
|
|
|
const enableBootstrapTimelineAccounts = document.getElementById('form_admin_settings_enable_bootstrap_timeline_accounts');
|
|
if (enableBootstrapTimelineAccounts) onEnableBootstrapTimelineAccountsChange(enableBootstrapTimelineAccounts);
|
|
});
|