Added addComputables() to *Model

dev/Knoin/AbstractModel.js

@@ -41,6 +41,10 @@ export class AbstractModel {
 */
 	}
 
+	addComputables(obj) {
+		Object.entries(obj).forEach(([key, fn]) => this[key] = ko.computed(fn) );
+	}
+
 	addSubscribables(obj) {
 		Object.entries(obj).forEach(([key, fn]) => this.disposables.push( this[key].subscribe(fn) ) );
 	}

dev/Model/ComposeAttachment.js

@@ -1,4 +1,3 @@
-import ko from 'ko';
 import { pInt } from 'Common/Utils';
 import { File } from 'Common/File';
 
@@ -37,27 +36,27 @@ class ComposeAttachmentModel extends AbstractModel {
 			complete: false
 		});
 
-		this.progressText = ko.computed(() => {
+		this.addComputables({
+			progressText: () => {
 				const p = this.progress();
 				return 0 === p ? '' : '' + (98 < p ? 100 : p) + '%';
-		});
+			},
 
-		this.progressStyle = ko.computed(() => {
+			progressStyle: () => {
 				const p = this.progress();
 				return 0 === p ? '' : 'width:' + (98 < p ? 100 : p) + '%';
-		});
+			},
 
-		this.title = ko.computed(() => {
+			title: () => this.error() || this.fileName(),
-			return this.error() || this.fileName();
-		});
 
-		this.friendlySize = ko.computed(() => {
+			friendlySize: () => {
 				const localSize = this.size();
 				return null === localSize ? '' : File.friendlySize(localSize);
-		});
+			},
 
-		this.mimeType = ko.computed(() => File.getContentType(this.fileName()));
+			mimeType: () => File.getContentType(this.fileName()),
-		this.fileExt = ko.computed(() => File.getExtension(this.fileName()));
+			fileExt: () => File.getExtension(this.fileName())
+		});
 	}
 
 	static fromAttachment(item)

dev/Model/ContactProperty.js

@@ -1,5 +1,3 @@
-import ko from 'ko';
-
 import { ContactPropertyType } from 'Common/Enums';
 import { pInt, pString } from 'Common/Utils';
 import { i18n } from 'Common/Translator';
@@ -26,12 +24,14 @@ class ContactPropertyModel extends AbstractModel {
 			placeholder: placeholder
 		});
 
-		this.placeholderValue = ko.computed(() => {
+		this.addComputables({
+			placeholderValue: () => {
 				const v = this.placeholder();
 				return v ? i18n(v) : '';
-		});
+			},
 
-		this.largeValue = ko.computed(() => ContactPropertyType.Note === this.type());
+			largeValue: () => ContactPropertyType.Note === this.type()
+		});
 	}
 
 	toJSON() {

dev/Model/Filter.js

@@ -53,7 +53,8 @@ class FilterModel extends AbstractModel {
 			return folder ? folder.fullName.replace('.' === folder.delimiter ? /\./ : /[\\/]+/, ' / ') : folderFullNameRaw;
 		};
 
-		this.nameSub = ko.computed(() => {
+		this.addComputables({
+			nameSub: () => {
 				let result = '';
 				const actionValue = this.actionValue();
 
@@ -81,9 +82,9 @@ class FilterModel extends AbstractModel {
 				}
 
 				return result ? '(' + result + ')' : '';
-		});
+			},
 
-		this.actionTemplate = ko.computed(() => {
+			actionTemplate: () => {
 				let result = '';
 
 				switch (this.actionType()) {
@@ -109,6 +110,7 @@ class FilterModel extends AbstractModel {
 				}
 
 				return result;
+			}
 		});
 
 		this.addSubscribables({

dev/Model/Folder.js

@@ -59,37 +59,7 @@ class FolderModel extends AbstractModel {
 
 			folder.subScribed(!!json.IsSubscribed);
 
-			folder.isInbox = ko.computed(() => FolderType.Inbox === folder.type());
+			folder.messageCountAll = ko.computed({
-
-			folder.hasSubScribedSubfolders = ko.computed(
-				() =>
-					!!folder.subFolders().find(
-						oFolder => (oFolder.subScribed() || oFolder.hasSubScribedSubfolders()) && !oFolder.isSystemFolder()
-					)
-			);
-
-			folder.canBeEdited = ko.computed(() => FolderType.User === folder.type() && folder.existen && folder.selectable);
-
-			folder.visible = ko.computed(() => {
-				const isSubScribed = folder.subScribed(),
-					isSubFolders = folder.hasSubScribedSubfolders();
-
-				return isSubScribed || (isSubFolders && (!folder.existen || !folder.selectable));
-			});
-
-			folder.isSystemFolder = ko.computed(() => FolderType.User !== folder.type());
-
-			folder.hidden = ko.computed(() => {
-				const isSystem = folder.isSystemFolder(),
-					isSubFolders = folder.hasSubScribedSubfolders();
-
-				return (isSystem && !isSubFolders) || (!folder.selectable && !isSubFolders);
-			});
-
-			folder.selectableForFolderList = ko.computed(() => !folder.isSystemFolder() && folder.selectable);
-
-			folder.messageCountAll = ko
-				.computed({
 					read: folder.privateMessageCountAll,
 					write: (iValue) => {
 						if (isPosNumeric(iValue, true)) {
@@ -101,8 +71,7 @@ class FolderModel extends AbstractModel {
 				})
 				.extend({ notify: 'always' });
 
-			folder.messageCountUnread = ko
+			folder.messageCountUnread = ko.computed({
-				.computed({
 					read: folder.privateMessageCountUnread,
 					write: (value) => {
 						if (isPosNumeric(value, true)) {
@@ -114,7 +83,35 @@ class FolderModel extends AbstractModel {
 				})
 				.extend({ notify: 'always' });
 
-			folder.printableUnreadCount = ko.computed(() => {
+			folder.addComputables({
+
+				isInbox: () => FolderType.Inbox === folder.type(),
+
+				hasSubScribedSubfolders:
+					() =>
+						!!folder.subFolders().find(
+							oFolder => (oFolder.subScribed() || oFolder.hasSubScribedSubfolders()) && !oFolder.isSystemFolder()
+						),
+
+				canBeEdited: () => FolderType.User === folder.type() && folder.existen && folder.selectable,
+
+				visible: () => {
+					const isSubScribed = folder.subScribed(),
+						isSubFolders = folder.hasSubScribedSubfolders();
+
+					return isSubScribed || (isSubFolders && (!folder.existen || !folder.selectable));
+				},
+
+				isSystemFolder: () => FolderType.User !== folder.type(),
+
+				hidden: () => {
+					const isSystem = folder.isSystemFolder(),
+						isSubFolders = folder.hasSubScribedSubfolders();
+
+					return (isSystem && !isSubFolders) || (!folder.selectable && !isSubFolders);
+				},
+
+				printableUnreadCount: () => {
 					const count = folder.messageCountAll(),
 						unread = folder.messageCountUnread(),
 						type = folder.type();
@@ -134,19 +131,17 @@ class FolderModel extends AbstractModel {
 					}
 
 					return '';
-			});
+				},
 
-			folder.canBeDeleted = ko.computed(
+				canBeDeleted: () => !folder.isSystemFolder() && !folder.subFolders().length,
-				() => !folder.isSystemFolder() && !folder.subFolders().length
-			);
 
-			folder.canBeSubScribed = ko.computed(
+				selectableForFolderList: () => !folder.isSystemFolder() && folder.selectable,
-				() => !folder.isSystemFolder() && folder.selectable
-			);
 
-			folder.canBeChecked = folder.canBeSubScribed;
+				canBeSubScribed: () => !folder.isSystemFolder() && folder.selectable,
 
-			folder.localName = ko.computed(() => {
+				canBeChecked: () => !folder.isSystemFolder() && folder.selectable,
+
+				localName: () => {
 					translatorTrigger();
 
 					let name = folder.name();
@@ -177,9 +172,9 @@ class FolderModel extends AbstractModel {
 					}
 
 					return name;
-			});
+				},
 
-			folder.manageFolderSystemName = ko.computed(() => {
+				manageFolderSystemName: () => {
 					translatorTrigger();
 
 					let suffix = '';
@@ -215,23 +210,22 @@ class FolderModel extends AbstractModel {
 					}
 
 					return suffix;
-			});
+				},
 
-			folder.collapsed = ko.computed({
+				collapsed: {
 					read: () => !folder.hidden() && folder.collapsedPrivate(),
 					write: (value) => {
 						folder.collapsedPrivate(value);
 					}
-			});
+				},
 
-			folder.hasUnreadMessages = ko.computed(() => 0 < folder.messageCountUnread() && folder.printableUnreadCount());
+				hasUnreadMessages: () => 0 < folder.messageCountUnread() && folder.printableUnreadCount(),
 
-			folder.hasSubScribedUnreadMessagesSubfolders = ko.computed(
+				hasSubScribedUnreadMessagesSubfolders: () =>
-				() =>
 						!!folder.subFolders().find(
 							folder => folder.hasUnreadMessages() || folder.hasSubScribedUnreadMessagesSubfolders()
 						)
-			);
+			});
 
 			folder.addSubscribables({
 				name: value => folder.nameForEdit(value),

dev/Model/Message.js

@@ -71,16 +71,15 @@ class MessageModel extends AbstractModel {
 			hasFlaggedSubMessage: false
 		});
 
-		this.attachmentIconClass = ko.computed(() =>
-			File.getCombinedIconClass(this.hasAttachments() ? this.attachmentsSpecData() : [])
-		);
-
 		this.attachments = ko.observableArray(new AttachmentCollectionModel);
 		this.attachmentsSpecData = ko.observableArray([]);
 		this.threads = ko.observableArray([]);
 
-		this.threadsLen = ko.computed(() => this.threads().length);
+		this.addComputables({
-		this.isImportant = ko.computed(() => MessagePriority.High === this.priority());
+			attachmentIconClass: () => File.getCombinedIconClass(this.hasAttachments() ? this.attachmentsSpecData() : []),
+			threadsLen: () => this.threads().length,
+			isImportant: () => MessagePriority.High === this.priority(),
+		});
 	}
 
 	_reset() {