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

Underscore.js _.find() to native Array.find()

Browse source
This commit is contained in:
djmaze 2020-07-22 10:43:19 +02:00
parent 2404f6466d
commit 9c0072d626
19 changed files with 55 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

4
dev/Stores/User/Folder.js
View file

@ -47,7 +47,7 @@ class FolderUserStore {
);
this.foldersListWithSingleInboxRootFolder = ko.computed(
() => !_.find(this.folderList(), (folder) => folder && !folder.isSystemFolder() && folder.visible())
() => !this.folderList().find(folder => folder && !folder.isSystemFolder() && folder.visible())
);
this.currentFolderFullNameRaw = ko.computed(() => (this.currentFolder() ? this.currentFolder().fullNameRaw : ''));
@ -193,7 +193,7 @@ class FolderUserStore {
return 0;
});
_.find(timeouts, (aItem) => {
timeouts.find(aItem => {
const folder = getFolderFromCacheList(aItem[1]);
if (folder) {
folder.interval = utc;

9
dev/Stores/User/Message.js
View file

@ -380,9 +380,9 @@ class MessageUserStore {
if (
messageList &&
0 < messageList.length &&
!!_.find(messageList, (item) => !!(item && item.deleted() && item.uid === this.messageListThreadUid()))
!!messageList.find(item => !!(item && item.deleted() && item.uid === this.messageListThreadUid()))
) {
const message = _.find(messageList, (item) => item && !item.deleted());
const message = messageList.find(item => item && !item.deleted());
if (message && this.messageListThreadUid() !== pString(message.uid)) {
this.messageListThreadUid(pString(message.uid));
@ -633,9 +633,8 @@ class MessageUserStore {
this.selectorMessageFocused(null);
}
} else if (!selectedMessage && message) {
selectedMessage = _.find(
this.messageList(),
(subMessage) =>
selectedMessage = this.messageList().find(
subMessage =>
subMessage &&
subMessage.folderFullNameRaw === message.folderFullNameRaw &&
subMessage.uid === message.uid

10
dev/Stores/User/Pgp.js
View file

@ -30,7 +30,7 @@ class PgpUserStore {
}
findKeyByHex(keys, hash) {
return _.find(keys, (item) => hash && item && (hash === item.id || item.ids.includes(hash)));
return keys.find(item => hash && item && (hash === item.id || item.ids.includes(hash)));
}
findPublicKeyByHex(hash) {
@ -108,7 +108,7 @@ class PgpUserStore {
* @returns {?}
*/
findPublicKeyByEmailNotNative(email) {
return _.find(this.openpgpkeysPublic(), (item) => item && item.emails.includes(email)) || null;
return this.openpgpkeysPublic().find(item => item && item.emails.includes(email)) || null;
}
/**
@ -116,7 +116,7 @@ class PgpUserStore {
* @returns {?}
*/
findPrivateKeyByEmailNotNative(email) {
return _.find(this.openpgpkeysPrivate(), (item) => item && item.emails.includes(email)) || null;
return this.openpgpkeysPrivate().find(item => item && item.emails.includes(email)) || null;
}
/**
@ -142,7 +142,7 @@ class PgpUserStore {
*/
findPrivateKeyByEmail(email, password) {
let privateKey = null;
const key = _.find(this.openpgpkeysPrivate(), (item) => item && item.emails.includes(email));
const key = this.openpgpkeysPrivate().find(item => item && item.emails.includes(email));
if (key) {
try {
@ -217,7 +217,7 @@ class PgpUserStore {
if (publicKeys && 0 < publicKeys.length) {
try {
const result = message.verify(publicKeys),
valid = _.find(_.isArray(result) ? result : [], (item) => item && item.valid && item.keyid);
valid = (_.isArray(result) ? result : []).find(item => item && item.valid && item.keyid);
if (valid && valid.keyid && valid.keyid && valid.keyid.toHex) {
fCallback(this.findPublicKeyByHex(valid.keyid.toHex()));