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

Revert templateId to viewModelTemplateID for issue #150

Browse source
This commit is contained in:
djmaze 2021-10-11 14:31:54 +02:00
parent 7ede8eeb4a
commit 21a9e24233
4 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
dev/Knoin/AbstractViews.js
View file

@ -8,8 +8,8 @@ import { ViewType } from 'Knoin/Knoin';
class AbstractView { class AbstractView {
constructor(templateID, type) constructor(templateID, type)
{ {
// Object.defineProperty(this, 'templateId', { value: templateID }); // Object.defineProperty(this, 'viewModelTemplateID', { value: templateID });
this.templateId = templateID; this.viewModelTemplateID = templateID;
this.viewType = type; this.viewType = type;
this.viewModelDom = null; this.viewModelDom = null;

4
dev/Knoin/Knoin.js
View file

@ -36,7 +36,7 @@ const SCREENS = {},
ViewModelClass.__vm = vm; ViewModelClass.__vm = vm;
if (vmPlace) { if (vmPlace) {
vmDom = Element.fromHTML('<div class="rl-view-model RL-' + vm.templateId + '" hidden=""></div>'); vmDom = Element.fromHTML('<div class="rl-view-model RL-' + vm.viewModelTemplateID + '" hidden=""></div>');
vmPlace.append(vmDom); vmPlace.append(vmDom);
vm.viewModelDom = vmDom; vm.viewModelDom = vmDom;
@ -92,7 +92,7 @@ const SCREENS = {},
vmDom, vmDom,
{ {
i18nInit: true, i18nInit: true,
template: () => ({ name: vm.templateId }) template: () => ({ name: vm.viewModelTemplateID })
}, },
vm vm
); );

2
plugins/login-register/LoginRegister.js
View file

@ -7,7 +7,7 @@
if (forgotUrl || registerUrl) { if (forgotUrl || registerUrl) {
addEventListener('rl-view-model', e => { addEventListener('rl-view-model', e => {
if (e.detail && 'Login' === (e.detail.templateId || e.detail.viewModelTemplateID)) { if (e.detail && 'Login' === e.detail.viewModelTemplateID) {
const container = e.detail.viewModelDom.querySelector('#plugin-Login-BottomControlGroup'), const container = e.detail.viewModelDom.querySelector('#plugin-Login-BottomControlGroup'),
forgot = 'LOGIN/LABEL_FORGOT_PASSWORD', forgot = 'LOGIN/LABEL_FORGOT_PASSWORD',
register = 'LOGIN/LABEL_REGISTRATION'; register = 'LOGIN/LABEL_REGISTRATION';

2
plugins/two-factor-auth/js/TwoFactorAuthLogin.js
View file

@ -2,7 +2,7 @@
(rl => { (rl => {
rl && addEventListener('rl-view-model', e => { rl && addEventListener('rl-view-model', e => {
if (e.detail && 'Login' === (e.detail.templateId || e.detail.viewModelTemplateID)) { if (e.detail && 'Login' === e.detail.viewModelTemplateID) {
const container = e.detail.viewModelDom.querySelector('#plugin-Login-BottomControlGroup'), const container = e.detail.viewModelDom.querySelector('#plugin-Login-BottomControlGroup'),
placeholder = 'LOGIN/LABEL_TWO_FACTOR_CODE'; placeholder = 'LOGIN/LABEL_TWO_FACTOR_CODE';
if (container) { if (container) {