mirror of
https://github.com/Casvt/MIND.git
synced 2026-04-25 03:00:20 -04:00
Branch Sync
From Main to Development
This commit is contained in:
@@ -6,19 +6,30 @@ const SettingsEls = {
|
||||
};
|
||||
|
||||
function loadSettings() {
|
||||
<<<<<<< HEAD
|
||||
document.getElementById('locale-input').value = getLocalStorage('locale')['locale'];
|
||||
=======
|
||||
// Default Service is handled by notification.fillNotificationSelection()
|
||||
document.getElementById('locale-input').value =
|
||||
getLocalStorage('locale')['locale'];
|
||||
>>>>>>> Development
|
||||
};
|
||||
|
||||
function updateLocale(e) {
|
||||
setLocalStorage({'locale': e.target.value});
|
||||
<<<<<<< HEAD
|
||||
window.location.reload();
|
||||
=======
|
||||
fillLibrary(Types.reminder);
|
||||
>>>>>>> Development
|
||||
};
|
||||
|
||||
function updateDefaultService(e) {
|
||||
setLocalStorage({'default_service': parseInt(e.target.value)});
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
// Add window is handled by show.showAdd()
|
||||
>>>>>>> Development
|
||||
};
|
||||
|
||||
function changePassword() {
|
||||
@@ -55,7 +66,14 @@ function deleteAccount() {
|
||||
|
||||
loadSettings();
|
||||
|
||||
<<<<<<< HEAD
|
||||
document.getElementById('locale-input').addEventListener('change', updateLocale);
|
||||
document.querySelector('#default-service-input').addEventListener('change', updateDefaultService);
|
||||
document.getElementById('change-password-form').setAttribute('action', 'javascript:changePassword()');
|
||||
document.getElementById('delete-account-button').addEventListener('click', e => deleteAccount());
|
||||
=======
|
||||
SettingsEls.locale_input.onchange = updateLocale;
|
||||
SettingsEls.default_service_input.onchange = updateDefaultService;
|
||||
SettingsEls.change_password_form.action = 'javascript:changePassword();';
|
||||
SettingsEls.delete_account_button.onclick = e => deleteAccount();
|
||||
>>>>>>> Development
|
||||
|
||||
Reference in New Issue
Block a user