diff --git a/dev/Knoin/AbstractModel.js b/dev/Knoin/AbstractModel.js index acbe9417a..ed16993a3 100644 --- a/dev/Knoin/AbstractModel.js +++ b/dev/Knoin/AbstractModel.js @@ -6,14 +6,13 @@ function disposeOne(disposable) { } export class AbstractModel { - sModelName = ''; disposables = []; /** * @param {string} modelName = '' */ - constructor(modelName = '') { - this.sModelName = modelName || ''; + constructor() { +// this.sModelName = new.target.name; } regDisposables(value) { diff --git a/dev/Model/Account.js b/dev/Model/Account.js index 35ba27906..69c44db5a 100644 --- a/dev/Model/Account.js +++ b/dev/Model/Account.js @@ -11,7 +11,7 @@ class AccountModel extends AbstractModel { * @param {number=} count = 0 */ constructor(email, canBeDelete = true, count = 0) { - super('AccountModel'); + super(); this.email = email; diff --git a/dev/Model/Attachment.js b/dev/Model/Attachment.js index 0c43f613f..511deafaa 100644 --- a/dev/Model/Attachment.js +++ b/dev/Model/Attachment.js @@ -17,7 +17,7 @@ const bAllowPdfPreview = undefined !== navigator.mimeTypes['application/pdf']; class AttachmentModel extends AbstractModel { constructor() { - super('AttachmentModel'); + super(); this.checked = ko.observable(false); diff --git a/dev/Model/ComposeAttachment.js b/dev/Model/ComposeAttachment.js index f61387b02..0e4fe069e 100644 --- a/dev/Model/ComposeAttachment.js +++ b/dev/Model/ComposeAttachment.js @@ -15,7 +15,7 @@ class ComposeAttachmentModel extends AbstractModel { * @param {string=} contentLocation = '' */ constructor(id, fileName, size = null, isInline = false, isLinked = false, CID = '', contentLocation = '') { - super('ComposeAttachmentModel'); + super(); this.id = id; this.isInline = !!isInline; diff --git a/dev/Model/Contact.js b/dev/Model/Contact.js index 7480d972a..3162e5c65 100644 --- a/dev/Model/Contact.js +++ b/dev/Model/Contact.js @@ -8,7 +8,7 @@ import { AbstractModel } from 'Knoin/AbstractModel'; class ContactModel extends AbstractModel { constructor() { - super('ContactModel'); + super(); this.idContact = 0; this.display = ''; diff --git a/dev/Model/ContactProperty.js b/dev/Model/ContactProperty.js index 387453245..12d1f8f4e 100644 --- a/dev/Model/ContactProperty.js +++ b/dev/Model/ContactProperty.js @@ -15,7 +15,7 @@ class ContactPropertyModel extends AbstractModel { * @param {string=} placeholder = '' */ constructor(type = ContactPropertyType.Unknown, typeStr = '', value = '', focused = false, placeholder = '') { - super('ContactPropertyModel'); + super(); this.type = ko.observable(pInt(type)); this.typeStr = ko.observable(pString(typeStr)); diff --git a/dev/Model/Filter.js b/dev/Model/Filter.js index 53c399ef1..f4b75e31d 100644 --- a/dev/Model/Filter.js +++ b/dev/Model/Filter.js @@ -13,7 +13,7 @@ import { AbstractModel } from 'Knoin/AbstractModel'; class FilterModel extends AbstractModel { constructor() { - super('FilterModel'); + super(); this.enabled = ko.observable(true); diff --git a/dev/Model/FilterCondition.js b/dev/Model/FilterCondition.js index 6ddcfd598..ddd53c71e 100644 --- a/dev/Model/FilterCondition.js +++ b/dev/Model/FilterCondition.js @@ -7,7 +7,7 @@ import { AbstractModel } from 'Knoin/AbstractModel'; class FilterConditionModel extends AbstractModel { constructor() { - super('FilterConditionModel'); + super(); this.field = ko.observable(FilterConditionField.From); this.type = ko.observable(FilterConditionType.Contains); diff --git a/dev/Model/Folder.js b/dev/Model/Folder.js index b8c2bad28..fd1b52006 100644 --- a/dev/Model/Folder.js +++ b/dev/Model/Folder.js @@ -8,7 +8,7 @@ import { AbstractModel } from 'Knoin/AbstractModel'; class FolderModel extends AbstractModel { constructor() { - super('FolderModel'); + super(); this.name = ko.observable(''); this.fullName = ''; diff --git a/dev/Model/Identity.js b/dev/Model/Identity.js index d66820888..c3c5e6349 100644 --- a/dev/Model/Identity.js +++ b/dev/Model/Identity.js @@ -8,7 +8,7 @@ class IdentityModel extends AbstractModel { * @param {string} email */ constructor(id, email) { - super('IdentityModel'); + super(); this.id = ko.observable(id || ''); this.email = ko.observable(email); diff --git a/dev/Model/Message.js b/dev/Model/Message.js index 620a3e5d8..093789745 100644 --- a/dev/Model/Message.js +++ b/dev/Model/Message.js @@ -29,7 +29,7 @@ const isArray = Array.isArray, class MessageModel extends AbstractModel { constructor() { - super('MessageModel'); + super(); this._reset(); diff --git a/dev/Model/OpenPgpKey.js b/dev/Model/OpenPgpKey.js index e69f20d84..ac9db2b94 100644 --- a/dev/Model/OpenPgpKey.js +++ b/dev/Model/OpenPgpKey.js @@ -17,7 +17,7 @@ class OpenPgpKeyModel extends AbstractModel { * @param {string} userID */ constructor(index, guID, ID, IDs, userIDs, emails, isPrivate, armor, userID) { - super('OpenPgpKeyModel'); + super(); this.index = index; this.id = ID; diff --git a/dev/Model/Template.js b/dev/Model/Template.js index b190f2443..4bf5e0689 100644 --- a/dev/Model/Template.js +++ b/dev/Model/Template.js @@ -11,7 +11,7 @@ class TemplateModel extends AbstractModel { * @param {string} body */ constructor(id, name, body) { - super('TemplateModel'); + super(); this.id = id; this.name = name;