From 48fbe7af776b7de0e96ffb7a278ba6ca03a62cc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Wed, 3 Jul 2024 09:17:58 +0200 Subject: [PATCH] stylesheet update condition # Conflicts: # src/packages/block/block-grid/components/block-grid-entries/block-grid-entries.element.ts # Conflicts: # src/packages/block/block-grid/components/block-grid-areas-container/block-grid-areas-container.element.ts # src/packages/block/block-grid/components/block-grid-entries/block-grid-entries.element.ts --- .../block-grid-areas-container.element.ts | 6 +++--- .../block-grid-entries/block-grid-entries.element.ts | 7 +++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-areas-container/block-grid-areas-container.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-areas-container/block-grid-areas-container.element.ts index 5ae922f31f..1f93598b92 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-areas-container/block-grid-areas-container.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-areas-container/block-grid-areas-container.element.ts @@ -46,10 +46,10 @@ export class UmbBlockGridAreasContainerElement extends UmbLitElement { manager.layoutStylesheet, (stylesheet) => { // Do not re-render stylesheet if its the same href. - if (!stylesheet || this._styleElement?.getAttribute('href') === stylesheet) return; + if (!stylesheet || this._styleElement?.href === stylesheet) return; this._styleElement = document.createElement('link'); - this._styleElement.setAttribute('rel', 'stylesheet'); - this._styleElement.setAttribute('href', stylesheet); + this._styleElement.rel = 'stylesheet'; + this._styleElement.href = stylesheet; }, 'observeStylesheet', ); diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-entries/block-grid-entries.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-entries/block-grid-entries.element.ts index f4faf8dbe2..9ce184c1be 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-entries/block-grid-entries.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-entries/block-grid-entries.element.ts @@ -209,11 +209,10 @@ export class UmbBlockGridEntriesElement extends UmbFormControlMixin(UmbLitElemen this.observe( manager.layoutStylesheet, (stylesheet) => { - if (!stylesheet) return; - if (this._styleElement?.href === stylesheet) return; + if (!stylesheet || this._styleElement?.href === stylesheet) return; this._styleElement = document.createElement('link'); - this._styleElement.setAttribute('rel', 'stylesheet'); - this._styleElement.setAttribute('href', stylesheet); + this._styleElement.rel = 'stylesheet'; + this._styleElement.href = stylesheet; }, 'observeStylesheet', );