From 8a9124f79c47183b4287520a6360e8084a67ab76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Thu, 3 Aug 2023 11:02:17 +0200 Subject: [PATCH] no need to support object with asObservable --- .../src/libs/class-api/class.mixin.ts | 13 ++----------- .../src/libs/element-api/element.mixin.ts | 15 +++------------ 2 files changed, 5 insertions(+), 23 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/libs/class-api/class.mixin.ts b/src/Umbraco.Web.UI.Client/src/libs/class-api/class.mixin.ts index a306982f67..8d8364766d 100644 --- a/src/Umbraco.Web.UI.Client/src/libs/class-api/class.mixin.ts +++ b/src/Umbraco.Web.UI.Client/src/libs/class-api/class.mixin.ts @@ -71,17 +71,8 @@ export const UmbClassMixin = (superClass: T) => { * @return {UmbObserverController} Reference to a Observer Controller instance * @memberof UmbElementMixin */ - observe( - source: Observable | { asObservable: () => Observable }, - callback: (_value: T) => void, - controllerAlias?: UmbControllerAlias - ) { - return new UmbObserverController( - this, - (source as any).asObservable ? (source as any).asObservable() : source, - callback, - controllerAlias - ); + observe(source: Observable, callback: (_value: T) => void, controllerAlias?: UmbControllerAlias) { + return new UmbObserverController(this, source, callback, controllerAlias); } /** diff --git a/src/Umbraco.Web.UI.Client/src/libs/element-api/element.mixin.ts b/src/Umbraco.Web.UI.Client/src/libs/element-api/element.mixin.ts index 8b59c0bae9..5f84628e5c 100644 --- a/src/Umbraco.Web.UI.Client/src/libs/element-api/element.mixin.ts +++ b/src/Umbraco.Web.UI.Client/src/libs/element-api/element.mixin.ts @@ -1,3 +1,4 @@ +import { UmbLocalizeController } from '@umbraco-cms/backoffice/localization-api'; import type { Observable } from '@umbraco-cms/backoffice/external/rxjs'; import type { HTMLElementConstructor } from '@umbraco-cms/backoffice/extension-api'; import { UmbControllerHostElementMixin } from '@umbraco-cms/backoffice/controller-api'; @@ -9,7 +10,6 @@ import { UmbContextProviderController, } from '@umbraco-cms/backoffice/context-api'; import { ObserverCallback, UmbObserverController } from '@umbraco-cms/backoffice/observable-api'; -import { UmbLocalizeController } from '@umbraco-cms/backoffice/localization-api'; import { property } from '@umbraco-cms/backoffice/external/lit'; export declare class UmbElement extends UmbControllerHostElement { @@ -47,17 +47,8 @@ export const UmbElementMixin = (superClass: T) * @return {UmbObserverController} Reference to a Observer Controller instance * @memberof UmbElementMixin */ - observe( - source: Observable | { asObservable: () => Observable }, - callback: ObserverCallback, - unique?: string - ) { - return new UmbObserverController( - this, - (source as any).asObservable ? (source as any).asObservable() : source, - callback, - unique - ); + observe(source: Observable, callback: ObserverCallback, unique?: string) { + return new UmbObserverController(this, source, callback, unique); } /**