Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-02 14:07:04 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Get rid of i18nInit and improve i18nUpdate

Browse source
This commit is contained in:
the-djmaze 2022-04-05 10:31:55 +02:00
parent 5b3dfc26de
commit 48974d1b5a
6 changed files with 38 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

4
dev/External/ko.js vendored
View file

@ -80,10 +80,6 @@ Object.assign(ko.bindingHandlers, {
}
},
i18nInit: {
init: element => i18nToNodes(element)
},
i18nUpdate: {
update: (element, fValueAccessor) => {
ko.unwrap(fValueAccessor());

4
dev/Knoin/Knoin.js
View file

@ -2,6 +2,7 @@ import ko from 'ko';
import { koComputable } from 'External/ko';
import { doc, $htmlCL, elementById, fireEvent } from 'Common/Globals';
import { forEachObjectValue, forEachObjectEntry } from 'Common/Utils';
import { i18nToNodes } from 'Common/Translator';
let
SCREENS = {},
@ -86,6 +87,7 @@ const
vm.modalVisible.subscribe(value => {
if (value) {
i18nToNodes(vmDom);
visiblePopups.add(vm);
vmDom.style.zIndex = 3000 + (visiblePopups.size * 2);
vmDom.showModal();
@ -111,7 +113,6 @@ const
ko.applyBindingAccessorsToNode(
vmDom,
{
i18nInit: true,
template: () => ({ name: id })
},
vm
@ -215,6 +216,7 @@ const
forEachViewModel(vmScreen, (vm, dom) => {
vm.beforeShow && vm.beforeShow();
i18nToNodes(dom);
dom.hidden = false;
vm.onShow && vm.onShow();
autofocus(dom);

55
dev/Screen/AbstractSettings.js
View file

@ -5,6 +5,7 @@ import { settings } from 'Common/Links';
import { createElement, elementById } from 'Common/Globals';
import { AbstractScreen } from 'Knoin/AbstractScreen';
import { i18nToNodes } from 'Common/Translator';
const VIEW_MODELS = [];
@ -28,36 +29,33 @@ export class AbstractSettingsScreen extends AbstractScreen {
);
if (RoutedSettingsViewModel) {
const vmPlace = elementById('rl-settings-subscreen');
if (RoutedSettingsViewModel.__vm) {
settingsScreen = RoutedSettingsViewModel.__vm;
} else if (vmPlace) {
viewModelDom = createElement('div',{
id: 'V-Settings-' + RoutedSettingsViewModel.name.replace(/(User|Admin)Settings/,''),
hidden: ''
})
vmPlace.append(viewModelDom);
settingsScreen = new RoutedSettingsViewModel();
settingsScreen.viewModelDom = viewModelDom;
RoutedSettingsViewModel.__dom = viewModelDom;
RoutedSettingsViewModel.__vm = settingsScreen;
ko.applyBindingAccessorsToNode(
viewModelDom,
{
template: () => ({ name: RoutedSettingsViewModel.__rlSettingsData.template })
},
settingsScreen
);
settingsScreen.onBuild && settingsScreen.onBuild(viewModelDom);
} else {
const vmPlace = elementById('rl-settings-subscreen');
if (vmPlace) {
viewModelDom = createElement('div',{
id: 'V-Settings-' + RoutedSettingsViewModel.name.replace(/(User|Admin)Settings/,''),
hidden: ''
})
vmPlace.append(viewModelDom);
settingsScreen = new RoutedSettingsViewModel();
settingsScreen.viewModelDom = viewModelDom;
RoutedSettingsViewModel.__dom = viewModelDom;
RoutedSettingsViewModel.__vm = settingsScreen;
ko.applyBindingAccessorsToNode(
viewModelDom,
{
i18nInit: true,
template: () => ({ name: RoutedSettingsViewModel.__rlSettingsData.template })
},
settingsScreen
);
settingsScreen.onBuild && settingsScreen.onBuild(viewModelDom);
} else {
console.log('Cannot find sub settings view model position: SettingsSubScreen');
}
console.log('Cannot find sub settings view model position: SettingsSubScreen');
}
if (settingsScreen) {
@ -70,6 +68,7 @@ export class AbstractSettingsScreen extends AbstractScreen {
// show
settingsScreen.beforeShow && settingsScreen.beforeShow();
i18nToNodes(settingsScreen.viewModelDom);
settingsScreen.viewModelDom.hidden = false;
settingsScreen.onShow && settingsScreen.onShow();
@ -79,7 +78,7 @@ export class AbstractSettingsScreen extends AbstractScreen {
);
});
(elementById('rl-settings-subscreen') || {}).scrollTop = 0;
(vmPlace || {}).scrollTop = 0;
// --
}, 1);
}