this.addObservables() to addObservablesTo()

This commit is contained in:
the-djmaze
2022-10-30 22:19:52 +01:00
parent 839ebfb350
commit 7fac6ca9dd
30 changed files with 78 additions and 58 deletions

View File

@@ -1,4 +1,5 @@
import { AbstractModel } from 'Knoin/AbstractModel';
import { addObservablesTo } from 'External/ko';
export class AccountModel extends AbstractModel {
/**
@@ -11,7 +12,7 @@ export class AccountModel extends AbstractModel {
this.email = email;
this.addObservables({
addObservablesTo(this, {
// count: count || 0,
askDelete: false,
isAdditional: isAdditional

View File

@@ -7,6 +7,7 @@ import {
} from 'Common/Links';
import { AbstractModel } from 'Knoin/AbstractModel';
import { addObservablesTo } from 'External/ko';
import { SMAudio } from 'Common/Audio';
@@ -30,7 +31,7 @@ export class AttachmentModel extends AbstractModel {
this.mimeIndex = '';
this.estimatedSize = 0;
this.addObservables({
addObservablesTo(this, {
isInline: false,
isLinked: false
});

View File

@@ -1,6 +1,7 @@
import { FileInfo } from 'Common/File';
import { AbstractModel } from 'Knoin/AbstractModel';
import { addObservablesTo, addComputablesTo } from 'External/ko';
export class ComposeAttachmentModel extends AbstractModel {
/**
@@ -22,7 +23,7 @@ export class ComposeAttachmentModel extends AbstractModel {
this.contentLocation = contentLocation;
this.fromMessage = false;
this.addObservables({
addObservablesTo(this, {
fileName: fileName,
size: size,
tempName: '',
@@ -35,7 +36,7 @@ export class ComposeAttachmentModel extends AbstractModel {
complete: false
});
this.addComputables({
addComputablesTo(this, {
progressText: () => {
const p = this.progress();
return 1 > p ? '' : (100 < p ? 100 : p) + '%';

View File

@@ -1,4 +1,5 @@
import { AbstractModel } from 'Knoin/AbstractModel';
import { addObservablesTo, addComputablesTo } from 'External/ko';
import { JCard } from 'DAV/JCard';
//import { VCardProperty } from 'DAV/VCardProperty';
@@ -80,7 +81,7 @@ export class ContactModel extends AbstractModel {
this.jCard = ['vcard',[]];
this.addObservables({
addObservablesTo(this, {
// Also used by Selector
focused: false,
selected: false,
@@ -113,7 +114,7 @@ export class ContactModel extends AbstractModel {
this.url = ko.observableArray();
this.adr = ko.observableArray();
this.addComputables({
addComputablesTo(this, {
fullName: () => [this.namePrefix(), this.givenName(), this.middleName(), this.surName()].join(' ').trim(),
display: () => {

View File

@@ -18,7 +18,7 @@ import { i18n, translateTrigger } from 'Common/Translator';
import { AbstractModel } from 'Knoin/AbstractModel';
import { koComputable } from 'External/ko';
import { koComputable, addObservablesTo } from 'External/ko';
//import { mailBox } from 'Common/Links';
@@ -234,7 +234,7 @@ export class FolderModel extends AbstractModel {
// this.id = null;
this.uidNext = null;
this.addObservables({
addObservablesTo(this, {
name: '',
type: FolderType.User,
selectable: false,

View File

@@ -1,4 +1,5 @@
import { AbstractModel } from 'Knoin/AbstractModel';
import { addObservablesTo } from 'External/ko';
export class IdentityModel extends AbstractModel {
/**
@@ -8,7 +9,7 @@ export class IdentityModel extends AbstractModel {
constructor(id, email) {
super();
this.addObservables({
addObservablesTo(this, {
id: id || '',
email: email,
name: '',

View File

@@ -7,6 +7,7 @@ import { doc, SettingsGet } from 'Common/Globals';
import { encodeHtml, plainToHtml, htmlToPlain, cleanHtml } from 'Common/Html';
import { arrayLength, forEachObjectEntry } from 'Common/Utils';
import { serverRequestRaw, proxy } from 'Common/Links';
import { addObservablesTo, addComputablesTo } from 'External/ko';
import { FolderUserStore, isAllowedKeyword } from 'Stores/User/Folder';
import { SettingsUserStore } from 'Stores/User/Settings';
@@ -65,7 +66,7 @@ export class MessageModel extends AbstractModel {
this._reset();
this.addObservables({
addObservablesTo(this, {
subject: '',
plain: '',
html: '',
@@ -108,7 +109,7 @@ export class MessageModel extends AbstractModel {
this.unsubsribeLinks = ko.observableArray();
this.flags = ko.observableArray();
this.addComputables({
addComputablesTo(this, {
attachmentIconClass: () => FileInfo.getAttachmentsIconClass(this.attachments()),
threadsLen: () => this.threads().length,
listAttachments: () => this.attachments()