mirror of
https://github.com/the-djmaze/snappymail.git
synced 2026-08-29 03:59:21 +03:00
Cleanup array.length checks and for() to forEach()
This commit is contained in:
djmaze
parent
db5751cd00
commit
82bed1ed80
24 changed files with 135 additions and 169 deletions
|
|
@ -209,7 +209,7 @@ export function initMessageFlagsFromCache(message) {
|
|||
const uid = message.uid,
|
||||
flags = getMessageFlagsFromCache(message.folderFullNameRaw, uid);
|
||||
|
||||
if (flags && 0 < flags.length) {
|
||||
if (flags && flags.length) {
|
||||
message.flagged(!!flags[1]);
|
||||
|
||||
if (!message.isSimpleMessage) {
|
||||
|
|
@ -221,11 +221,11 @@ export function initMessageFlagsFromCache(message) {
|
|||
}
|
||||
}
|
||||
|
||||
if (0 < message.threads().length) {
|
||||
if (message.threads().length) {
|
||||
const unseenSubUid = message.threads().find(sSubUid => {
|
||||
if (uid !== sSubUid) {
|
||||
const subFlags = getMessageFlagsFromCache(message.folderFullNameRaw, sSubUid);
|
||||
return subFlags && 0 < subFlags.length && !!subFlags[0];
|
||||
return subFlags && subFlags.length && !!subFlags[0];
|
||||
}
|
||||
return false;
|
||||
});
|
||||
|
|
@ -233,7 +233,7 @@ export function initMessageFlagsFromCache(message) {
|
|||
const flaggedSubUid = message.threads().find(sSubUid => {
|
||||
if (uid !== sSubUid) {
|
||||
const subFlags = getMessageFlagsFromCache(message.folderFullNameRaw, sSubUid);
|
||||
return subFlags && 0 < subFlags.length && !!subFlags[1];
|
||||
return subFlags && subFlags.length && !!subFlags[1];
|
||||
}
|
||||
return false;
|
||||
});
|
||||
|
|
@ -266,7 +266,7 @@ export function storeMessageFlagsToCache(message) {
|
|||
* @param {Array} flags
|
||||
*/
|
||||
export function storeMessageFlagsToCacheByFolderAndUid(folder, uid, flags) {
|
||||
if (isArray(flags) && 0 < flags.length) {
|
||||
if (isArray(flags) && flags.length) {
|
||||
setMessageFlagsToCache(folder, uid, flags);
|
||||
}
|
||||
}
|
||||
|
|
@ -280,7 +280,7 @@ export function storeMessageFlagsToCacheBySetAction(folder, uid, setAction) {
|
|||
let unread = 0;
|
||||
const flags = getMessageFlagsFromCache(folder, uid);
|
||||
|
||||
if (isArray(flags) && 0 < flags.length) {
|
||||
if (isArray(flags) && flags.length) {
|
||||
if (flags[0]) {
|
||||
unread = 1;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ class Selector {
|
|||
this.itemSelectedThrottle = _.debounce(this.itemSelected.bind(this), 300);
|
||||
|
||||
this.listChecked.subscribe((items) => {
|
||||
if (0 < items.length) {
|
||||
if (items.length) {
|
||||
if (null === this.selectedItem()) {
|
||||
if (this.selectedItem.valueHasMutated) {
|
||||
this.selectedItem.valueHasMutated();
|
||||
|
|
@ -177,7 +177,7 @@ class Selector {
|
|||
if (!isChecked && !isSelected && this.autoSelect()) {
|
||||
if (this.focusedItem()) {
|
||||
this.selectedItem(this.focusedItem());
|
||||
} else if (0 < aItems.length) {
|
||||
} else if (aItems.length) {
|
||||
if (null !== isNextFocused) {
|
||||
getNext = false;
|
||||
isNextFocused = aCache.find(sUid => {
|
||||
|
|
@ -201,7 +201,7 @@ class Selector {
|
|||
|
||||
if (
|
||||
(0 !== this.iSelectNextHelper || 0 !== this.iFocusedNextHelper) &&
|
||||
0 < aItems.length &&
|
||||
aItems.length &&
|
||||
!this.focusedItem()
|
||||
) {
|
||||
temp = null;
|
||||
|
|
|
|||
|
|
@ -101,7 +101,7 @@ export function boolToAjax(value) {
|
|||
* @returns {boolean}
|
||||
*/
|
||||
export function isNonEmptyArray(values) {
|
||||
return isArray(values) && 0 < values.length;
|
||||
return isArray(values) && values.length;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -141,17 +141,13 @@ export function encodeURI(url) {
|
|||
* @returns {Object}
|
||||
*/
|
||||
export function simpleQueryParser(queryString) {
|
||||
let index = 0,
|
||||
len = 0,
|
||||
temp = null;
|
||||
|
||||
const queries = queryString.split('&'),
|
||||
params = {};
|
||||
|
||||
for (len = queries.length; index < len; index++) {
|
||||
temp = queries[index].split('=');
|
||||
queries.forEach(temp => {
|
||||
temp = temp.split('=');
|
||||
params[decodeURIComponent(temp[0])] = decodeURIComponent(temp[1]);
|
||||
}
|
||||
});
|
||||
|
||||
return params;
|
||||
}
|
||||
|
|
@ -707,7 +703,7 @@ export function htmlToPlain(html) {
|
|||
const convertDivs = (...args) => {
|
||||
if (args && 1 < args.length) {
|
||||
let divText = trim(args[1]);
|
||||
if (0 < divText.length) {
|
||||
if (divText.length) {
|
||||
divText = divText.replace(/<div[^>]*>([\s\S\r\n]*)<\/div>/gim, convertDivs);
|
||||
divText = '\n' + trim(divText) + '\n';
|
||||
}
|
||||
|
|
@ -805,15 +801,12 @@ export function plainToHtml(plain, findEmailAndLinksInText = false) {
|
|||
bDo = true,
|
||||
bStart = true,
|
||||
aNextText = [],
|
||||
sLine = '',
|
||||
iIndex = 0,
|
||||
aText = plain.split('\n');
|
||||
|
||||
do {
|
||||
bDo = false;
|
||||
aNextText = [];
|
||||
for (iIndex = 0; iIndex < aText.length; iIndex++) {
|
||||
sLine = aText[iIndex];
|
||||
aText.forEach(sLine => {
|
||||
bStart = '>' === sLine.substr(0, 1);
|
||||
if (bStart && !bIn) {
|
||||
bDo = true;
|
||||
|
|
@ -833,7 +826,7 @@ export function plainToHtml(plain, findEmailAndLinksInText = false) {
|
|||
} else {
|
||||
aNextText.push(sLine);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
if (bIn) {
|
||||
bIn = false;
|
||||
|
|
@ -888,10 +881,7 @@ export function folderListOptionsBuilder(
|
|||
let /**
|
||||
* @type {?FolderModel}
|
||||
*/
|
||||
oItem = null,
|
||||
bSep = false,
|
||||
iIndex = 0,
|
||||
iLen = 0,
|
||||
aResult = [];
|
||||
|
||||
const sDeepPrefix = '\u00A0\u00A0\u00A0';
|
||||
|
|
@ -911,21 +901,20 @@ export function folderListOptionsBuilder(
|
|||
aHeaderLines = [];
|
||||
}
|
||||
|
||||
for (iIndex = 0, iLen = aHeaderLines.length; iIndex < iLen; iIndex++) {
|
||||
aHeaderLines.forEach(line => {
|
||||
aResult.push({
|
||||
id: aHeaderLines[iIndex][0],
|
||||
name: aHeaderLines[iIndex][1],
|
||||
id: line[0],
|
||||
name: line[1],
|
||||
system: false,
|
||||
seporator: false,
|
||||
disabled: false
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
bSep = true;
|
||||
for (iIndex = 0, iLen = aSystem.length; iIndex < iLen; iIndex++) {
|
||||
oItem = aSystem[iIndex];
|
||||
aSystem.forEach(oItem => {
|
||||
if (fVisibleCallback ? fVisibleCallback(oItem) : true) {
|
||||
if (bSep && 0 < aResult.length) {
|
||||
if (bSep && aResult.length) {
|
||||
aResult.push({
|
||||
id: '---',
|
||||
name: '---',
|
||||
|
|
@ -947,11 +936,10 @@ export function folderListOptionsBuilder(
|
|||
(fDisableCallback ? fDisableCallback(oItem) : false)
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
bSep = true;
|
||||
for (iIndex = 0, iLen = aList.length; iIndex < iLen; iIndex++) {
|
||||
oItem = aList[iIndex];
|
||||
aList.forEach(oItem => {
|
||||
// if (oItem.subScribed() || !oItem.existen || bBuildUnvisible)
|
||||
if (
|
||||
(oItem.subScribed() || !oItem.existen || bBuildUnvisible) &&
|
||||
|
|
@ -959,7 +947,7 @@ export function folderListOptionsBuilder(
|
|||
) {
|
||||
if (fVisibleCallback ? fVisibleCallback(oItem) : true) {
|
||||
if (FolderType.User === oItem.type() || !bSystem || oItem.hasSubScribedSubfolders()) {
|
||||
if (bSep && 0 < aResult.length) {
|
||||
if (bSep && aResult.length) {
|
||||
aResult.push({
|
||||
id: '---',
|
||||
name: '---',
|
||||
|
|
@ -986,7 +974,7 @@ export function folderListOptionsBuilder(
|
|||
}
|
||||
}
|
||||
|
||||
if (oItem.subScribed() && 0 < oItem.subFolders().length) {
|
||||
if (oItem.subScribed() && oItem.subFolders().length) {
|
||||
aResult = aResult.concat(
|
||||
folderListOptionsBuilder(
|
||||
[],
|
||||
|
|
@ -1002,7 +990,7 @@ export function folderListOptionsBuilder(
|
|||
)
|
||||
);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
return aResult;
|
||||
}
|
||||
|
|
@ -1304,7 +1292,7 @@ export function mimeContentType(fileName) {
|
|||
}
|
||||
|
||||
ext = getFileExtension(fileName);
|
||||
if (ext && 0 < ext.length && !isUnd(Mime[ext])) {
|
||||
if (ext && ext.length && !isUnd(Mime[ext])) {
|
||||
result = Mime[ext];
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue