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

JavaScript inArray()/indexOf() to .includes()

Browse source
This commit is contained in:
djmaze 2020-07-20 14:33:33 +02:00
parent ec3fd5b7e4
commit db2d95d684
20 changed files with 69 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

7
dev/Model/Message.js
View file

@ -11,7 +11,6 @@ import { DATA_IMAGE_LAZY_PLACEHOLDER_PIC } from 'Common/Consts';
import {
pInt,
inArray,
isArray,
isUnd,
trim,
@ -253,7 +252,7 @@ class MessageModel extends AbstractModel {
if (json && 'Object/Message' === json['@Object']) {
priority = pInt(json.Priority);
this.priority(
-1 < inArray(priority, [MessagePriority.High, MessagePriority.Low]) ? priority : MessagePriority.Normal
[MessagePriority.High, MessagePriority.Low].includes(priority) ? priority : MessagePriority.Normal
);
this.folderFullNameRaw = json.Folder;
@ -313,7 +312,7 @@ class MessageModel extends AbstractModel {
if (json && 'Object/Message' === json['@Object']) {
priority = pInt(json.Priority);
this.priority(
-1 < inArray(priority, [MessagePriority.High, MessagePriority.Low]) ? priority : MessagePriority.Normal
[MessagePriority.High, MessagePriority.Low].includes(priority) ? priority : MessagePriority.Normal
);
this.aDraftInfo = json.DraftInfo;
@ -362,7 +361,7 @@ class MessageModel extends AbstractModel {
if (
'' !== attachment.cidWithOutTags &&
0 < this.foundedCIDs.length &&
0 <= inArray(attachment.cidWithOutTags, this.foundedCIDs)
this.foundedCIDs.includes(attachment.cidWithOutTags)
) {
attachment.isLinked = true;
}