From 6c2afa2dfc4023bf673896e929726bc371009028 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Wed, 17 May 2023 12:14:39 +0200 Subject: [PATCH] modal modals working --- src/Umbraco.Web.UI.Client/libs/modal/modal-handler.ts | 10 +++++++++- .../libs/modal/modal-route-registration.ts | 5 +++-- src/Umbraco.Web.UI.Client/libs/router/route.context.ts | 1 + .../input-data-type/input-data-type.element.ts | 2 +- ...cument-type-workspace-view-edit-property.element.ts | 3 +-- .../document-type-workspace-view-structure.element.ts | 1 - .../document-type-workspace-view-templates.element.ts | 2 -- .../tags/components/tags-input/tags-input.element.ts | 5 ----- .../workspace/partial-views-workspace-edit.element.ts | 1 - 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/libs/modal/modal-handler.ts b/src/Umbraco.Web.UI.Client/libs/modal/modal-handler.ts index 70f8a9e918..aff3b32cec 100644 --- a/src/Umbraco.Web.UI.Client/libs/modal/modal-handler.ts +++ b/src/Umbraco.Web.UI.Client/libs/modal/modal-handler.ts @@ -90,6 +90,9 @@ export class UmbModalHandlerClass { + this._submitRejecter?.(); + }); /** * @@ -97,6 +100,12 @@ export class UmbModalHandlerClass string; @@ -111,12 +111,13 @@ export class UmbModalRouteRegistration '/' + registration.generateModalPath() === this.#activeModalPath diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-data-type/input-data-type.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-data-type/input-data-type.element.ts index 99bf711456..5244958f38 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-data-type/input-data-type.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-data-type/input-data-type.element.ts @@ -81,7 +81,7 @@ export class UmbInputDataTypeElement extends FormControlMixin(UmbLitElement) { alias=${this._selectedPropertyEditorUI.alias} property-editor-model-alias=${this._selectedPropertyEditorUI.meta.propertyEditorModel} @open=${() => { - console.log('TO BE DONE..'); + console.warn('TO BE DONE..'); }} border> diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/views/design/document-type-workspace-view-edit-property.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/views/design/document-type-workspace-view-edit-property.element.ts index 69c018ec80..9671abed5e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/views/design/document-type-workspace-view-edit-property.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/views/design/document-type-workspace-view-edit-property.element.ts @@ -51,11 +51,10 @@ export class UmbDocumentTypeWorkspacePropertyElement extends UmbLitElement { this.#modalRegistration = new UmbModalRouteRegistrationController(this, UMB_PROPERTY_SETTINGS_MODAL) .addUniquePaths(['propertyId']) .onSetup(() => { - console.log(this.property); + console.log('UMB_PROPERTY_SETTINGS_MODAL setup!'); return this.property ?? false; }) .onSubmit((result) => { - console.log(result); this._partialUpdate(result); }) .observeRouteBuilder((routeBuilder) => { diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/views/structure/document-type-workspace-view-structure.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/views/structure/document-type-workspace-view-structure.element.ts index a66f4755ba..34406630c8 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/views/structure/document-type-workspace-view-structure.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/views/structure/document-type-workspace-view-structure.element.ts @@ -38,7 +38,6 @@ export class UmbDocumentTypeWorkspaceViewStructureElement this._allowedContentTypeIDs = allowedContentTypes ?.map((x) => x.id) .filter((x) => x !== undefined) as Array; - console.log('this._allowedContentTypeIDs', this._allowedContentTypeIDs); }); } diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/views/templates/document-type-workspace-view-templates.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/views/templates/document-type-workspace-view-templates.element.ts index 2fd020b997..77f4585bae 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/views/templates/document-type-workspace-view-templates.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/views/templates/document-type-workspace-view-templates.element.ts @@ -35,13 +35,11 @@ export class UmbDocumentTypeWorkspaceViewTemplatesElement (defaultTemplateId) => (this._defaultTemplateId = defaultTemplateId) ); this.observe(this.#workspaceContext.allowedTemplateIds, (allowedTemplateIds) => { - console.log('allowedTemplateIds', allowedTemplateIds); this._allowedTemplateIds = allowedTemplateIds; }); } #templateInputChange(e: CustomEvent) { - console.log('change', e); // save new allowed ids const input = e.target as UmbInputTemplateElement; const idsWithoutRoot = input.selectedIds.filter((id) => id !== null) as Array; diff --git a/src/Umbraco.Web.UI.Client/src/packages/tags/components/tags-input/tags-input.element.ts b/src/Umbraco.Web.UI.Client/src/packages/tags/components/tags-input/tags-input.element.ts index 0d0b0fd37c..4607499dd7 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/tags/components/tags-input/tags-input.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/tags/components/tags-input/tags-input.element.ts @@ -47,11 +47,6 @@ export class UmbTagsInputElement extends FormControlMixin(UmbLitElement) { #repository = new UmbTagRepository(this); - constructor() { - super(); - console.log('tags-input'); - } - public focus() { this._tagInput.focus(); } diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/workspace/partial-views-workspace-edit.element.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/workspace/partial-views-workspace-edit.element.ts index 8f7c0a3c88..872c47faa4 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/workspace/partial-views-workspace-edit.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/workspace/partial-views-workspace-edit.element.ts @@ -35,7 +35,6 @@ export class UmbPartialViewsWorkspaceEditElement extends UmbLitElement { // this.observe(this.#partialViewsWorkspaceContext.isNew, (isNew) => { // this.#isNew = !!isNew; - // console.log(this.#isNew); // }); }); }