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

Underscore.js _.map() to native Array.map() (optional with Object.entries/values)

Browse source
This commit is contained in:
djmaze 2020-07-22 20:09:31 +02:00
parent 032fa8c736
commit a82575a830
27 changed files with 68 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

6
dev/App/Admin.js
View file

@ -40,7 +40,7 @@ class AdminApp extends AbstractApp {
DomainStore.domains.loading(false);
if (StorageResultType.Success === result && data && data.Result) {
DomainStore.domains(
_.map(data.Result, ([enabled, alias], name) => ({
Object.entries(data.Result).map(([enabled, alias], name) => ({
name: name,
disabled: ko.observable(!enabled),
alias: alias,
@ -57,7 +57,7 @@ class AdminApp extends AbstractApp {
PluginStore.plugins.loading(false);
if (StorageResultType.Success === result && data && data.Result) {
PluginStore.plugins(
_.map(data.Result, (item) => ({
data.Result.map(item => ({
name: item.Name,
disabled: ko.observable(!item.Enabled),
configured: ko.observable(!!item.Configured)
@ -87,7 +87,7 @@ class AdminApp extends AbstractApp {
if (isArray(data.Result.List)) {
list = _.compact(
_.map(data.Result.List, (item) => {
data.Result.List.map(item => {
if (item) {
item.loading = ko.observable(!isUnd(loading[item.file]));
return 'core' === item.type && !item.canBeInstalled ? null : item;

15
dev/App/User.js
View file

@ -520,7 +520,7 @@ class AppUser extends AbstractApp {
.getKeyId()
.toHex()
.toLowerCase(),
_.uniq(_.compact(_.map(oItem.getKeyIds(), (item) => (item && item.toHex ? item.toHex() : null)))),
_.uniq(_.compact(oItem.getKeyIds().map(item => (item && item.toHex ? item.toHex() : null)))),
aUsers,
aEmails,
oItem.isPrivate(),
@ -590,9 +590,8 @@ class AppUser extends AbstractApp {
delegateRunOnDestroy(AccountStore.accounts());
AccountStore.accounts(
_.map(
oData.Result.Accounts,
(sValue) => new AccountModel(sValue, sValue !== parentEmail, counts[sValue] || 0)
oData.Result.Accounts.map(
sValue => new AccountModel(sValue, sValue !== parentEmail, counts[sValue] || 0)
)
);
}
@ -606,7 +605,7 @@ class AppUser extends AbstractApp {
delegateRunOnDestroy(IdentityStore.identities());
IdentityStore.identities(
_.map(oData.Result.Identities, (identityData) => {
oData.Result.Identities.map(identityData => {
const id = pString(identityData.Id),
email = pString(identityData.Email),
identity = new IdentityModel(id, email);
@ -636,7 +635,7 @@ class AppUser extends AbstractApp {
TemplateStore.templates(
_.compact(
_.map(data.Result.Templates, (templateData) => {
data.Result.Templates.map(templateData => {
const template = new TemplateModel();
return template.parse(templateData) ? template : null;
})
@ -820,7 +819,7 @@ class AppUser extends AbstractApp {
messages = MessageStore.messageListChecked();
}
rootUids = _.uniq(_.compact(_.map(messages, (oMessage) => (oMessage && oMessage.uid ? oMessage.uid : null))));
rootUids = _.uniq(_.compact(messages.map(oMessage => (oMessage && oMessage.uid ? oMessage.uid : null))));
if ('' !== sFolderFullNameRaw && 0 < rootUids.length) {
switch (iSetAction) {
@ -881,7 +880,7 @@ class AppUser extends AbstractApp {
Remote.suggestions((result, data) => {
if (StorageResultType.Success === result && data && isArray(data.Result)) {
autocompleteCallback(
_.compact(_.map(data.Result, (item) => (item && item[0] ? new EmailModel(item[0], item[1]) : null)))
_.compact(data.Result.map(item => (item && item[0] ? new EmailModel(item[0], item[1]) : null)))
);
} else if (StorageResultType.Abort !== result) {
autocompleteCallback([]);