diff --git a/.github/workflows/azure-backoffice.yml b/.github/workflows/azure-backoffice.yml index 61c1d5e4c1..919d81b877 100644 --- a/.github/workflows/azure-backoffice.yml +++ b/.github/workflows/azure-backoffice.yml @@ -4,6 +4,7 @@ on: push: branches: - main + - release/* - v*/dev - v*/main paths: @@ -15,6 +16,7 @@ on: types: [opened, synchronize, reopened, closed] branches: - main + - release/* - v*/dev - v*/main workflow_dispatch: diff --git a/src/Umbraco.Web.UI.Client/src/apps/backoffice/components/backoffice-header-sections.element.ts b/src/Umbraco.Web.UI.Client/src/apps/backoffice/components/backoffice-header-sections.element.ts index 407ca3fa7c..48cad6b43c 100644 --- a/src/Umbraco.Web.UI.Client/src/apps/backoffice/components/backoffice-header-sections.element.ts +++ b/src/Umbraco.Web.UI.Client/src/apps/backoffice/components/backoffice-header-sections.element.ts @@ -1,6 +1,5 @@ import { UMB_BACKOFFICE_CONTEXT } from '../backoffice.context.js'; import type { UmbBackofficeContext } from '../backoffice.context.js'; -import type { CSSResultGroup } from '@umbraco-cms/backoffice/external/lit'; import { css, customElement, html, ifDefined, repeat, state } from '@umbraco-cms/backoffice/external/lit'; import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { ManifestSection } from '@umbraco-cms/backoffice/section'; @@ -113,15 +112,13 @@ export class UmbBackofficeHeaderSectionsElement extends UmbLitElement { const label = this.localize.string(manifest?.meta.label || manifest?.name); return html` this.#onSectionClick(event, manifest)} - >${label}`; + @click=${(event: PointerEvent) => this.#onSectionClick(event, manifest)}>`; } - static override styles: CSSResultGroup = [ + static override readonly styles = [ css` :host { display: contents; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/router/router-slot/util/anchor.ts b/src/Umbraco.Web.UI.Client/src/packages/core/router/router-slot/util/anchor.ts index 267ff0283d..2b02f4e731 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/router/router-slot/util/anchor.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/router/router-slot/util/anchor.ts @@ -3,11 +3,13 @@ * that has a relative HREF, uses the history API instead. */ export function ensureAnchorHistory() { - const isWindows = navigator.platform.toUpperCase().indexOf('WIN') !== -1; + const isMac = /Mac|iPhone|iPad|iPod/.test(navigator.userAgent); window.addEventListener('click', (e: MouseEvent) => { - // If we try to open link in a new tab, then we want to skip skip: - if ((isWindows && e.ctrlKey) || (!isWindows && e.metaKey)) return; + // If we try to open link in a new tab, we want to skip: + // - Mac uses Meta (⌘) + Click + // - Windows and Linux use Ctrl + Click + if ((isMac && e.metaKey) || (!isMac && e.ctrlKey)) return; // Find the target by using the composed path to get the element through the shadow boundaries. // Support both HTML anchor tags and SVG anchor tags