jpf 4.2.3 → 4.2.5

package/dist/controls/html/Button/Button.js

@@ -1,31 +1,31 @@
 import { unwrap, isSubscribable } from "knockout";
-import { ViewModel, extendOptions } from "../../../framework/ViewModel";
+import { ViewModel, extendProperties } from "../../../framework/ViewModel";
 import { View, getView, registerView } from "../../../framework/View";
 export class ButtonViewModel extends ViewModel {
-    constructor(options) {
-        super(options);
-        this.content = options.content;
+    constructor(properties) {
+        super(properties);
+        this.content = properties.content;
     }
     content;
 }
 export class ButtonView extends View {
-    constructor(options) {
+    constructor(properties) {
         super({
             tagName: "button",
-            options: extendOptions({
+            properties: extendProperties({
                 viewType: "Button"
-            }, options)
+            }, properties)
         });
     }
     build() {
         super.build();
-        const viewModel = this.options;
+        const viewModel = this.properties;
         if (viewModel.content) {
             if (isSubscribable(viewModel.content)) {
                 this.buildContent(unwrap(viewModel.content));
-                viewModel.content.subscribe((content) => {
+                this.subscriptions.push(viewModel.content.subscribe((content) => {
                     this.buildContent(content);
-                });
+                }));
             }
             else {
                 this.buildContent(viewModel.content);
@@ -44,8 +44,8 @@ export class ButtonView extends View {
         }
     }
 }
-export function buttonView(options) {
-    return new ButtonView(options);
+export function buttonView(properties) {
+    return new ButtonView(properties);
 }
 registerView(ButtonViewModel, ButtonView);
 //# sourceMappingURL=Button.js.map

package/dist/controls/html/Button/Button.js.map

@@ -1 +1 @@
-{"version":3,"file":"Button.js","sourceRoot":"","sources":["../../../../src/controls/html/Button/Button.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAgB,cAAc,EAAE,MAAM,UAAU,CAAC;AAChE,OAAO,EAAE,SAAS,EAAoB,aAAa,EAAE,MAAM,8BAA8B,CAAA;AACzF,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAMtE,MAAM,OAAO,eAAgB,SAAQ,SAAS;IAC1C,YAAY,OAA+B;QACvC,KAAK,CAAC,OAAO,CAAC,CAAC;QAEf,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IACnC,CAAC;IAEQ,OAAO,CAAwD;CAC3E;AAED,MAAM,OAAO,UAAW,SAAQ,IAA4B;IACxD,YAAY,OAA+B;QACvC,KAAK,CACD;YACI,OAAO,EAAE,QAAQ;YACjB,OAAO,EAAE,aAAa,CAClB;gBACI,QAAQ,EAAE,QAAQ;aACrB,EACD,OAAO,CACV;SACJ,CACJ,CAAC;IACN,CAAC;IAED,KAAK;QACD,KAAK,CAAC,KAAK,EAAE,CAAC;QAEd,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC;QAC/B,IAAI,SAAS,CAAC,OAAO,EAAE;YACnB,IAAI,cAAc,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE;gBACnC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;gBAC7C,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,EAAE;oBACpC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;gBAC/B,CAAC,CAAC,CAAC;aACN;iBAAM;gBACH,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;aACxC;SACJ;IACL,CAAC;IAEO,YAAY,CAAC,OAA2B;QAC5C,IAAI,OAAO,IAAI,IAAI,IAAI,OAAO,KAAK,SAAS,EAAE;YAC1C,IAAI,CAAC,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC;SACjC;aACI,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;YAClC,IAAI,CAAC,OAAO,CAAC,SAAS,GAAG,OAAO,CAAC;SACpC;aACI,IAAI,OAAO,YAAY,SAAS,EAAE;YACnC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,OAAoB,CAAC,CAAC,CAAC;SACnD;IACL,CAAC;CACJ;AAED,MAAM,UAAU,UAAU,CAAC,OAA+B;IACtD,OAAO,IAAI,UAAU,CAAC,OAAO,CAAC,CAAC;AACnC,CAAC;AAED,YAAY,CACR,eAAe,EACf,UAAU,CACb,CAAC"}
+{"version":3,"file":"Button.js","sourceRoot":"","sources":["../../../../src/controls/html/Button/Button.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAgB,cAAc,EAAE,MAAM,UAAU,CAAC;AAChE,OAAO,EAAE,SAAS,EAAc,gBAAgB,EAAC,MAAM,8BAA8B,CAAA;AACrF,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAMtE,MAAM,OAAO,eAAgB,SAAQ,SAAS;IAC1C,YAAY,UAA4B;QACpC,KAAK,CAAC,UAAU,CAAC,CAAC;QAElB,IAAI,CAAC,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC;IACtC,CAAC;IAEQ,OAAO,CAAwD;CAC3E;AAED,MAAM,OAAO,UAAW,SAAQ,IAAsB;IAClD,YAAY,UAA4B;QACpC,KAAK,CACD;YACI,OAAO,EAAE,QAAQ;YACjB,UAAU,EAAE,gBAAgB,CACxB;gBACI,QAAQ,EAAE,QAAQ;aACrB,EACD,UAAU,CACb;SACJ,CACJ,CAAC;IACN,CAAC;IAED,KAAK;QACD,KAAK,CAAC,KAAK,EAAE,CAAC;QAEd,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC;QAClC,IAAI,SAAS,CAAC,OAAO,EAAE;YACnB,IAAI,cAAc,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE;gBACnC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;gBAC7C,IAAI,CAAC,aAAa,CAAC,IAAI,CACnB,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,EAAE;oBACpC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;gBAC/B,CAAC,CAAC,CACL,CAAC;aACL;iBAAM;gBACH,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;aACxC;SACJ;IACL,CAAC;IAEO,YAAY,CAAC,OAA2B;QAC5C,IAAI,OAAO,IAAI,IAAI,IAAI,OAAO,KAAK,SAAS,EAAE;YAC1C,IAAI,CAAC,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC;SACjC;aACI,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;YAClC,IAAI,CAAC,OAAO,CAAC,SAAS,GAAG,OAAO,CAAC;SACpC;aACI,IAAI,OAAO,YAAY,SAAS,EAAE;YACnC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,OAAoB,CAAC,CAAC,CAAC;SACnD;IACL,CAAC;CACJ;AAED,MAAM,UAAU,UAAU,CAAC,UAA4B;IACnD,OAAO,IAAI,UAAU,CAAC,UAAU,CAAC,CAAC;AACtC,CAAC;AAED,YAAY,CACR,eAAe,EACf,UAAU,CACb,CAAC"}

package/dist/controls/html/Div/Div.d.ts

@@ -1,14 +1,12 @@
 import { View, IView } from "../../../framework/View";
-import { ViewModelOptions, ViewModel } from "../../../framework/ViewModel";
+import { Properties, ViewModel } from "../../../framework/ViewModel";
 import { Subscribable } from "knockout";
-export interface DivViewModelOptions extends ViewModelOptions {
-}
-export interface DivViewOptions extends DivViewModelOptions {
+export interface DivProperties extends Properties {
     children?: Array<IView> | Subscribable<Array<IView>>;
 }
-export declare class DivView extends View<DivViewOptions> {
-    constructor(options: DivViewOptions);
+export declare class DivView extends View<DivProperties> {
+    constructor(properties: DivProperties);
 }
-export declare function divView(options: DivViewModelOptions): DivView;
-export declare class DivViewModel extends ViewModel implements DivViewModelOptions {
+export declare function divView(properties: DivProperties): DivView;
+export declare class DivViewModel extends ViewModel implements Properties {
 }

package/dist/controls/html/Div/Div.js

@@ -1,18 +1,18 @@
 import { View, registerView } from "../../../framework/View";
-import { extendOptions, ViewModel } from "../../../framework/ViewModel";
+import { extendProperties, ViewModel } from "../../../framework/ViewModel";
 export class DivView extends View {
-    constructor(options) {
+    constructor(properties) {
         super({
             tagName: "div",
-            options: extendOptions({
+            properties: extendProperties({
                 viewType: "Div"
-            }, options),
-            children: options.children
+            }, properties),
+            children: properties.children
         });
     }
 }
-export function divView(options) {
-    return new DivView(options);
+export function divView(properties) {
+    return new DivView(properties);
 }
 export class DivViewModel extends ViewModel {
 }

package/dist/controls/html/Div/Div.js.map

@@ -1 +1 @@
-{"version":3,"file":"Div.js","sourceRoot":"","sources":["../../../../src/controls/html/Div/Div.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAS,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACpE,OAAO,EAAoB,aAAa,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAW1F,MAAM,OAAO,OAAQ,SAAQ,IAAoB;IAC7C,YAAY,OAAuB;QAC/B,KAAK,CACD;YACI,OAAO,EAAE,KAAK;YACd,OAAO,EAAE,aAAa,CAClB;gBACI,QAAQ,EAAE,KAAK;aAClB,EACD,OAAO,CACV;YACD,QAAQ,EAAE,OAAO,CAAC,QAAQ;SAC7B,CACJ,CAAC;IACN,CAAC;CACJ;AAED,MAAM,UAAU,OAAO,CAAC,OAA4B;IAChD,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;AAChC,CAAC;AAED,MAAM,OAAO,YAAa,SAAQ,SAAS;CAE1C;AAED,YAAY,CACR,YAAY,EACZ,OAAO,CACV,CAAA"}
+{"version":3,"file":"Div.js","sourceRoot":"","sources":["../../../../src/controls/html/Div/Div.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAS,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACpE,OAAO,EAAe,gBAAgB,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAOxF,MAAM,OAAO,OAAQ,SAAQ,IAAmB;IAC5C,YAAY,UAAyB;QACjC,KAAK,CACD;YACI,OAAO,EAAE,KAAK;YACd,UAAU,EAAE,gBAAgB,CACxB;gBACI,QAAQ,EAAE,KAAK;aAClB,EACD,UAAU,CACb;YACD,QAAQ,EAAE,UAAU,CAAC,QAAQ;SAChC,CACJ,CAAC;IACN,CAAC;CACJ;AAED,MAAM,UAAU,OAAO,CAAC,UAAyB;IAC7C,OAAO,IAAI,OAAO,CAAC,UAAU,CAAC,CAAC;AACnC,CAAC;AAED,MAAM,OAAO,YAAa,SAAQ,SAAS;CAE1C;AAED,YAAY,CACR,YAAY,EACZ,OAAO,CACV,CAAA"}

package/dist/controls/html/Image/Image.d.ts

@@ -1,15 +1,15 @@
 import { View } from "../../../framework/View";
-import { ViewModel, ViewModelOptions } from "../../../framework/ViewModel";
+import { ViewModel, Properties } from "../../../framework/ViewModel";
 import { Subscribable } from "knockout";
-export interface ImageViewModelOptions extends ViewModelOptions {
+export interface ImageProperties extends Properties {
     src: string | Subscribable<string>;
     alt: string | Subscribable<string>;
 }
-export declare class ImageView extends View<ImageViewModelOptions> {
-    constructor(options: ImageViewModelOptions);
+export declare class ImageView extends View<ImageProperties> {
+    constructor(properties: ImageProperties);
 }
-export declare function imageView(options: ImageViewModelOptions): ImageView;
-export declare class ImageViewModel extends ViewModel implements ImageViewModelOptions {
+export declare function imageView(properties: ImageProperties): ImageView;
+export declare class ImageViewModel extends ViewModel implements ImageProperties {
     src: string | Subscribable<string>;
     alt: string | Subscribable<string>;
 }

package/dist/controls/html/Image/Image.js

@@ -1,21 +1,21 @@
 import { View, registerView } from "../../../framework/View";
-import { ViewModel, extendOptions } from "../../../framework/ViewModel";
+import { ViewModel, extendProperties } from "../../../framework/ViewModel";
 export class ImageView extends View {
-    constructor(options) {
+    constructor(properties) {
         super({
             tagName: "img",
-            options: extendOptions({
+            properties: extendProperties({
                 viewType: "Image",
                 attributes: {
-                    src: options.src,
-                    alt: options.alt
+                    src: properties.src,
+                    alt: properties.alt
                 }
-            }, options)
+            }, properties)
         });
     }
 }
-export function imageView(options) {
-    return new ImageView(options);
+export function imageView(properties) {
+    return new ImageView(properties);
 }
 export class ImageViewModel extends ViewModel {
     src;

package/dist/controls/html/Image/Image.js.map

@@ -1 +1 @@
-{"version":3,"file":"Image.js","sourceRoot":"","sources":["../../../../src/controls/html/Image/Image.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,SAAS,EAAoB,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAQ1F,MAAM,OAAO,SAAU,SAAQ,IAA2B;IACtD,YAAY,OAA8B;QACtC,KAAK,CACD;YACI,OAAO,EAAE,KAAK;YACd,OAAO,EAAE,aAAa,CAClB;gBACI,QAAQ,EAAE,OAAO;gBACjB,UAAU,EAAE;oBACR,GAAG,EAAE,OAAO,CAAC,GAAG;oBAChB,GAAG,EAAE,OAAO,CAAC,GAAG;iBACnB;aACJ,EACD,OAAO,CACV;SACJ,CACJ,CAAC;IACN,CAAC;CACJ;AAED,MAAM,UAAU,SAAS,CAAC,OAA8B;IACpD,OAAO,IAAI,SAAS,CAAC,OAAO,CAAC,CAAC;AAClC,CAAC;AAED,MAAM,OAAO,cAAe,SAAQ,SAAS;IACzC,GAAG,CAAgC;IACnC,GAAG,CAAgC;CACtC;AAED,YAAY,CACR,cAAc,EACd,SAAS,CACZ,CAAC"}
+{"version":3,"file":"Image.js","sourceRoot":"","sources":["../../../../src/controls/html/Image/Image.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,SAAS,EAAc,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAQvF,MAAM,OAAO,SAAU,SAAQ,IAAqB;IAChD,YAAY,UAA2B;QACnC,KAAK,CACD;YACI,OAAO,EAAE,KAAK;YACd,UAAU,EAAE,gBAAgB,CACxB;gBACI,QAAQ,EAAE,OAAO;gBACjB,UAAU,EAAE;oBACR,GAAG,EAAE,UAAU,CAAC,GAAG;oBACnB,GAAG,EAAE,UAAU,CAAC,GAAG;iBACtB;aACJ,EACD,UAAU,CACb;SACJ,CACJ,CAAC;IACN,CAAC;CACJ;AAED,MAAM,UAAU,SAAS,CAAC,UAA2B;IACjD,OAAO,IAAI,SAAS,CAAC,UAAU,CAAC,CAAC;AACrC,CAAC;AAED,MAAM,OAAO,cAAe,SAAQ,SAAS;IACzC,GAAG,CAAgC;IACnC,GAAG,CAAgC;CACtC;AAED,YAAY,CACR,cAAc,EACd,SAAS,CACZ,CAAC"}

package/dist/controls/html/Input/Input.d.ts

@@ -1,14 +1,14 @@
 import { View } from "../../../framework/View";
-import { ViewModel, ViewModelOptions } from "../../../framework/ViewModel";
+import { ViewModel, Properties } from "../../../framework/ViewModel";
 import { ObservableProperty } from "../../../framework/observable";
 export type InputType = "text" | "checkbox" | "file" | "integer" | "float" | "range" | "radio";
 export declare enum ValueUpdateModeEnum {
     OnChange = 1,
     OnInput = 2
 }
-export interface InputViewModelOptions<TValue> extends ViewModelOptions {
+export interface InputProperties<TValue> extends Properties {
     value?: TValue | ObservableProperty<TValue>;
-    inputValidator?: (event: Event, inputViewModel: InputViewModelOptions<TValue>, value: string) => Promise<boolean>;
+    inputValidator?: (event: Event, inputViewModel: InputProperties<TValue>, value: string) => Promise<boolean>;
     placeholder?: string | ObservableProperty<string>;
     valueUpdateMode?: ValueUpdateModeEnum;
     min?: number;
@@ -17,31 +17,31 @@ export interface InputViewModelOptions<TValue> extends ViewModelOptions {
     type?: InputType;
 }
 declare abstract class InputViewModel<TValue> extends ViewModel {
-    protected constructor(inputType: InputType, options?: InputViewModelOptions<TValue>);
+    protected constructor(inputType: InputType, properties?: InputProperties<TValue>);
     readonly value: ObservableProperty<TValue>;
-    readonly inputValidator: (event: Event, inputViewModel: InputViewModelOptions<TValue>, value: string) => Promise<boolean>;
+    readonly inputValidator: (event: Event, inputViewModel: InputProperties<TValue>, value: string) => Promise<boolean>;
     readonly placeholder: ObservableProperty<string>;
     readonly valueUpdateMode: ValueUpdateModeEnum;
     readonly type: InputType;
 }
 export declare class InputTextViewModel extends InputViewModel<string> {
-    constructor(options?: InputViewModelOptions<string>);
+    constructor(properties?: InputProperties<string>);
 }
 export declare class InputCheckboxViewModel extends InputViewModel<boolean> {
-    constructor(options?: InputViewModelOptions<boolean>);
+    constructor(properties?: InputProperties<boolean>);
 }
 export declare class InputFileViewModel extends InputViewModel<FileList> {
-    constructor(options?: InputViewModelOptions<FileList>);
+    constructor(properties?: InputProperties<FileList>);
 }
 export declare class InputIntegerViewModel extends InputViewModel<number> {
-    constructor(options?: InputViewModelOptions<number>);
+    constructor(properties?: InputProperties<number>);
 }
 export declare class InputFloatViewModel extends InputViewModel<number> {
-    constructor(options?: InputViewModelOptions<number>);
+    constructor(properties?: InputProperties<number>);
 }
-export declare class InputView<TValue> extends View<InputViewModelOptions<TValue>> {
-    constructor(options: InputViewModelOptions<TValue>);
+export declare class InputView<TValue> extends View<InputProperties<TValue>> {
+    constructor(properties: InputProperties<TValue>);
     protected build(): void;
 }
-export declare function inputView<TValue>(options: InputViewModelOptions<TValue>): InputView<TValue>;
+export declare function inputView<TValue>(properties: InputProperties<TValue>): InputView<TValue>;
 export {};

package/dist/controls/html/Input/Input.js

@@ -1,6 +1,6 @@
 import { isSubscribable, unwrap, isObservable } from "knockout";
 import { View, registerView } from "../../../framework/View";
-import { ViewModel, extendOptions, isNullOrUndefined } from "../../../framework/ViewModel";
+import { ViewModel, extendProperties, isNullOrUndefined } from "../../../framework/ViewModel";
 import { observableProperty, isObservableProperty } from "../../../framework/observable";
 import { isInteger } from "../../../utilities/integer/integer";
 import { isFloat } from "../../../utilities/float/float";
@@ -10,19 +10,19 @@ export var ValueUpdateModeEnum;
     ValueUpdateModeEnum[ValueUpdateModeEnum["OnInput"] = 2] = "OnInput";
 })(ValueUpdateModeEnum || (ValueUpdateModeEnum = {}));
 class InputViewModel extends ViewModel {
-    constructor(inputType, options) {
-        super(options);
-        if (options) {
-            if (isObservableProperty(options.value)) {
-                this.value = options.value;
+    constructor(inputType, properties) {
+        super(properties);
+        if (properties) {
+            if (isObservableProperty(properties.value)) {
+                this.value = properties.value;
             }
             else {
-                this.value = observableProperty(options.value);
+                this.value = observableProperty(properties.value);
             }
-            this.inputValidator = options.inputValidator;
-            this.placeholder = options.placeholder;
-            this.valueUpdateMode = options.valueUpdateMode;
-            this.type = options.type;
+            this.inputValidator = properties.inputValidator;
+            this.placeholder = properties.placeholder;
+            this.valueUpdateMode = properties.valueUpdateMode;
+            this.type = properties.type;
         }
         this.type = inputType;
     }
@@ -33,43 +33,43 @@ class InputViewModel extends ViewModel {
     type;
 }
 export class InputTextViewModel extends InputViewModel {
-    constructor(options) {
-        super("text", options);
+    constructor(properties) {
+        super("text", properties);
     }
 }
 export class InputCheckboxViewModel extends InputViewModel {
-    constructor(options) {
-        super("checkbox", options);
+    constructor(properties) {
+        super("checkbox", properties);
     }
 }
 export class InputFileViewModel extends InputViewModel {
-    constructor(options) {
-        super("file", options);
+    constructor(properties) {
+        super("file", properties);
     }
 }
 export class InputIntegerViewModel extends InputViewModel {
-    constructor(options) {
-        super("integer", options);
+    constructor(properties) {
+        super("integer", properties);
     }
 }
 export class InputFloatViewModel extends InputViewModel {
-    constructor(options) {
-        super("float", options);
+    constructor(properties) {
+        super("float", properties);
     }
 }
 export class InputView extends View {
-    constructor(options) {
+    constructor(properties) {
         super({
             tagName: "input",
-            options: extendOptions({
+            properties: extendProperties({
                 viewType: "Input"
-            }, options)
+            }, properties)
         });
     }
     build() {
         super.build();
         const element = this.element;
-        const viewModel = this.options;
+        const viewModel = this.properties;
         if (!viewModel.valueUpdateMode) {
             viewModel.valueUpdateMode = ValueUpdateModeEnum.OnChange;
         }
@@ -88,9 +88,9 @@ export class InputView extends View {
             case "checkbox":
                 input.checked = unwrap(viewModel.value);
                 if (isObservable(viewModel.value)) {
-                    viewModel.value.subscribe((value) => {
+                    this.subscriptions.push(viewModel.value.subscribe((value) => {
                         input.checked = value;
-                    });
+                    }));
                 }
                 break;
             case "file":
@@ -98,9 +98,9 @@ export class InputView extends View {
             case "radio":
                 input.checked = input.value === unwrap(viewModel.value);
                 if (isSubscribable(viewModel.value)) {
-                    viewModel.value.subscribe((value) => {
+                    this.subscriptions.push(viewModel.value.subscribe((value) => {
                         input.checked = input.value === value;
-                    });
+                    }));
                 }
                 break;
             default:
@@ -109,9 +109,9 @@ export class InputView extends View {
                     input.value = value;
                 }
                 if (isObservable(viewModel.value)) {
-                    viewModel.value.subscribe((value) => {
+                    this.subscriptions.push(viewModel.value.subscribe((value) => {
                         input.value = value;
-                    });
+                    }));
                 }
         }
         const placeholder = unwrap(viewModel.placeholder);
@@ -119,19 +119,19 @@ export class InputView extends View {
             input.placeholder = placeholder;
         }
         if (isSubscribable(viewModel.placeholder)) {
-            viewModel.placeholder.subscribe((placeholder) => {
+            this.subscriptions.push(viewModel.placeholder.subscribe((placeholder) => {
                 if (placeholder) {
                     input.placeholder = placeholder;
                 }
                 else {
                     input.removeAttribute("placeholder");
                 }
-            });
+            }));
         }
-        if (this.options.valueUpdateMode === ValueUpdateModeEnum.OnChange) {
+        if (this.properties.valueUpdateMode === ValueUpdateModeEnum.OnChange) {
             this.element.addEventListener("change", handleEvent);
         }
-        if (this.options.valueUpdateMode === ValueUpdateModeEnum.OnInput || viewModel.inputValidator) {
+        if (this.properties.valueUpdateMode === ValueUpdateModeEnum.OnInput || viewModel.inputValidator) {
             this.element.addEventListener("input", handleEvent);
         }
         async function handleEvent(event) {
@@ -198,8 +198,8 @@ export class InputView extends View {
         }
     }
 }
-export function inputView(options) {
-    return new InputView(options);
+export function inputView(properties) {
+    return new InputView(properties);
 }
 registerView(InputTextViewModel, InputView);
 registerView(InputCheckboxViewModel, InputView);

package/dist/controls/html/Input/Input.js.map

@@ -1 +1 @@
-{"version":3,"file":"Input.js","sourceRoot":"","sources":["../../../../src/controls/html/Input/Input.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Input.js","sourceRoot":"","sources":["../../../../src/controls/html/Input/Input.ts"],"names":[],"mappings":"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"}

package/dist/controls/html/Select/Select.d.ts

@@ -1,30 +1,30 @@
 import { View } from "../../../framework/View";
-import { ViewModel, ViewModelOptions } from "../../../framework/ViewModel";
+import { ViewModel, Properties } from "../../../framework/ViewModel";
 import { ObservableProperty, ObservableArrayProperty } from "../../../framework/observable";
-export interface SelectViewModelOptions<TItem, TValue, TSetter = TValue> extends ViewModelOptions {
+export interface SelectProperties<TItem, TValue, TSetter = TValue> extends Properties {
     value?: TValue | ObservableProperty<TValue, TSetter>;
     items?: Array<TItem> | ObservableArrayProperty<TItem>;
     textFunction: (item: TItem) => string;
     valueFunction: (item: TItem) => TValue;
     setFunction?: (item: TItem) => TSetter;
-    inputValidator?: (event: Event, selectViewModel: SelectViewModelOptions<TItem, TValue, TSetter>, value: TValue) => Promise<boolean>;
+    inputValidator?: (event: Event, selectViewModel: SelectProperties<TItem, TValue, TSetter>, value: TValue) => Promise<boolean>;
     emptyItemText?: string;
 }
 export declare class SelectViewModel<TItem, TValue, TSetter = TValue> extends ViewModel {
-    constructor(options?: SelectViewModelOptions<TItem, TValue, TSetter>);
+    constructor(propeties?: SelectProperties<TItem, TValue, TSetter>);
     readonly value: ObservableProperty<TValue, TSetter>;
     readonly items: ObservableArrayProperty<TItem>;
     readonly textFunction: (item: TItem) => string;
     readonly valueFunction: (item: TItem) => TValue;
     readonly setFunction: (item?: TItem) => TSetter;
-    readonly inputValidator: (event: Event, inputViewModel: SelectViewModelOptions<TItem, TValue, TSetter>, value: TValue) => Promise<boolean>;
+    readonly inputValidator: (event: Event, inputViewModel: SelectProperties<TItem, TValue, TSetter>, value: TValue) => Promise<boolean>;
     readonly emptyItemText: string;
 }
-export declare class SelectView<TItem, TValue, TSetter = TValue> extends View<SelectViewModelOptions<TItem, TValue, TSetter>> {
-    constructor(options: SelectViewModelOptions<TItem, TValue, TSetter>);
+export declare class SelectView<TItem, TValue, TSetter = TValue> extends View<SelectProperties<TItem, TValue, TSetter>> {
+    constructor(properties: SelectProperties<TItem, TValue, TSetter>);
     protected build(): void;
     private itemDictionary;
     private setItems;
     private setSelectedValue;
 }
-export declare function selectView<TItem, TValue, TSetter = TValue>(options: SelectViewModelOptions<TItem, TValue, TSetter>): SelectView<TItem, TValue, TSetter>;
+export declare function selectView<TItem, TValue, TSetter = TValue>(properties: SelectProperties<TItem, TValue, TSetter>): SelectView<TItem, TValue, TSetter>;

package/dist/controls/html/Select/Select.js

@@ -1,28 +1,28 @@
 import { unwrap, isSubscribable } from "knockout";
 import { View, registerView } from "../../../framework/View";
-import { ViewModel, extendOptions } from "../../../framework/ViewModel";
+import { ViewModel, extendProperties } from "../../../framework/ViewModel";
 import { isObservableProperty, observableArrayProperty, observableProperty } from "../../../framework/observable";
 export class SelectViewModel extends ViewModel {
-    constructor(options) {
-        super(options);
-        if (options) {
-            this.textFunction = options.textFunction;
-            this.valueFunction = options.valueFunction;
-            this.setFunction = options.setFunction;
-            this.inputValidator = options.inputValidator;
-            if (isObservableProperty(options.value)) {
-                this.value = options.value;
+    constructor(propeties) {
+        super(propeties);
+        if (propeties) {
+            this.textFunction = propeties.textFunction;
+            this.valueFunction = propeties.valueFunction;
+            this.setFunction = propeties.setFunction;
+            this.inputValidator = propeties.inputValidator;
+            if (isObservableProperty(propeties.value)) {
+                this.value = propeties.value;
             }
             else {
-                this.value = observableProperty(options.value);
+                this.value = observableProperty(propeties.value);
             }
-            if (isObservableProperty(options.items)) {
-                this.items = options.items;
+            if (isObservableProperty(propeties.items)) {
+                this.items = propeties.items;
             }
             else {
-                this.items = observableArrayProperty(options.items);
+                this.items = observableArrayProperty(propeties.items);
             }
-            this.emptyItemText = options.emptyItemText;
+            this.emptyItemText = propeties.emptyItemText;
         }
     }
     value;
@@ -34,29 +34,29 @@ export class SelectViewModel extends ViewModel {
     emptyItemText;
 }
 export class SelectView extends View {
-    constructor(options) {
+    constructor(properties) {
         super({
             tagName: "select",
-            options: extendOptions({
+            properties: extendProperties({
                 viewType: "Select"
-            }, options)
+            }, properties)
         });
     }
     build() {
         super.build();
         const select = this.element;
-        const viewModel = this.options;
+        const viewModel = this.properties;
         this.setItems(unwrap(viewModel.items));
         if (isSubscribable(viewModel.items)) {
-            viewModel.items.subscribe((items) => {
+            this.subscriptions.push(viewModel.items.subscribe((items) => {
                 this.setItems(items);
-            });
+            }));
         }
         this.setSelectedValue(unwrap(viewModel.value));
         if (isSubscribable(viewModel.value)) {
-            viewModel.value.subscribe((value) => {
+            this.subscriptions.push(viewModel.value.subscribe((value) => {
                 this.setSelectedValue(value);
-            });
+            }));
         }
         this.element.addEventListener("change", async (event) => {
             let selectedValue = select.value;
@@ -66,7 +66,7 @@ export class SelectView extends View {
             }
             else {
                 selectedItem = this.itemDictionary[selectedValue.toString()];
-                selectedValue = this.options.valueFunction(selectedItem);
+                selectedValue = this.properties.valueFunction(selectedItem);
             }
             if (viewModel.inputValidator) {
                 if (!await viewModel.inputValidator(event, viewModel, selectedValue)) {
@@ -93,18 +93,18 @@ export class SelectView extends View {
             if (items) {
                 const select = this.element;
                 select.innerHTML = null;
-                if (this.options.emptyItemText) {
+                if (this.properties.emptyItemText) {
                     const emptyOption = document.createElement("option");
                     emptyOption.value = "";
-                    emptyOption.text = this.options.emptyItemText;
+                    emptyOption.text = this.properties.emptyItemText;
                     select.options.add(emptyOption);
                 }
                 items.forEach((item) => {
-                    const value = this.options.valueFunction(item).toString();
+                    const value = this.properties.valueFunction(item).toString();
                     this.itemDictionary[value] = item;
                     var option = document.createElement("option");
                     option.value = value;
-                    option.text = this.options.textFunction(item);
+                    option.text = this.properties.textFunction(item);
                     select.options.add(option);
                 });
             }
@@ -122,8 +122,8 @@ export class SelectView extends View {
         }
     }
 }
-export function selectView(options) {
-    return new SelectView(options);
+export function selectView(properties) {
+    return new SelectView(properties);
 }
 registerView(SelectViewModel, SelectView);
 //# sourceMappingURL=Select.js.map

package/dist/controls/html/Select/Select.js.map

@@ -1 +1 @@
-{"version":3,"file":"Select.js","sourceRoot":"","sources":["../../../../src/controls/html/Select/Select.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Select.js","sourceRoot":"","sources":["../../../../src/controls/html/Select/Select.ts"],"names":[],"mappings":"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"}