Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-29 12:09:20 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

More jQuery to native (including bootstrap.js)

Browse source
This commit is contained in:
djmaze 2020-08-30 10:30:50 +02:00
parent bdb36ec128
commit 69fcc240e9
39 changed files with 496 additions and 344 deletions
Download patch file Download diff file Expand all files Collapse all files

18
dev/Screen/AbstractSettings.js
View file

@ -17,7 +17,6 @@ class AbstractSettingsScreen extends AbstractScreen {
this.menu = ko.observableArray([]);
this.oCurrentSubScreen = null;
this.oViewModelPlace = null;
this.setupSettings();
}
@ -66,25 +65,24 @@ class AbstractSettingsScreen extends AbstractScreen {
if (RoutedSettingsViewModel.__builded && RoutedSettingsViewModel.__vm) {
settingsScreen = RoutedSettingsViewModel.__vm;
} else {
if (this.oViewModelPlace) {
const vmPlace = document.getElementById('rl-settings-subscreen');
if (vmPlace) {
settingsScreen = new RoutedSettingsViewModel();
viewModelDom = jQuery('<div></div>');
viewModelDom[0].classList.add('rl-settings-view-model');
viewModelDom[0].hidden = true;
this.oViewModelPlace.append(viewModelDom[0]);
viewModelDom = Element.fromHTML('<div class="rl-settings-view-model" hidden=""></div>');
vmPlace.append(viewModelDom);
settingsScreen.viewModelDom = viewModelDom[0];
settingsScreen.viewModelDom = viewModelDom;
settingsScreen.__rlSettingsData = RoutedSettingsViewModel.__rlSettingsData;
RoutedSettingsViewModel.__dom = viewModelDom[0];
RoutedSettingsViewModel.__dom = viewModelDom;
RoutedSettingsViewModel.__builded = true;
RoutedSettingsViewModel.__vm = settingsScreen;
const tmpl = { name: RoutedSettingsViewModel.__rlSettingsData.Template };
ko.applyBindingAccessorsToNode(
viewModelDom[0],
viewModelDom,
{
i18nInit: true,
template: () => tmpl
@ -161,8 +159,6 @@ class AbstractSettingsScreen extends AbstractScreen {
});
}
});
this.oViewModelPlace = document.getElementById('rl-settings-subscreen');
}
routes() {

8
dev/Screen/User/MailBox.js
View file

@ -1,5 +1,5 @@
import { Focused, Capa, ClientSideKeyName } from 'Common/Enums';
import { $html, leftPanelDisabled, leftPanelType, moveAction, bMobileDevice } from 'Common/Globals';
import { leftPanelDisabled, leftPanelType, moveAction, bMobileDevice } from 'Common/Globals';
import { pString, pInt } from 'Common/Utils';
import { getFolderFromCacheList, getFolderFullNameRaw, getFolderInboxName } from 'Common/Cache';
import { i18n } from 'Common/Translator';
@ -128,9 +128,9 @@ class MailBoxUserScreen extends AbstractScreen {
, 1);
}
jQuery($html).on('click', '#rl-right', () => {
moveAction(false);
});
document.addEventListener('click', event =>
event.target.closest('#rl-right') && moveAction(false)
);
}
/**