fix: alert on page load

isekai-main
Barış Soner Uşaklı 2 years ago committed by Julian Lam
parent 3bd9a87154
commit 8cf4a6f62e

@ -9,14 +9,22 @@ define('admin/settings/email', ['ace/ace', 'alerts', 'admin/settings'], function
configureEmailTester(); configureEmailTester();
configureEmailEditor(); configureEmailEditor();
handleDigestHourChange(); handleDigestHourChange();
$(window).off('action:admin.settingsLoaded', onSettingsLoaded)
.on('action:admin.settingsLoaded', onSettingsLoaded);
$(window).off('action:admin.settingsSaved', onSettingsSaved)
.on('action:admin.settingsSaved', onSettingsSaved);
};
function onSettingsLoaded() {
handleDigestHourChange();
handleSmtpServiceChange(); handleSmtpServiceChange();
}
$(window).on('action:admin.settingsLoaded action:admin.settingsSaved', handleDigestHourChange); function onSettingsSaved() {
$(window).on('action:admin.settingsSaved', function () { handleDigestHourChange();
socket.emit('admin.user.restartJobs'); socket.emit('admin.user.restartJobs');
}); }
$('[id="email:smtpTransport:service"]').change(handleSmtpServiceChange);
};
function configureEmailTester() { function configureEmailTester() {
$('button[data-action="email.test"]').off('click').on('click', function () { $('button[data-action="email.test"]').off('click').on('click', function () {
@ -106,13 +114,18 @@ define('admin/settings/email', ['ace/ace', 'alerts', 'admin/settings'], function
} }
function handleSmtpServiceChange() { function handleSmtpServiceChange() {
function toggleCustomService() {
const isCustom = $('[id="email:smtpTransport:service"]').val() === 'nodebb-custom-smtp'; const isCustom = $('[id="email:smtpTransport:service"]').val() === 'nodebb-custom-smtp';
$('[id="email:smtpTransport:custom-service"]')[isCustom ? 'slideDown' : 'slideUp'](isCustom); $('[id="email:smtpTransport:custom-service"]')[isCustom ? 'slideDown' : 'slideUp'](isCustom);
}
toggleCustomService();
$('[id="email:smtpTransport:service"]').change(function () {
toggleCustomService();
const enabledEl = document.getElementById('email:smtpTransport:enabled'); const enabledEl = document.getElementById('email:smtpTransport:enabled');
if (enabledEl) { if (enabledEl) {
if (!enabledEl.checked) { if (!enabledEl.checked) {
enabledEl.closest('label').classList.toggle('is-checked', true); $('label[for="email:smtpTransport:enabled"]').toggleClass('is-checked', true);
enabledEl.checked = true; enabledEl.checked = true;
alerts.alert({ alerts.alert({
message: '[[admin/settings/email:smtp-transport.auto-enable-toast]]', message: '[[admin/settings/email:smtp-transport.auto-enable-toast]]',
@ -120,6 +133,7 @@ define('admin/settings/email', ['ace/ace', 'alerts', 'admin/settings'], function
}); });
} }
} }
});
} }
return module; return module;

@ -150,7 +150,7 @@
[[admin/settings/email:smtp-transport.gmail-warning2]] [[admin/settings/email:smtp-transport.gmail-warning2]]
</p> </p>
</div> </div>
<div class="form-group well" id="email:smtpTransport:custom-service" style="display: none"> <div class="form-group well" id="email:smtpTransport:custom-service">
<h5>Custom Service</h5> <h5>Custom Service</h5>
<label for="email:smtpTransport:host">[[admin/settings/email:smtp-transport.host]]</label> <label for="email:smtpTransport:host">[[admin/settings/email:smtp-transport.host]]</label>

Loading…
Cancel
Save