Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-31 04:59:21 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Globalize message composer popup window

Browse source
This commit is contained in:
djmaze 2021-03-10 11:43:23 +01:00
parent 5601e100d9
commit e7b1ce7509
6 changed files with 51 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

18
dev/View/Popup/Contacts.js
View file

@ -2,7 +2,6 @@ import ko from 'ko';
import {
SaveSettingsStep,
Capa,
StorageResultType,
Notification,
KeyState
@ -11,7 +10,7 @@ import {
import { ComposeType } from 'Common/EnumsUser';
import { pInt } from 'Common/Utils';
import { delegateRunOnDestroy, computedPaginatorHelper } from 'Common/UtilsUser';
import { delegateRunOnDestroy, computedPaginatorHelper, showMessageComposer } from 'Common/UtilsUser';
import { Selector } from 'Common/Selector';
import { serverRequestRaw, serverRequest } from 'Common/Links';
@ -29,7 +28,6 @@ import { ContactPropertyModel, ContactPropertyType } from 'Model/ContactProperty
import { decorateKoCommands, hideScreenPopup } from 'Knoin/Knoin';
import { AbstractViewPopup } from 'Knoin/AbstractViews';
const CONTACTS_PER_PAGE = 50,
propertyIsMail = prop => prop.isType(ContactPropertyType.Email),
propertyIsName = prop => prop.isType(ContactPropertyType.FirstName) || prop.isType(ContactPropertyType.LastName);
@ -164,10 +162,6 @@ class ContactsPopupView extends AbstractViewPopup {
}
newMessageCommand() {
if (!rl.settings.capa(Capa.Composer)) {
return false;
}
let aE = [],
toEmails = null,
ccEmails = null,
@ -211,9 +205,9 @@ class ContactsPopupView extends AbstractViewPopup {
this.sLastComposeFocusedField = '';
setTimeout(() => {
rl.app.showComposePopupView([ComposeType.Empty, null, toEmails, ccEmails, bccEmails]);
}, 200);
setTimeout(() =>
showMessageComposer([ComposeType.Empty, null, toEmails, ccEmails, bccEmails])
, 200);
}
return true;
@ -547,9 +541,7 @@ class ContactsPopupView extends AbstractViewPopup {
if (this.bBackToCompose) {
this.bBackToCompose = false;
if (rl.settings.capa(Capa.Composer)) {
rl.app.showComposePopupView();
}
showMessageComposer();
}
}
}