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

Array.isArray to isArray

Browse source 
Array.isNotEmpty to isNonEmptyArray
This commit is contained in:
djmaze 2021-03-16 16:49:14 +01:00
parent 986b8f056b
commit 0b64083543
30 changed files with 82 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

3
dev/Model/AbstractCollection.js
View file

@ -1,3 +1,4 @@
import { isArray } from 'Common/Utils';
export class AbstractCollectionModel extends Array
{
@ -27,7 +28,7 @@ export class AbstractCollectionModel extends Array
// json[@Count]
json = json['@Collection'];
}
if (Array.isArray(json)) {
if (isArray(json)) {
json.forEach(item => {
item && itemCallback && (item = itemCallback(item, result));
item && result.push(item);

6
dev/Model/Contact.js
View file

@ -1,5 +1,5 @@
import { isNonEmptyArray } from 'Common/Utils';
import { ContactPropertyModel, ContactPropertyType } from 'Model/ContactProperty';
import { AbstractModel } from 'Knoin/AbstractModel';
export class ContactModel extends AbstractModel {
@ -26,7 +26,7 @@ export class ContactModel extends AbstractModel {
let name = '',
email = '';
if (Array.isNotEmpty(this.properties)) {
if (isNonEmptyArray(this.properties)) {
this.properties.forEach(property => {
if (property) {
if (ContactPropertyType.FirstName === property.type()) {
@ -52,7 +52,7 @@ export class ContactModel extends AbstractModel {
const contact = super.reviveFromJson(json);
if (contact) {
let list = [];
if (Array.isNotEmpty(json.properties)) {
if (isNonEmptyArray(json.properties)) {
json.properties.forEach(property => {
property = ContactPropertyModel.reviveFromJson(property);
property && list.push(property);

4
dev/Model/Filter.js
View file

@ -1,6 +1,6 @@
import ko from 'ko';
import { pString } from 'Common/Utils';
import { isNonEmptyArray, pString } from 'Common/Utils';
import { delegateRunOnDestroy } from 'Common/UtilsUser';
import { i18n } from 'Common/Translator';
import { getFolderFromCacheList } from 'Common/Cache';
@ -230,7 +230,7 @@ export class FilterModel extends AbstractModel {
filter.conditions([]);
if (Array.isNotEmpty(json.Conditions)) {
if (isNonEmptyArray(json.Conditions)) {
filter.conditions(
json.Conditions.map(aData => FilterConditionModel.reviveFromJson(aData)).filter(v => v)
);

4
dev/Model/FolderCollection.js
View file

@ -1,7 +1,7 @@
import { AbstractCollectionModel } from 'Model/AbstractCollection';
import { UNUSED_OPTION_VALUE } from 'Common/Consts';
import { pInt } from 'Common/Utils';
import { isArray, pInt } from 'Common/Utils';
import { ClientSideKeyName, FolderType } from 'Common/EnumsUser';
import * as Cache from 'Common/Cache';
import { Settings, SettingsGet } from 'Common/Globals';
@ -75,7 +75,7 @@ export class FolderCollectionModel extends AbstractCollectionModel
if (oCacheFolder) {
oCacheFolder.collapsed(!expandedFolders
|| !Array.isArray(expandedFolders)
|| !isArray(expandedFolders)
|| !expandedFolders.includes(oCacheFolder.fullNameHash));
if (oFolder.Extended) {

4
dev/Model/Message.js
View file

@ -4,7 +4,7 @@ import { MessagePriority } from 'Common/EnumsUser';
import { i18n } from 'Common/Translator';
import { encodeHtml } from 'Common/Html';
import { isArray } from 'Common/Utils';
import { isArray, isNonEmptyArray } from 'Common/Utils';
import { serverRequestRaw } from 'Common/Links';
@ -223,7 +223,7 @@ export class MessageModel extends AbstractModel {
*/
fromDkimData() {
let result = ['none', ''];
if (Array.isNotEmpty(this.from) && 1 === this.from.length && this.from[0] && this.from[0].dkimStatus) {
if (isNonEmptyArray(this.from) && 1 === this.from.length && this.from[0] && this.from[0].dkimStatus) {
result = [this.from[0].dkimStatus, this.from[0].dkimValue || ''];
}

4
dev/Model/OpenPgpKey.js
View file

@ -1,7 +1,7 @@
import ko from 'ko';
import { isNonEmptyArray } from 'Common/Utils';
import { AbstractModel } from 'Knoin/AbstractModel';
import { PgpUserStore } from 'Stores/User/Pgp';
export class OpenPgpKeyModel extends AbstractModel {
@ -21,7 +21,7 @@ export class OpenPgpKeyModel extends AbstractModel {
this.index = index;
this.id = ID;
this.ids = Array.isNotEmpty(IDs) ? IDs : [ID];
this.ids = isNonEmptyArray(IDs) ? IDs : [ID];
this.guid = guID;
this.user = '';
this.users = userIDs;

4
dev/Model/SieveScript.js
View file

@ -2,7 +2,7 @@ import ko from 'ko';
import { AbstractModel } from 'Knoin/AbstractModel';
import { FilterModel } from 'Model/Filter';
import { pString } from 'Common/Utils';
import { isNonEmptyArray, pString } from 'Common/Utils';
const SIEVE_FILE_NAME = 'rainloop.user';
@ -327,7 +327,7 @@ export class SieveScriptModel extends AbstractModel
if (script) {
if (script.allowFilters()) {
script.filters(
Array.isNotEmpty(json.filters)
isNonEmptyArray(json.filters)
? json.filters.map(aData => FilterModel.reviveFromJson(aData)).filter(v => v)
: sieveScriptToFilters(script.body())
);