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

isNonEmptyArray => arrayLength

Browse source
This commit is contained in:
djmaze 2021-07-21 21:34:17 +02:00
parent 1e49c1a6ac
commit 5590fd4860
20 changed files with 68 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

33
dev/View/Popup/Compose.js
View file

@ -12,7 +12,7 @@ import {
SetSystemFoldersNotification
} from 'Common/EnumsUser';
import { inFocus, pInt, isArray, isNonEmptyArray } from 'Common/Utils';
import { inFocus, pInt, isArray, arrayLength } from 'Common/Utils';
import { delegateRunOnDestroy } from 'Common/UtilsUser';
import { encodeHtml, HtmlEditor } from 'Common/Html';
@ -308,7 +308,7 @@ class ComposePopupView extends AbstractViewPopup {
},
attachmentsInProcess: value => {
if (this.attachmentsInProcessError() && isNonEmptyArray(value)) {
if (this.attachmentsInProcessError() && arrayLength(value)) {
this.attachmentsInProcessError(false);
}
}
@ -385,8 +385,7 @@ class ComposePopupView extends AbstractViewPopup {
if (!this.emptyToError() && !this.attachmentsInErrorError() && !this.attachmentsInProcessError()) {
if (SettingsUserStore.replySameFolder()) {
if (
isArray(this.aDraftInfo) &&
3 === this.aDraftInfo.length &&
3 === arrayLength(this.aDraftInfo) &&
null != this.aDraftInfo[2] &&
this.aDraftInfo[2].length
) {
@ -400,7 +399,7 @@ class ComposePopupView extends AbstractViewPopup {
this.sendError(false);
this.sending(true);
if (isArray(this.aDraftInfo) && 3 === this.aDraftInfo.length) {
if (3 === arrayLength(this.aDraftInfo)) {
const flagsCache = MessageFlagsCache.getFor(this.aDraftInfo[2], this.aDraftInfo[1]);
if (flagsCache) {
if ('forward' === this.aDraftInfo[0]) {
@ -753,7 +752,7 @@ class ComposePopupView extends AbstractViewPopup {
* @param {Array} emails
*/
addEmailsTo(fKoValue, emails) {
if (isNonEmptyArray(emails)) {
if (arrayLength(emails)) {
const value = fKoValue().trim(),
values = emails.map(item => item ? item.toLine(false) : null)
.validUnique();
@ -806,11 +805,11 @@ class ComposePopupView extends AbstractViewPopup {
oMessageOrArray = oMessageOrArray || null;
if (oMessageOrArray) {
message =
isArray(oMessageOrArray) && 1 === oMessageOrArray.length
1 === arrayLength(oMessageOrArray)
? oMessageOrArray[0]
: !isArray(oMessageOrArray)
? oMessageOrArray
: null;
: isArray(oMessageOrArray)
? null
: oMessageOrArray;
}
this.oLastMessage = message;
@ -826,15 +825,15 @@ class ComposePopupView extends AbstractViewPopup {
excludeEmail[identity.email()] = true;
}
if (isNonEmptyArray(aToEmails)) {
if (arrayLength(aToEmails)) {
this.to(this.emailArrayToStringLineHelper(aToEmails));
}
if (isNonEmptyArray(aCcEmails)) {
if (arrayLength(aCcEmails)) {
this.cc(this.emailArrayToStringLineHelper(aCcEmails));
}
if (isNonEmptyArray(aBccEmails)) {
if (arrayLength(aBccEmails)) {
this.bcc(this.emailArrayToStringLineHelper(aBccEmails));
}
@ -899,7 +898,7 @@ class ComposePopupView extends AbstractViewPopup {
this.subject(sSubject);
this.prepareMessageAttachments(message, lineComposeType);
this.aDraftInfo = isNonEmptyArray(aDraftInfo) && 3 === aDraftInfo.length ? aDraftInfo : null;
this.aDraftInfo = 3 === arrayLength(aDraftInfo) ? aDraftInfo : null;
this.sInReplyTo = message.sInReplyTo;
this.sReferences = message.sReferences;
break;
@ -913,7 +912,7 @@ class ComposePopupView extends AbstractViewPopup {
this.subject(sSubject);
this.prepareMessageAttachments(message, lineComposeType);
this.aDraftInfo = isNonEmptyArray(aDraftInfo) && 3 === aDraftInfo.length ? aDraftInfo : null;
this.aDraftInfo = 3 === arrayLength(aDraftInfo) ? aDraftInfo : null;
this.sInReplyTo = message.sInReplyTo;
this.sReferences = message.sReferences;
break;
@ -1003,7 +1002,7 @@ class ComposePopupView extends AbstractViewPopup {
this.setFocusInPopup();
});
} else if (isNonEmptyArray(oMessageOrArray)) {
} else if (arrayLength(oMessageOrArray)) {
oMessageOrArray.forEach(item => this.addMessageAsAttachment(item));
this.editor(editor => {
@ -1024,7 +1023,7 @@ class ComposePopupView extends AbstractViewPopup {
}
const downloads = this.getAttachmentsDownloadsForUpload();
if (isNonEmptyArray(downloads)) {
if (arrayLength(downloads)) {
Remote.messageUploadAttachments((iError, oData) => {
if (!iError) {
Object.entries(oData.Result).forEach(([tempName, id]) => {

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

@ -7,7 +7,7 @@ import {
import { ComposeType } from 'Common/EnumsUser';
import { isNonEmptyArray, pInt } from 'Common/Utils';
import { arrayLength, pInt } from 'Common/Utils';
import { delegateRunOnDestroy, computedPaginatorHelper, showMessageComposer } from 'Common/UtilsUser';
import { Selector } from 'Common/Selector';
@ -163,7 +163,7 @@ class ContactsPopupView extends AbstractViewPopup {
bccEmails = null;
const aC = this.contactsCheckedOrSelected();
if (isNonEmptyArray(aC)) {
if (arrayLength(aC)) {
aE = aC.map(oItem => {
if (oItem) {
const data = oItem.getNameAndEmailHelper(),
@ -180,7 +180,7 @@ class ContactsPopupView extends AbstractViewPopup {
aE = aE.filter(value => !!value);
}
if (isNonEmptyArray(aE)) {
if (arrayLength(aE)) {
this.bBackToCompose = false;
hideScreenPopup(ContactsPopupView);
@ -447,7 +447,7 @@ class ContactsPopupView extends AbstractViewPopup {
let count = 0,
list = [];
if (!iError && isNonEmptyArray(data.Result.List)) {
if (!iError && arrayLength(data.Result.List)) {
data.Result.List.forEach(item => {
item = ContactModel.reviveFromJson(item);
item && list.push(item);

4
dev/View/Popup/Plugin.js
View file

@ -2,7 +2,7 @@ import ko from 'ko';
import { Scope } from 'Common/Enums';
import { getNotification, i18n } from 'Common/Translator';
import { isNonEmptyArray } from 'Common/Utils';
import { arrayLength } from 'Common/Utils';
import Remote from 'Remote/Admin/Fetch';
@ -65,7 +65,7 @@ class PluginPopupView extends AbstractViewPopup {
this.readme(oPlugin.Readme);
const config = oPlugin.Config;
if (isNonEmptyArray(config)) {
if (arrayLength(config)) {
this.configures(
config.map(item => ({
value: ko.observable(item[0]),

10
dev/View/User/MailBox/MessageView.js
View file

@ -16,7 +16,7 @@ import {
import { doc, $htmlCL, leftPanelDisabled, keyScopeReal, moveAction, Settings } from 'Common/Globals';
import { isNonEmptyArray, inFocus } from 'Common/Utils';
import { arrayLength, inFocus } from 'Common/Utils';
import { mailToHelper, showMessageComposer } from 'Common/UtilsUser';
import { SMAudio } from 'Common/Audio';
@ -78,7 +78,7 @@ class MessageViewMailBoxUserView extends AbstractViewRight {
this.allowMessageListActions = Settings.capa(Capa.MessageListActions);
const attachmentsActions = Settings.app('attachmentsActions');
this.attachmentsActions = ko.observableArray(isNonEmptyArray(attachmentsActions) ? attachmentsActions : []);
this.attachmentsActions = ko.observableArray(arrayLength(attachmentsActions) ? attachmentsActions : []);
this.message = MessageUserStore.message;
this.hasCheckedMessages = MessageUserStore.hasCheckedMessages;
@ -176,10 +176,8 @@ class MessageViewMailBoxUserView extends AbstractViewRight {
viewFromDkimStatusTitle:() => {
const status = this.viewFromDkimData();
if (isNonEmptyArray(status)) {
if (status[0]) {
return status[1] || 'DKIM: ' + status[0];
}
if (arrayLength(status) && status[0]) {
return status[1] || 'DKIM: ' + status[0];
}
return '';