Reduce JavaScript footprint

dev/App/Abstract.js

@@ -28,8 +28,8 @@ export class AbstractApp {
 	}
 
 	bootstart() {
-		const register = (key, ClassObject) => ko.components.register(key, {
+		const register = (name, ClassObject) => ko.components.register(name, {
-				template: { element: key + 'Component' },
+				template: { element: ClassObject.name },
 				viewModel: {
 					createViewModel: (params, componentInfo) => {
 						params = params || {};

dev/App/Admin.js

@@ -27,7 +27,7 @@ export class AdminApp extends AbstractApp {
 			rl.route.root();
 			setTimeout(() => location.href = '/', 1);
 		} else if (SettingsGet('Auth')) {
-			this.weakPassword(!!SettingsGet('WeakPassword'));
+			this.weakPassword(SettingsGet('WeakPassword'));
 			startScreens([SettingsAdminScreen]);
 		} else {
 			startScreens([LoginAdminScreen]);

dev/App/User.js

@@ -77,12 +77,11 @@ export class AppUser extends AbstractApp {
 		let lastTime = Date.now();
 		setInterval(() => {
 			const currentTime = Date.now();
-			if (currentTime > (lastTime + interval + 1000)) {
+			(currentTime > (lastTime + interval + 1000))
-				Remote.request('Version',
+			&& Remote.request('Version',
 					iError => (100 < iError) && location.reload(),
 					{ Version: Settings.app('version') }
 				);
-			}
 			lastTime = currentTime;
 		}, interval);
 
@@ -254,9 +253,7 @@ export class AppUser extends AbstractApp {
 							const cF = FolderUserStore.currentFolderFullName(),
 								iF = getFolderInboxName();
 							folderInformation(iF);
-							if (iF !== cF) {
+							iF === cF || folderInformation(cF);
-								folderInformation(cF);
-							}
 							folderInformationMultiply();
 						}, refreshFoldersInterval);
 
@@ -266,9 +263,7 @@ export class AppUser extends AbstractApp {
 
 						setTimeout(() => {
 							const cF = FolderUserStore.currentFolderFullName();
-							if (getFolderInboxName() !== cF) {
+							getFolderInboxName() === cF || folderInformation(cF);
-								folderInformation(cF);
-							}
 							FolderUserStore.hasCapability('LIST-STATUS') || folderInformationMultiply(true);
 						}, 1000);
 
@@ -296,15 +291,14 @@ export class AppUser extends AbstractApp {
 						PgpUserStore.init();
 
 						// When auto-login is active
-						if (navigator.registerProtocolHandler) {
+						try {
-							try {
+							navigator.registerProtocolHandler?.(
-								navigator.registerProtocolHandler(
+								'mailto',
-									'mailto',
+								location.protocol + '//' + location.host + location.pathname + '?mailto&to=%s',
-									location.protocol + '//' + location.host + location.pathname + '?mailto&to=%s',
+								(SettingsGet('Title') || 'SnappyMail')
-									(SettingsGet('Title') || 'SnappyMail')
+							);
-								);
+						} catch (e) {} // eslint-disable-line no-empty
-							} catch (e) {} // eslint-disable-line no-empty
+
-						}
 						setTimeout(() => mailToHelper(SettingsGet('MailToEmail')), 500);
 					} else {
 						this.logout();

dev/Common/Cache.js

@@ -120,9 +120,7 @@ export class MessageFlagsCache
 				flags = this.getFor(message.folder, uid),
 				thread = message.threads();
 
-			if (isArray(flags)) {
+			isArray(flags) && message.flags(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)) {
+			MessageFlagsCache.getFor(folder, messageListItem.uid) || uids.push(messageListItem.uid);
-				uids.push(messageListItem.uid);
+			messageListItem.threads.forEach(uid => {
-			}
+				MessageFlagsCache.getFor(folder, uid) || uids.push(uid);
-
+			});
-			if (messageListItem.threads.length) {
-				messageListItem.threads.forEach(uid => {
-					if (!MessageFlagsCache.getFor(folder, uid)) {
-						uids.push(uid);
-					}
-				});
-			}
 		});
 		fetch = uids.length;
 	}
@@ -100,10 +93,7 @@ folderListOptionsBuilder = (
 							fDisableCallback(oItem))
 					});
 				}
-
+				foldersWalk(oItem.subFolders());
-				if (oItem.subFolders.length) {
-					foldersWalk(oItem.subFolders());
-				}
 			});
 		};
 
@@ -151,9 +141,7 @@ folderInformation = (folder, list) => {
 						folderFromCache.totalEmails(result.totalEmails);
 						folderFromCache.unreadEmails(result.unreadEmails);
 
-						if (unreadCountChange) {
+						unreadCountChange && MessageFlagsCache.clearFolder(folderFromCache.fullName);
-							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) {
+						unreadCountChange && MessageFlagsCache.clearFolder(folder.fullName);
-							MessageFlagsCache.clearFolder(folder.fullName);
-						}
 
 						if (!oldHash || item.Hash !== oldHash) {
 							if (folder.fullName === FolderUserStore.currentFolderFullName()) {
@@ -219,9 +205,7 @@ folderInformationMultiply = (boot = false) => {
 					}
 				});
 
-				if (boot) {
+				boot && setTimeout(() => folderInformationMultiply(true), 2000);
-					setTimeout(() => folderInformationMultiply(true), 2000);
-				}
 			}
 		}, {
 			Folders: folders
@@ -283,15 +267,13 @@ moveMessagesToFolder = (sFromFolderFullName, oUids, sToFolderFullName, bCopy) =>
 			oToFolder = getFolderFromCacheList(sToFolderFullName);
 
 		if (oFromFolder && oToFolder) {
-			if (bCopy) {
+			bCopy
-				Remote.request('MessageCopy', null, {
+				? Remote.request('MessageCopy', null, {
-					FromFolder: oFromFolder.fullName,
+						FromFolder: oFromFolder.fullName,
-					ToFolder: oToFolder.fullName,
+						ToFolder: oToFolder.fullName,
-					Uids: [...oUids].join(',')
+						Uids: [...oUids].join(',')
-				});
+					})
-			} else {
+				: messagesMoveHelper(oFromFolder.fullName, oToFolder.fullName, oUids);
-				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);
+		search && result.push(encodeURI(search));
-		if (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 => {
+	(admin ? ADMIN_VIEW_MODELS_HOOKS : USER_VIEW_MODELS_HOOKS).forEach(view =>
-		settingsAddViewModel(view[0], view[1], view[2], view[3]);
+		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() ? koSelectedItem(null) : koSelectedItem.valueHasMutated?.();
-					koSelectedItem(null);
-				} else {
-					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) {
+				selectedItemUseCallback && itemSelectedThrottle(item);
-					itemSelectedThrottle(item);
+			} else {
-				}
+				selectedItemUseCallback && itemSelected();
-			} else if (selectedItemUseCallback) {
-				this.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;
+			let select = true;
-			if (event) {
+			if (event && !event.altKey) {
-				if (event.shiftKey && !event.ctrlKey && !event.metaKey && !event.altKey) {
+				if (event.shiftKey && !event.ctrlKey && !event.metaKey) {
-					click = false;
+					select = false;
-					this.sLastUid || (this.sLastUid = this.getItemUid(item));
-
-					item.checked(!item.checked());
-
 					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) {
+				} else if (!event.shiftKey && (event.ctrlKey || event.metaKey)) {
-					click = false;
+					select = false;
 					this.focusedItem(item);
-
+					const selected = this.selectedItem();
-					if (this.selectedItem() && item !== this.selectedItem()) {
+					if (selected && item !== selected) {
-						this.selectedItem().checked(true);
+						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('/');
-			let path = key.split('/');
+		if (I18N_DATA[path[0]] && path[1]) {
-			if (I18N_DATA[path[0]] && path[1]) {
+			result = I18N_DATA[path[0]][path[1]] || result;
-				result = I18N_DATA[path[0]][path[1]] || result;
-			}
-		}
-		if (valueList) {
-			forEachObjectEntry(valueList, (key, value) => {
-				result = result.replace('%' + key + '%', value);
-			});
 		}
+		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);
+		startCallback && translateTrigger.subscribe(startCallback);
-		langCallback && trigger.subscribe(langCallback);
+		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) {
+				push ? result.push(data) : result.unshift(data);
-					result.push(data);
-				} else {
-					result.unshift(data);
-				}
 			};
 
 		let prev = 0,

dev/Component/Checkbox.js

@@ -8,8 +8,6 @@ export class CheckboxComponent {
 
 		this.label = params.label;
 		this.inline = params.inline;
-
-		this.labeled = null != params.label;
 	}
 
 	click() {

dev/Component/EmailAddresses.js

@@ -144,8 +144,8 @@ export class EmailAddressesComponent {
 
 	_parseInput(force) {
 		let val = this.input.value;
-		if (force || val.includes(',') || val.includes(';')) {
+		if ((force || val.includes(',') || val.includes(';')) && this._parseValue(val)) {
-			this._parseValue(val) && (this.input.value = '');
+			this.input.value = '';
 		}
 		this._resizeInput();
 	}
@@ -175,7 +175,7 @@ export class EmailAddressesComponent {
 							lastIndex = kk;
 						}
 
-						vv.value === v && (exists = true);
+						exists |= vv.value === v;
 					});
 
 					if (v !== '' && a[1] && !exists) {
@@ -195,7 +195,7 @@ export class EmailAddressesComponent {
 					}
 				});
 
-				if (values.length === 1 && values[0] === '' && self._lastEdit !== '') {
+				if (1 === values.length && '' === values[0] && '' !== self._lastEdit) {
 					self._lastEdit = '';
 					self._renderTags();
 				}

dev/Component/Select.js

@@ -1,5 +1,3 @@
-import { i18n } from 'Common/Translator';
-import { pInt } from 'Common/Utils';
 import { SaveSettingStatus } from 'Common/Enums';
 import { koComputable } from 'External/ko';
 import { dispose } from 'External/ko';
@@ -10,20 +8,20 @@ export class SelectComponent {
 	 * @param {Object} params
 	 */
 	constructor(params) {
-		this.value = params.value || '';
+		this.value = params.value;
-		this.label = params.label || '';
+		this.label = params.label;
-		this.enable = null == params.enable ? true : params.enable;
 		this.trigger = params.trigger?.subscribe ? params.trigger : null;
-		this.placeholder = params.placeholder || '';
+		this.placeholder = params.placeholder;
-
+		this.options = params.options;
-		this.labeled = null != params.label;
+		this.optionsText = params.optionsText;
+		this.optionsValue = params.optionsValue;
 
 		let size = 0 < params.size ? 'span' + params.size : '';
 		if (this.trigger) {
 			const
 				classForTrigger = ko.observable(''),
 				setTriggerState = value => {
-					switch (pInt(value)) {
+					switch (value) {
 						case SaveSettingStatus.Success:
 							classForTrigger('success');
 							break;
@@ -48,19 +46,12 @@ export class SelectComponent {
 			];
 		} else {
 			this.className = size;
-			this.disposables = [];
 		}
 
-		this.options = params.options || '';
-
-		this.optionsText = params.optionsText || null;
-		this.optionsValue = params.optionsValue || null;
-		this.optionsCaption = i18n(params.optionsCaption || null);
-
 		this.defaultOptionsAfterRender = defaultOptionsAfterRender;
 	}
 
 	dispose() {
-		this.disposables.forEach(dispose);
+		this.disposables?.forEach(dispose);
 	}
 }

dev/External/ko.js

@@ -121,10 +121,9 @@ Object.assign(ko.bindingHandlers, {
 			);
 		},
 		update: (element, fValueAccessor) => {
-			const cl = element.classList,
+			const cl = element.classList;
-				command = fValueAccessor();
 
-			let disabled = !command.canExecute();
+			let disabled = !fValueAccessor().canExecute();
 			cl.toggle('disabled', disabled);
 
 			if (element.matches('INPUT,TEXTAREA,BUTTON')) {

dev/Knoin/AbstractViews.js

@@ -95,7 +95,7 @@ export class AbstractViewLeft extends AbstractView
 {
 	constructor(templateID)
 	{
-		super(templateID, 'Left');
+		super(templateID, 'left');
 		this.leftPanelDisabled = leftPanelDisabled;
 	}
 }
@@ -104,7 +104,7 @@ export class AbstractViewRight extends AbstractView
 {
 	constructor(templateID)
 	{
-		super(templateID, 'Right');
+		super(templateID, 'right');
 	}
 }
 
@@ -151,7 +151,7 @@ export class AbstractViewSettings
 
 export class AbstractViewLogin extends AbstractView {
 	constructor(templateID) {
-		super(templateID, 'Content');
+		super(templateID, 'content');
 		this.formError = ko.observable(false).extend({ falseTimeout: 500 });
 	}
 

dev/Knoin/Knoin.js

@@ -31,9 +31,9 @@ const
 			const
 				vm = new ViewModelClass(vmScreen),
 				id = vm.viewModelTemplateID,
-				position = vm.viewType || '',
+				position = 'rl-' + vm.viewType,
-				dialog = ViewTypePopup === position,
+				dialog = ViewTypePopup === vm.viewType,
-				vmPlace = position ? doc.getElementById('rl-' + position.toLowerCase()) : null;
+				vmPlace = doc.getElementById(position);
 
 			ViewModelClass.__builded = true;
 			ViewModelClass.__vm = vm;
@@ -44,10 +44,9 @@ const
 					: '<div id="V-'+ id + '" hidden=""></div>');
 				vmPlace.append(vmDom);
 
-				vm.viewModelDom = vmDom;
+				vm.viewModelDom = ViewModelClass.__dom = vmDom;
-				ViewModelClass.__dom = vmDom;
 
-				if (ViewTypePopup === position) {
+				if (dialog) {
 					vm.close = () => hideScreenPopup(ViewModelClass);
 
 					// Firefox < 98 / Safari < 15.4 HTMLDialogElement not defined
@@ -237,7 +236,7 @@ const
 
 
 export const
-	ViewTypePopup = 'Popups',
+	ViewTypePopup = 'popups',
 
 	/**
 	 * @param {Function} ViewModelClassToShow

dev/Model/AbstractCollection.js

@@ -27,12 +27,10 @@ export class AbstractCollectionModel extends Array
 				forEachObjectEntry(json, (key, value) => '@' !== key[0] && (result[key] = value));
 				json = json['@Collection'];
 			}
-			if (isArray(json)) {
+			isArray(json) && json.forEach(item => {
-				json.forEach(item => {
+				item && itemCallback && (item = itemCallback(item, result));
-					item && itemCallback && (item = itemCallback(item, result));
+				item && result.push(item);
-					item && result.push(item);
+			});
-				});
-			}
 		}
 		return result;
 	}

dev/Model/ComposeAttachment.js

@@ -38,12 +38,12 @@ export class ComposeAttachmentModel extends AbstractModel {
 		this.addComputables({
 			progressText: () => {
 				const p = this.progress();
-				return 0 === p ? '' : '' + (98 < p ? 100 : p) + '%';
+				return 1 > p ? '' : (100 < p ? 100 : p) + '%';
 			},
 
 			progressStyle: () => {
 				const p = this.progress();
-				return 0 === p ? '' : 'width:' + (98 < p ? 100 : p) + '%';
+				return 1 > p ? '' : 'width:' + (100 < p ? 100 : p) + '%';
 			},
 
 			title: () => this.error() || this.fileName(),
@@ -54,14 +54,9 @@ export class ComposeAttachmentModel extends AbstractModel {
 			},
 
 			mimeType: () => FileInfo.getContentType(this.fileName()),
-			fileExt: () => FileInfo.getExtension(this.fileName())
+			fileExt: () => FileInfo.getExtension(this.fileName()),
+
+			iconClass: () => FileInfo.getIconClass(this.fileExt(), this.mimeType())
 		});
 	}
-
-	/**
-	 * @returns {string}
-	 */
-	iconClass() {
-		return FileInfo.getIconClass(this.fileExt(), this.mimeType());
-	}
 }

dev/Model/Contact.js

@@ -114,8 +114,6 @@ export class ContactModel extends AbstractModel {
 		this.adr   = ko.observableArray();
 
 		this.addComputables({
-			hasValidName: () => !!(this.givenName() || this.surName()),
-
 			fullName: () => [this.namePrefix(), this.givenName(), this.middleName(), this.surName()].join(' ').trim(),
 
 			display: () => {

dev/Model/Email.js

@@ -27,18 +27,14 @@ function addressparser(str) {
 
 	tokens.forEach(token => {
 		if (token.type === 'operator' && (token.value === ',' || token.value === ';')) {
-			if (address.length) {
+			address.length && addresses.push(address);
-				addresses.push(address);
-			}
 			address = [];
 		} else {
 			address.push(token);
 		}
 	});
 
-	if (address.length) {
+	address.length && addresses.push(address);
-		addresses.push(address);
-	}
 
 	addresses.forEach(address => {
 		address = _handleAddress(address);
@@ -205,9 +201,7 @@ class Tokenizer
 
 		this.list.forEach(node => {
 			node.value = (node.value || '').toString().trim();
-			if (node.value) {
+			node.value && list.push(node);
-				list.push(node);
-			}
 		});
 
 		return list;
@@ -361,37 +355,26 @@ export class EmailModel extends AbstractModel {
 	}
 
 	static splitEmailLine(line) {
-		const parsedResult = addressparser(line);
+		const result = [];
-		if (parsedResult.length) {
+		let exists = false;
-			const result = [];
+		addressparser(line).forEach(item => {
-			let exists = false;
+			const address = item.address
-			parsedResult.forEach((item) => {
+				? new EmailModel(item.address.replace(/^[<]+(.*)[>]+$/g, '$1'), item.name || '')
-				const address = item.address
+				: null;
-					? new EmailModel(item.address.replace(/^[<]+(.*)[>]+$/g, '$1'), item.name || '')
-					: null;
 
-				if (address?.email) {
+			if (address?.email) {
-					exists = true;
+				exists = true;
-				}
+			}
 
-				result.push(address ? address.toLine() : item.name);
+			result.push(address ? address.toLine() : item.name);
-			});
+		});
-
+		return exists ? result : null;
-			return exists ? result : null;
-		}
-
-		return null;
 	}
 
 	static parseEmailLine(line) {
-		const parsedResult = addressparser(line);
+		return addressparser(line).map(item =>
-		if (parsedResult.length) {
+			item.address ? new EmailModel(item.address.replace(/^[<]+(.*)[>]+$/g, '$1'), item.name || '') : null
-			return parsedResult.map(item =>
+		).filter(v => v);
-				item.address ? new EmailModel(item.address.replace(/^[<]+(.*)[>]+$/g, '$1'), item.name || '') : null
-			).filter(v => v);
-		}
-
-		return [];
 	}
 
 	/**
@@ -400,19 +383,15 @@ export class EmailModel extends AbstractModel {
 	 */
 	parse(emailAddress) {
 		emailAddress = emailAddress.trim();
-		if (!emailAddress) {
+		if (emailAddress) {
-			return false;
+			const result = addressparser(emailAddress);
+			if (result.length) {
+				this.name = result[0].name || '';
+				this.email = result[0].address || '';
+				this.clearDuplicateName();
+				return true;
+			}
 		}
-
-		const result = addressparser(emailAddress);
-		if (result.length) {
-			this.name = result[0].name || '';
-			this.email = result[0].address || '';
-			this.clearDuplicateName();
-
-			return true;
-		}
-
 		return false;
 	}
 }

dev/Model/EmailCollection.js

@@ -21,17 +21,4 @@ export class EmailCollectionModel extends AbstractCollectionModel
 	toString(friendlyView, wrapWithLink) {
 		return this.map(email => email.toLine(friendlyView, wrapWithLink)).join(', ');
 	}
-
-	/**
-	 * @returns {string}
-	 */
-	toStringClear() {
-		const result = [];
-		this.forEach(email => {
-			if (email?.email && email?.name) {
-				result.push(email.email);
-			}
-		});
-		return result.join(', ');
-	}
 }

dev/Model/FolderCollection.js

@@ -14,7 +14,7 @@ import { MessagelistUserStore } from 'Stores/User/Messagelist';
 import { SettingsUserStore } from 'Stores/User/Settings';
 
 import { sortFolders } from 'Common/Folders';
-import { i18n, trigger as translatorTrigger } from 'Common/Translator';
+import { i18n, translateTrigger } from 'Common/Translator';
 
 import { AbstractModel } from 'Knoin/AbstractModel';
 
@@ -76,17 +76,9 @@ export const
 	 */
 	setExpandedFolder = (sFullName, bExpanded) => {
 		let aExpandedList = Local.get(ClientSideKeyNameExpandedFolders);
-		if (!isArray(aExpandedList)) {
+		aExpandedList = new Set(isArray(aExpandedList) ? aExpandedList : []);
-			aExpandedList = [];
+		bExpanded ? aExpandedList.add(sFullName) : aExpandedList.delete(sFullName);
-		}
+		Local.set(ClientSideKeyNameExpandedFolders, [...aExpandedList]);
-
-		if (bExpanded) {
-			aExpandedList.includes(sFullName) || aExpandedList.push(sFullName);
-		} else {
-			aExpandedList = aExpandedList.filter(value => value !== sFullName);
-		}
-
-		Local.set(ClientSideKeyNameExpandedFolders, aExpandedList);
 	},
 
 	foldersFilter = ko.observable(''),
@@ -99,8 +91,7 @@ export const
 		Remote.abort('Folders')
 			.post('Folders', FolderUserStore.foldersLoading)
 			.then(data => {
-				data = FolderCollectionModel.reviveFromJson(data.Result);
+				FolderCollectionModel.reviveFromJson(data.Result)?.storeIt();
-				data?.storeIt();
 				fCallback?.(true);
 				// Repeat every 15 minutes?
 //				this.foldersTimeout = setTimeout(loadFolders, 900000);
@@ -281,25 +272,15 @@ export class FolderModel extends AbstractModel {
 
 		this.totalEmails = koComputable({
 				read: this.totalEmailsValue,
-				write: (iValue) => {
+				write: iValue =>
-					if (isPosNumeric(iValue)) {
+					isPosNumeric(iValue) ? this.totalEmailsValue(iValue) : this.totalEmailsValue.valueHasMutated()
-						this.totalEmailsValue(iValue);
-					} else {
-						this.totalEmailsValue.valueHasMutated();
-					}
-				}
 			})
 			.extend({ notify: 'always' });
 
 		this.unreadEmails = koComputable({
 				read: this.unreadEmailsValue,
-				write: (value) => {
+				write: value =>
-					if (isPosNumeric(value)) {
+					isPosNumeric(value) ? this.unreadEmailsValue(value) : this.unreadEmailsValue.valueHasMutated()
-						this.unreadEmailsValue(value);
-					} else {
-						this.unreadEmailsValue.valueHasMutated();
-					}
-				}
 			})
 			.extend({ notify: 'always' });
 /*
@@ -397,13 +378,14 @@ export class FolderModel extends AbstractModel {
 					const
 						unread = folder.unreadEmails(),
 						type = folder.type();
+					// TODO: make isSystemFolder() optional in Settings
 					return ((!folder.isSystemFolder() || type == FolderType.Inbox) && unread) ? unread : null;
 				},
 
 				localName: () => {
 					let name = folder.name();
 					if (folder.isSystemFolder()) {
-						translatorTrigger();
+						translateTrigger();
 						name = getSystemFolderName(folder.type(), name);
 					}
 					return name;
@@ -411,7 +393,7 @@ export class FolderModel extends AbstractModel {
 
 				manageFolderSystemName: () => {
 					if (folder.isSystemFolder()) {
-						translatorTrigger();
+						translateTrigger();
 						let suffix = getSystemFolderName(folder.type(), getKolabFolderName(folder.kolabType()));
 						if (folder.name() !== suffix && 'inbox' !== suffix.toLowerCase()) {
 							return '(' + suffix + ')';
@@ -420,24 +402,22 @@ export class FolderModel extends AbstractModel {
 					return '';
 				},
 
-				hasUnreadMessages: () => 0 < folder.unreadEmails() && folder.printableUnreadCount(),
-
 				hasSubscribedUnreadMessagesSubfolders: () =>
 					!!folder.subFolders().find(
-						folder => folder.hasUnreadMessages() | folder.hasSubscribedUnreadMessagesSubfolders()
+						folder => folder.printableUnreadCount() | folder.hasSubscribedUnreadMessagesSubfolders()
 					)
-
+/*
+					!!folder.subFolders().filter(
+						folder => folder.printableUnreadCount() | folder.hasSubscribedUnreadMessagesSubfolders()
+					).length
+*/
 //				,href: () => folder.canBeSelected() && mailBox(folder.fullNameHash)
 			});
 
 			folder.addSubscribables({
 				editing: value => value && folder.nameForEdit(folder.name()),
 
-				unreadEmails: unread => {
+				unreadEmails: unread => FolderType.Inbox === folder.type() && fireEvent('mailbox.inbox-unread-count', unread)
-					if (FolderType.Inbox === folder.type()) {
-						fireEvent('mailbox.inbox-unread-count', unread);
-					}
-				}
 			});
 		}
 		return folder;

dev/Model/Identity.js

@@ -1,5 +1,3 @@
-import { koComputable } from 'External/ko';
-
 import { AbstractModel } from 'Knoin/AbstractModel';
 
 export class IdentityModel extends AbstractModel {
@@ -23,8 +21,6 @@ export class IdentityModel extends AbstractModel {
 
 			askDelete: false
 		});
-
-		this.canBeDeleted = koComputable(() => !!this.id());
 	}
 
 	/**

dev/Model/Message.js

@@ -5,7 +5,7 @@ import { i18n } from 'Common/Translator';
 
 import { doc, SettingsGet } from 'Common/Globals';
 import { encodeHtml, plainToHtml, cleanHtml } from 'Common/Html';
-import { isArray, arrayLength, forEachObjectEntry } from 'Common/Utils';
+import { arrayLength, forEachObjectEntry } from 'Common/Utils';
 import { serverRequestRaw, proxy } from 'Common/Links';
 
 import { FolderUserStore, isAllowedKeyword } from 'Stores/User/Folder';
@@ -32,15 +32,12 @@ const
 
 	toggleTag = (message, keyword) => {
 		const lower = keyword.toLowerCase(),
-			isSet = message.flags().includes(lower);
+			flags = message.flags,
+			isSet = flags.includes(lower);
 		Remote.request('MessageSetKeyword', iError => {
 			if (!iError) {
-				if (isSet) {
+				isSet ? flags.remove(lower) : flags.push(lower);
-					message.flags.remove(lower);
+//				MessageFlagsCache.setFor(message.folder, message.uid, flags());
-				} else {
-					message.flags.push(lower);
-				}
-//				MessageFlagsCache.setFor(message.folder, message.uid, message.flags());
 			}
 		}, {
 			Folder: message.folder,
@@ -56,11 +53,9 @@ const
 	 * @param {Map} localEmails
 	 */
 	replyHelper = (emails, unic, localEmails) =>
-		emails.forEach(email => {
+		emails.forEach(email =>
-			if (!unic[email.email] && !localEmails.has(email.email)) {
+			unic[email.email] || localEmails.has(email.email) || localEmails.set(email.email, email)
-				localEmails.set(email.email, email);
+		);
-			}
-		});
 
 doc.body.append(hcont);
 
@@ -222,16 +217,6 @@ export class MessageModel extends AbstractModel {
 		return spam ? i18n(this.isSpam() ? 'GLOBAL/SPAM' : 'GLOBAL/NOT_SPAM') + ': ' + spam : '';
 	}
 
-	/**
-	 * @param {Array} properties
-	 * @returns {Array}
-	 */
-	getEmails(properties) {
-		return properties.reduce((carry, property) => carry.concat(this[property]), []).map(
-			oItem => oItem ? oItem.email : ''
-		).validUnique();
-	}
-
 	/**
 	 * @returns {string}
 	 */
@@ -240,9 +225,11 @@ export class MessageModel extends AbstractModel {
 	}
 
 	computeSenderEmail() {
-		const list = [FolderUserStore.sentFolder(), FolderUserStore.draftsFolder()].includes(this.folder) ? 'to' : 'from';
+		const list = this[
-		this.senderEmailsString(this[list].toString(true));
+			[FolderUserStore.sentFolder(), FolderUserStore.draftsFolder()].includes(this.folder) ? 'to' : 'from'
-		this.senderClearEmailsString(this[list].toStringClear());
+		];
+		this.senderEmailsString(list.toString(true));
+		this.senderClearEmailsString(list.map(email => email?.email).filter(email => email).join(', '));
 	}
 
 	/**
@@ -349,21 +336,6 @@ export class MessageModel extends AbstractModel {
 		return classes.join(' ');
 	}
 
-	/**
-	 * @return array
-	 * https://datatracker.ietf.org/doc/html/rfc5788
-	 */
-	keywords() {
-		return this.flags().filter(value => '\\' !== value[0]);
-	}
-
-	/**
-	 * @returns {string}
-	 */
-	fromAsSingleEmail() {
-		return (isArray(this.from) && this.from[0]?.email) || '';
-	}
-
 	/**
 	 * @returns {string}
 	 */
@@ -491,7 +463,7 @@ export class MessageModel extends AbstractModel {
 	 * @param {boolean=} print = false
 	 */
 	popupMessage() {
-		this.viewPopupMessage(false);
+		this.viewPopupMessage();
 	}
 
 	printMessage() {

dev/Remote/AbstractFetch.js

@@ -5,7 +5,7 @@ import { getNotification } from 'Common/Translator';
 
 let iJsonErrorCount = 0;
 
-const getURL = (add = '') => serverRequest('Json') + add,
+const getURL = (add = '') => serverRequest('Json') + pString(add),
 
 checkResponseError = data => {
 	const err = data ? data.ErrorCode : null;
@@ -109,10 +109,8 @@ export class AbstractFetchRemote
 						buffer = buffer.slice(result.index + 1);
 						re.lastIndex = 0;
 					}
-					if (buffer.length) {
+					// last line didn't end in a newline char
-						// last line didn't end in a newline char
+					buffer.length && fCallback(buffer);
-						fCallback(buffer);
-					}
 				};
 			reader.read().then(processText);
 		})
@@ -132,7 +130,7 @@ export class AbstractFetchRemote
 
 		abortActions && console.error('abortActions is obsolete');
 
-		fetchJSON(sAction, pString(sGetAdd),
+		fetchJSON(sAction, sGetAdd,
 			params,
 			undefined === iTimeout ? 30000 : pInt(iTimeout),
 			data => {

dev/Settings/Admin/About.js

@@ -3,7 +3,7 @@ import { Settings } from 'Common/Globals';
 import { addObservablesTo } from 'External/ko';
 import Remote from 'Remote/Admin/Fetch';
 
-import { i18n, trigger as translatorTrigger } from 'Common/Translator';
+import { i18n, translateTrigger } from 'Common/Translator';
 
 export class AdminSettingsAbout /*extends AbstractViewSettings*/ {
 	constructor() {
@@ -22,7 +22,7 @@ export class AdminSettingsAbout /*extends AbstractViewSettings*/ {
 		this.coreUpdating = ko.observable(false).extend({ throttle: 100 });
 
 		this.coreVersionHtmlDesc = ko.computed(() => {
-			translatorTrigger();
+			translateTrigger();
 			return i18n('TAB_ABOUT/HTML_NEW_VERSION', { 'VERSION': this.coreVersion() });
 		});
 

dev/Settings/Admin/Contacts.js

@@ -85,11 +85,7 @@ export class AdminSettingsContacts extends AbstractViewSettings {
 					this.testContactsSuccess(true);
 				} else {
 					this.testContactsError(true);
-					if (data?.Result) {
+					this.testContactsErrorMessage(data?.Result?.Message || '');
-						this.testContactsErrorMessage(data.Result.Message || '');
-					} else {
-						this.testContactsErrorMessage('');
-					}
 				}
 
 				this.testing(false);

dev/Settings/Admin/Packages.js

@@ -42,7 +42,7 @@ export class AdminSettingsPackages extends AbstractViewSettings {
 		oDom.addEventListener('click', event => {
 			// configurePlugin
 			let el = event.target.closestWithin('.package-configure', oDom),
-				data = el ? ko.dataFor(el) : 0;
+				data = el && ko.dataFor(el);
 			data && Remote.request('AdminPluginLoad',
 				(iError, data) => iError || showScreenPopup(PluginPopupView, [data.Result]),
 				{
@@ -51,7 +51,7 @@ export class AdminSettingsPackages extends AbstractViewSettings {
 			);
 			// disablePlugin
 			el = event.target.closestWithin('.package-active', oDom);
-			data = el ? ko.dataFor(el) : 0;
+			data = el && ko.dataFor(el);
 			data && this.disablePlugin(data);
 		});
 	}

dev/Settings/User/Accounts.js

@@ -50,20 +50,18 @@ export class UserSettingsAccounts /*extends AbstractViewSettings*/ {
 	deleteAccount(accountToRemove) {
 		if (accountToRemove?.askDelete()) {
 			this.accountForDeletion(null);
-			if (accountToRemove) {
+			this.accounts.remove(account => accountToRemove === account);
-				this.accounts.remove((account) => accountToRemove === account);
 
-				Remote.request('AccountDelete', (iError, data) => {
+			Remote.request('AccountDelete', (iError, data) => {
-					if (!iError && data.Reload) {
+				if (!iError && data.Reload) {
-						rl.route.root();
+					rl.route.root();
-						setTimeout(() => location.reload(), 1);
+					setTimeout(() => location.reload(), 1);
-					} else {
+				} else {
-						rl.app.accountsAndIdentities();
+					rl.app.accountsAndIdentities();
-					}
+				}
-				}, {
+			}, {
-					EmailToDelete: accountToRemove.email
+				EmailToDelete: accountToRemove.email
-				});
+			});
-			}
 		}
 	}
 
@@ -74,13 +72,10 @@ export class UserSettingsAccounts /*extends AbstractViewSettings*/ {
 	deleteIdentity(identityToRemove) {
 		if (identityToRemove?.askDelete()) {
 			this.identityForDeletion(null);
-
+			IdentityUserStore.remove(oIdentity => identityToRemove === oIdentity);
-			if (identityToRemove) {
+			Remote.request('IdentityDelete', () => rl.app.accountsAndIdentities(), {
-				IdentityUserStore.remove(oIdentity => identityToRemove === oIdentity);
+				IdToDelete: identityToRemove.id()
-				Remote.request('IdentityDelete', () => rl.app.accountsAndIdentities(), {
+			});
-					IdToDelete: identityToRemove.id()
-				});
-			}
 		}
 	}
 

dev/Settings/User/Contacts.js

@@ -2,7 +2,7 @@ import ko from 'ko';
 import { koComputable } from 'External/ko';
 
 import { SettingsGet } from 'Common/Globals';
-import { i18n, trigger as translatorTrigger } from 'Common/Translator';
+import { i18n, translateTrigger } from 'Common/Translator';
 import { ContactUserStore } from 'Stores/User/Contact';
 import Remote from 'Remote/User/Fetch';
 
@@ -17,7 +17,7 @@ export class UserSettingsContacts /*extends AbstractViewSettings*/ {
 		this.syncPass = ContactUserStore.syncPass;
 
 		this.syncModeOptions = koComputable(() => {
-			translatorTrigger();
+			translateTrigger();
 			return [
 				{ id: 0, name: i18n('GLOBAL/NO') },
 				{ id: 1, name: i18n('GLOBAL/YES') },

dev/Settings/User/General.js

@@ -6,7 +6,7 @@ import { EditorDefaultType, Layout } from 'Common/EnumsUser';
 import { Settings, SettingsGet } from 'Common/Globals';
 import { isArray } from 'Common/Utils';
 import { addSubscribablesTo, addComputablesTo } from 'External/ko';
-import { i18n, trigger as translatorTrigger, translatorReload, convertLangName } from 'Common/Translator';
+import { i18n, translateTrigger, translatorReload, convertLangName } from 'Common/Translator';
 
 import { AbstractViewSettings } from 'Knoin/AbstractViews';
 import { showScreenPopup } from 'Knoin/Knoin';
@@ -66,7 +66,7 @@ export class UserSettingsGeneral extends AbstractViewSettings {
 			},
 
 			editorDefaultTypes: () => {
-				translatorTrigger();
+				translateTrigger();
 				return [
 					{ id: EditorDefaultType.Html, name: i18n('SETTINGS_GENERAL/EDITOR_HTML') },
 					{ id: EditorDefaultType.Plain, name: i18n('SETTINGS_GENERAL/EDITOR_PLAIN') }
@@ -74,7 +74,7 @@ export class UserSettingsGeneral extends AbstractViewSettings {
 			},
 
 			msgDefaultActions: () => {
-				translatorTrigger();
+				translateTrigger();
 				return [
 					{ id: 1, name: i18n('MESSAGE/BUTTON_REPLY') }, // ComposeType.Reply,
 					{ id: 2, name: i18n('MESSAGE/BUTTON_REPLY_ALL') } // ComposeType.ReplyAll
@@ -82,7 +82,7 @@ export class UserSettingsGeneral extends AbstractViewSettings {
 			},
 
 			layoutTypes: () => {
-				translatorTrigger();
+				translateTrigger();
 				return [
 					{ id: Layout.NoPreview, name: i18n('SETTINGS_GENERAL/LAYOUT_NO_SPLIT') },
 					{ id: Layout.SidePreview, name: i18n('SETTINGS_GENERAL/LAYOUT_VERTICAL_SPLIT') },

dev/Settings/User/Security.js

@@ -1,7 +1,7 @@
 import { koComputable } from 'External/ko';
 
 import { SettingsCapa } from 'Common/Globals';
-import { i18n, trigger as translatorTrigger } from 'Common/Translator';
+import { i18n, translateTrigger } from 'Common/Translator';
 
 import { AbstractViewSettings } from 'Knoin/AbstractViews';
 
@@ -27,7 +27,7 @@ export class UserSettingsSecurity extends AbstractViewSettings {
 
 		let i18nLogout = (key, params) => i18n('SETTINGS_SECURITY/AUTOLOGIN_' + key, params);
 		this.autoLogoutOptions = koComputable(() => {
-			translatorTrigger();
+			translateTrigger();
 			return [
 				{ id: 0, name: i18nLogout('NEVER_OPTION_NAME') },
 				{ id: 5, name: i18nLogout('MINUTES_OPTION_NAME', { MINUTES: 5 }) },

dev/Settings/User/Themes.js

@@ -32,9 +32,7 @@ export class UserSettingsThemes /*extends AbstractViewSettings*/ {
 		this.themeTrigger = ko.observable(SaveSettingStatus.Idle).extend({ debounce: 100 });
 
 		ThemeStore.theme.subscribe(value => {
-			this.themesObjects.forEach(theme => {
+			this.themesObjects.forEach(theme => theme.selected(value === theme.name));
-				theme.selected(value === theme.name);
-			});
 
 			changeTheme(value, this.themeTrigger);
 
@@ -69,18 +67,12 @@ export class UserSettingsThemes /*extends AbstractViewSettings*/ {
 				.on('onStart', () => {
 					themeBackground.loading(true);
 					themeBackground.error('');
-					return true;
 				})
 				.on('onComplete', (id, result, data) => {
 					themeBackground.loading(false);
-
+					themeBackground.name(data?.Result?.Name || '');
-					if (result && id && data?.Result?.Name && data?.Result?.Hash) {
+					themeBackground.hash(data?.Result?.Hash || '');
-						themeBackground.name(data.Result.Name);
+					if (!themeBackground.name() || !themeBackground.hash()) {
-						themeBackground.hash(data.Result.Hash);
-					} else {
-						themeBackground.name('');
-						themeBackground.hash('');
-
 						let errorMsg = '';
 						if (data.ErrorCode) {
 							switch (data.ErrorCode) {
@@ -96,8 +88,6 @@ export class UserSettingsThemes /*extends AbstractViewSettings*/ {
 
 						themeBackground.error(errorMsg || data.ErrorMessage || i18n('SETTINGS_THEMES/ERROR_UNKNOWN'));
 					}
-
-					return true;
 				});
 		}
 	}

dev/Stores/User/GnuPG.js

@@ -56,11 +56,9 @@ export const GnuPGUserStore = new class {
 											if (iError) {
 												alert(oData.ErrorMessage);
 											} else if (oData.Result) {
-												if (isPrivate) {
+												isPrivate
-													this.privateKeys.remove(key);
+													? this.privateKeys.remove(key)
-												} else {
+													: this.publicKeys.remove(key);
-													this.publicKeys.remove(key);
-												}
 											}
 										}
 									}, {

dev/Stores/User/Message.js

@@ -26,9 +26,7 @@ export const MessageUserStore = new class {
 				clearTimeout(this.MessageSeenTimer);
 				elementById('rl-right').classList.toggle('message-selected', !!message);
 				if (message) {
-					if (!SettingsUserStore.usePreviewPane()) {
+					SettingsUserStore.usePreviewPane() || AppUserStore.focusedState(Scope.MessageView);
-						AppUserStore.focusedState(Scope.MessageView);
-					}
 				} else {
 					AppUserStore.focusedState(Scope.MessageList);
 					exitFullscreen();

dev/Stores/User/OpenPGP.js

@@ -47,9 +47,7 @@ const
 			i = arrayLength(armoredKeys);
 		while (i--) {
 			key = await openpgp.readKey({armoredKey:armoredKeys[i]});
-			if (!key.err) {
+			key.err || keys.push(new OpenPgpKeyModel(armoredKeys[i], key));
-				keys.push(new OpenPgpKeyModel(armoredKeys[i], key));
-			}
 		}
 		return keys;
 	},

dev/View/Popup/AdvancedSearch.js

@@ -1,4 +1,4 @@
-import { i18n, trigger as translatorTrigger } from 'Common/Translator';
+import { i18n, translateTrigger } from 'Common/Translator';
 import { pString } from 'Common/Utils';
 
 import { MessagelistUserStore } from 'Stores/User/Messagelist';
@@ -46,7 +46,7 @@ export class AdvancedSearchPopupView extends AbstractViewPopup {
 			showKeywords: () => FolderUserStore.currentFolder().permanentFlags().some(isAllowedKeyword),
 
 			repliedOptions: () => {
-				translatorTrigger();
+				translateTrigger();
 				return [
 					{ id: -1, name: '' },
 					{ id: 1, name: i18n('GLOBAL/YES') },
@@ -55,7 +55,7 @@ export class AdvancedSearchPopupView extends AbstractViewPopup {
 			},
 
 			selectedDates: () => {
-				translatorTrigger();
+				translateTrigger();
 				let prefix = 'SEARCH/DATE_';
 				return [
 					{ id: -1, name: i18n(prefix + 'ALL') },
@@ -69,7 +69,7 @@ export class AdvancedSearchPopupView extends AbstractViewPopup {
 			},
 
 			selectedTree: () => {
-				translatorTrigger();
+				translateTrigger();
 				let prefix = 'SEARCH/SUBFOLDERS_';
 				return [
 					{ id: '', name: i18n(prefix + 'NONE') },

snappymail/v/0.0.0/app/templates/Views/Components/Checkbox.html

@@ -2,7 +2,7 @@
 	<div role="checkbox">
 		<div data-bind="css: {'checked': value()}"></div>
 	</div>
-<!-- ko if: labeled -->
+<!-- ko if: label -->
 	<span data-bind="attr: {'data-i18n': label}"></span>
 <!-- /ko -->
 </div>

snappymail/v/0.0.0/app/templates/Views/Components/Select.html

@@ -1,7 +1,7 @@
 <div class="e-component">
-	<select data-bind="options: options, value: value, enable: enable, optionsText: optionsText, optionsValue: optionsValue,
+	<select data-bind="options: options, value: value, optionsText: optionsText, optionsValue: optionsValue,
-		optionsCaption: optionsCaption, css: className, optionsAfterRender: defaultOptionsAfterRender"></select>
+		css: className, optionsAfterRender: defaultOptionsAfterRender"></select>
-	<!-- ko if: labeled -->
+	<!-- ko if: label -->
 	<span data-bind="attr: {'data-i18n': label}"></span>
 	<!-- /ko -->
 	<!-- ko if: trigger -->

snappymail/v/0.0.0/app/templates/Views/User/PopupsCompose.html

@@ -158,7 +158,7 @@
 		<ul class="attachmentList" data-bind="foreach: attachments">
 			<li class="attachmentItem" data-bind="attr: { 'title': title }, css: { 'waiting': waiting, 'error': '' !== error() }">
 				<div class="attachmentIconParent">
-					<i class="iconMain" data-bind="css: iconClass(), visible: !uploading() || 0 === progress()"></i>
+					<i class="iconMain" data-bind="css: iconClass, visible: !uploading() || 0 === progress()"></i>
 					<div class="iconProgress" data-bind="attr: { 'style': progressStyle }, visible: uploading"></div>
 					<div class="iconBG" data-bind="text: progressText, visible: uploading"></div>
 				</div>

snappymail/v/0.0.0/app/templates/Views/User/PopupsContacts.html

@@ -85,7 +85,7 @@
 				tabindex="0"
 				data-i18n="CONTACTS/TAB_CONTACT"></label>
 			<div class="form-horizontal tab-content" role="tabpanel" aria-hidden="false">
-				<div class="control-group" data-bind="visible: !readOnly() || hasValidName()">
+				<div class="control-group">
 					<label class="fontastic iconsize24">👤</label>
 					<div>
 						<div class="property-line" data-i18n="[title]CONTACTS/PLACEHOLDER_ENTER_FIRST_NAME">

snappymail/v/0.0.0/app/templates/Views/User/SettingsAccounts.html

@@ -52,11 +52,11 @@
 					<span class="identity-default" data-bind="visible: 0 === $index()" data-i18n="SETTINGS_ACCOUNTS/DEFAULT_IDENTITY_LABEL"></span>
 				</td>
 				<td>
-					<a class="btn btn-small btn-danger button-confirm-delete" data-bind="visible: canBeDeleted, css: {'delete-access': askDelete}, click: function(oIdentity) { $root.deleteIdentity(oIdentity); }"
+					<a class="btn btn-small btn-danger button-confirm-delete" data-bind="visible: id, css: {'delete-access': askDelete}, click: function(oIdentity) { $root.deleteIdentity(oIdentity); }"
 						data-i18n="GLOBAL/ARE_YOU_SURE"></a>
 				</td>
 				<td>
-					<span class="delete fontastic" data-bind="visible: !askDelete() && canBeDeleted(), click: function (oIdentity) { $root.identityForDeletion(oIdentity); }">🗑</span>
+					<span class="delete fontastic" data-bind="visible: !askDelete() && id(), click: function (oIdentity) { $root.identityForDeletion(oIdentity); }">🗑</span>
 				</td>
 			</tr>
 		</tbody>