Reduce JavaScript footprint

dev/Common/Cache.js

@@ -120,9 +120,7 @@ export class MessageFlagsCache
 				flags = this.getFor(message.folder, uid),
 				thread = message.threads();
 
-			if (isArray(flags)) {
-				message.flags(flags);
-			}
+			isArray(flags) && message.flags(flags);
 
 			if (thread.length) {
 				message.hasUnseenSubMessage(!!thread.find(iSubUid =>

dev/Common/Folders.js

@@ -37,17 +37,10 @@ fetchFolderInformation = (fCallback, folder, list = []) => {
 
 	if (!fetch) {
 		list.forEach(messageListItem => {
-			if (!MessageFlagsCache.getFor(folder, messageListItem.uid)) {
-				uids.push(messageListItem.uid);
-			}
-
-			if (messageListItem.threads.length) {
-				messageListItem.threads.forEach(uid => {
-					if (!MessageFlagsCache.getFor(folder, uid)) {
-						uids.push(uid);
-					}
-				});
-			}
+			MessageFlagsCache.getFor(folder, messageListItem.uid) || uids.push(messageListItem.uid);
+			messageListItem.threads.forEach(uid => {
+				MessageFlagsCache.getFor(folder, uid) || uids.push(uid);
+			});
 		});
 		fetch = uids.length;
 	}
@@ -100,10 +93,7 @@ folderListOptionsBuilder = (
 							fDisableCallback(oItem))
 					});
 				}
-
-				if (oItem.subFolders.length) {
-					foldersWalk(oItem.subFolders());
-				}
+				foldersWalk(oItem.subFolders());
 			});
 		};
 
@@ -151,9 +141,7 @@ folderInformation = (folder, list) => {
 						folderFromCache.totalEmails(result.totalEmails);
 						folderFromCache.unreadEmails(result.unreadEmails);
 
-						if (unreadCountChange) {
-							MessageFlagsCache.clearFolder(folderFromCache.fullName);
-						}
+						unreadCountChange && MessageFlagsCache.clearFolder(folderFromCache.fullName);
 
 						if (result.MessagesFlags.length) {
 							result.MessagesFlags.forEach(message =>
@@ -203,9 +191,7 @@ folderInformationMultiply = (boot = false) => {
 						folder.totalEmails(item.totalEmails);
 						folder.unreadEmails(item.unreadEmails);
 
-						if (unreadCountChange) {
-							MessageFlagsCache.clearFolder(folder.fullName);
-						}
+						unreadCountChange && MessageFlagsCache.clearFolder(folder.fullName);
 
 						if (!oldHash || item.Hash !== oldHash) {
 							if (folder.fullName === FolderUserStore.currentFolderFullName()) {
@@ -219,9 +205,7 @@ folderInformationMultiply = (boot = false) => {
 					}
 				});
 
-				if (boot) {
-					setTimeout(() => folderInformationMultiply(true), 2000);
-				}
+				boot && setTimeout(() => folderInformationMultiply(true), 2000);
 			}
 		}, {
 			Folders: folders
@@ -283,15 +267,13 @@ moveMessagesToFolder = (sFromFolderFullName, oUids, sToFolderFullName, bCopy) =>
 			oToFolder = getFolderFromCacheList(sToFolderFullName);
 
 		if (oFromFolder && oToFolder) {
-			if (bCopy) {
-				Remote.request('MessageCopy', null, {
-					FromFolder: oFromFolder.fullName,
-					ToFolder: oToFolder.fullName,
-					Uids: [...oUids].join(',')
-				});
-			} else {
-				messagesMoveHelper(oFromFolder.fullName, oToFolder.fullName, oUids);
-			}
+			bCopy
+				? Remote.request('MessageCopy', null, {
+						FromFolder: oFromFolder.fullName,
+						ToFolder: oToFolder.fullName,
+						Uids: [...oUids].join(',')
+					})
+				: messagesMoveHelper(oFromFolder.fullName, oToFolder.fullName, oUids);
 
 			MessagelistUserStore.removeMessagesFromList(oFromFolder.fullName, oUids, oToFolder.fullName, bCopy);
 			return true;

dev/Common/Links.js

@@ -1,4 +1,4 @@
-import { pString, pInt } from 'Common/Utils';
+import { pInt } from 'Common/Utils';
 import { Settings } from 'Common/Globals';
 
 const
@@ -125,10 +125,7 @@ export const
 			result.push('p' + page);
 		}
 
-		search = pString(search);
-		if (search) {
-			result.push(encodeURI(search));
-		}
+		search && result.push(encodeURI(search));
 
 		return result.join('/');
 	};

dev/Common/Plugins.js

@@ -39,9 +39,9 @@ rl.addSettingsViewModelForAdmin = (SettingsViewModelClass, template, labelName,
  * @param {boolean} admin
  */
 export function runSettingsViewModelHooks(admin) {
-	(admin ? ADMIN_VIEW_MODELS_HOOKS : USER_VIEW_MODELS_HOOKS).forEach(view => {
-		settingsAddViewModel(view[0], view[1], view[2], view[3]);
-	});
+	(admin ? ADMIN_VIEW_MODELS_HOOKS : USER_VIEW_MODELS_HOOKS).forEach(view =>
+		settingsAddViewModel(...view)
+	);
 }
 
 /**

dev/Common/Selector.js

@@ -51,15 +51,20 @@ export class Selector {
 		this.sLastUid = '';
 		this.oCallbacks = {};
 
-		const itemSelectedThrottle = (item => this.itemSelected(item)).debounce(300);
+		const
+			itemSelected = item => {
+				if (koList.hasChecked()) {
+					item || this.oCallbacks.ItemSelect?.(null);
+				} else if (item) {
+					this.oCallbacks.ItemSelect?.(item);
+				}
+			},
+
+			itemSelectedThrottle = (item => itemSelected(item)).debounce(300);
 
 		this.listChecked.subscribe(items => {
 			if (items.length) {
-				if (koSelectedItem()) {
-					koSelectedItem(null);
-				} else {
-					koSelectedItem.valueHasMutated?.();
-				}
+				koSelectedItem() ? koSelectedItem(null) : koSelectedItem.valueHasMutated?.();
 			} else if (this.autoSelect()) {
 				koSelectedItem(koFocusedItem());
 			}
@@ -70,11 +75,9 @@ export class Selector {
 		koSelectedItem.subscribe(item => {
 			if (item) {
 				koList.forEach(subItem => subItem.checked(false));
-				if (selectedItemUseCallback) {
-					itemSelectedThrottle(item);
-				}
-			} else if (selectedItemUseCallback) {
-				this.itemSelected();
+				selectedItemUseCallback && itemSelectedThrottle(item);
+			} else {
+				selectedItemUseCallback && itemSelected();
 			}
 		});
 
@@ -187,14 +190,6 @@ export class Selector {
 		});
 	}
 
-	itemSelected(item) {
-		if (this.list.hasChecked()) {
-			item || this.oCallbacks.ItemSelect?.(null);
-		} else if (item) {
-			this.oCallbacks.ItemSelect?.(item);
-		}
-	}
-
 	unselect() {
 		this.selectedItem(null);
 		this.focusedItem(null);
@@ -376,21 +371,17 @@ export class Selector {
 	 * @param {Object} item
 	 * @param {Object=} event
 	 */
-	actionClick(item, event = null) {
+	actionClick(item, event) {
 		if (item) {
-			let click = true;
-			if (event) {
-				if (event.shiftKey && !event.ctrlKey && !event.metaKey && !event.altKey) {
-					click = false;
-					this.sLastUid || (this.sLastUid = this.getItemUid(item));
-
-					item.checked(!item.checked());
-
+			let select = true;
+			if (event && !event.altKey) {
+				if (event.shiftKey && !event.ctrlKey && !event.metaKey) {
+					select = false;
 					const uid = this.getItemUid(item);
 					if (uid && this.sLastUid && uid !== this.sLastUid) {
 						let changeRange = false,
 							isInRange = false,
-							checked = item.checked(),
+							checked = !item.checked(),
 							lineUid = '';
 						this.list().forEach(listItem => {
 							lineUid = this.getItemUid(listItem);
@@ -406,19 +397,17 @@ export class Selector {
 					this.sLastUid = uid;
 
 					this.focusedItem(item);
-				} else if (!event.shiftKey && (event.ctrlKey || event.metaKey) && !event.altKey) {
-					click = false;
+				} else if (!event.shiftKey && (event.ctrlKey || event.metaKey)) {
+					select = false;
 					this.focusedItem(item);
-
-					if (this.selectedItem() && item !== this.selectedItem()) {
-						this.selectedItem().checked(true);
+					const selected = this.selectedItem();
+					if (selected && item !== selected) {
+						selected.checked(true);
 					}
-
-					item.checked(!item.checked());
 				}
 			}
 
-			click && this.selectMessageItem(item);
+			select ? this.selectMessageItem(item) : item.checked(!item.checked());
 		}
 	}
 

dev/Common/Translator.js

@@ -3,32 +3,11 @@ import { Notification, UploadErrorCode } from 'Common/Enums';
 import { langLink } from 'Common/Links';
 import { doc, createElement } from 'Common/Globals';
 import { getKeyByValue, forEachObjectEntry } from 'Common/Utils';
+import { pInt } from 'Common/Utils';
 
 let I18N_DATA = {};
 
 const
-	i18nToNode = element => {
-		const key = element.dataset.i18n;
-		if (key) {
-			if ('[' === key.slice(0, 1)) {
-				switch (key.slice(0, 6)) {
-					case '[html]':
-						element.innerHTML = i18n(key.slice(6));
-						break;
-					case '[place':
-						element.placeholder = i18n(key.slice(13));
-						break;
-					case '[title':
-						element.title = i18n(key.slice(7));
-						break;
-					// no default
-				}
-			} else {
-				element.textContent = i18n(key);
-			}
-		}
-	},
-
 	init = () => {
 		if (rl.I18N) {
 			I18N_DATA = rl.I18N;
@@ -46,7 +25,7 @@ const
 	};
 
 export const
-	trigger = ko.observable(false),
+	translateTrigger = ko.observable(false),
 
 	/**
 	 * @param {string} key
@@ -56,17 +35,13 @@ export const
 	 */
 	i18n = (key, valueList, defaulValue) => {
 		let result = defaulValue || key;
-		if (key) {
-			let path = key.split('/');
-			if (I18N_DATA[path[0]] && path[1]) {
-				result = I18N_DATA[path[0]][path[1]] || result;
-			}
-		}
-		if (valueList) {
-			forEachObjectEntry(valueList, (key, value) => {
-				result = result.replace('%' + key + '%', value);
-			});
+		let path = key.split('/');
+		if (I18N_DATA[path[0]] && path[1]) {
+			result = I18N_DATA[path[0]][path[1]] || result;
 		}
+		valueList && forEachObjectEntry(valueList, (key, value) => {
+			result = result.replace('%' + key + '%', value);
+		});
 		return result;
 	},
 
@@ -76,7 +51,25 @@ export const
 	 */
 	i18nToNodes = element =>
 		setTimeout(() =>
-			element.querySelectorAll('[data-i18n]').forEach(item => i18nToNode(item))
+			element.querySelectorAll('[data-i18n]').forEach(element => {
+				const key = element.dataset.i18n;
+				if ('[' === key[0]) {
+					switch (key.slice(1, 6)) {
+						case 'html]':
+							element.innerHTML = i18n(key.slice(6));
+							break;
+						case 'place':
+							element.placeholder = i18n(key.slice(13));
+							break;
+						case 'title':
+							element.title = i18n(key.slice(7));
+							break;
+						// no default
+					}
+				} else {
+					element.textContent = i18n(key);
+				}
+			})
 		, 1),
 
 	timestampToString = (timeStampInUTC, formatStr) => {
@@ -141,10 +134,10 @@ export const
 	 * @param {Function} startCallback
 	 * @param {Function=} langCallback = null
 	 */
-	initOnStartOrLangChange = (startCallback, langCallback = null) => {
+	initOnStartOrLangChange = (startCallback, langCallback) => {
 		startCallback?.();
-		startCallback && trigger.subscribe(startCallback);
-		langCallback && trigger.subscribe(langCallback);
+		startCallback && translateTrigger.subscribe(startCallback);
+		langCallback && translateTrigger.subscribe(langCallback);
 	},
 
 	/**
@@ -154,13 +147,13 @@ export const
 	 * @returns {string}
 	 */
 	getNotification = (code, message = '', defCode = 0) => {
-		code = parseInt(code, 10) || 0;
+		code = pInt(code);
 		if (Notification.ClientViewError === code && message) {
 			return message;
 		}
 
 		return getNotificationMessage(code)
-			|| getNotificationMessage(parseInt(defCode, 10))
+			|| getNotificationMessage(pInt(defCode))
 			|| '';
 	},
 
@@ -185,7 +178,7 @@ export const
 				if (init()) {
 					i18nToNodes(doc);
 					admin || reloadTime();
-					trigger(!trigger());
+					translateTrigger(!translateTrigger());
 				}
 				script.remove();
 				resolve();

dev/Common/UtilsUser.js

@@ -57,11 +57,7 @@ computedPaginatorHelper = (koCurrentPage, koPageCount) => {
 					value: index.toString()
 				};
 
-				if (push) {
-					result.push(data);
-				} else {
-					result.unshift(data);
-				}
+				push ? result.push(data) : result.unshift(data);
 			};
 
 		let prev = 0,