diff --git a/src/Umbraco.Web.UI.Client/src/external/router-slot/util/anchor.ts b/src/Umbraco.Web.UI.Client/src/external/router-slot/util/anchor.ts index 437fd78afc..b0fff6303c 100644 --- a/src/Umbraco.Web.UI.Client/src/external/router-slot/util/anchor.ts +++ b/src/Umbraco.Web.UI.Client/src/external/router-slot/util/anchor.ts @@ -3,7 +3,12 @@ * that has a relative HREF, uses the history API instead. */ export function ensureAnchorHistory() { + const isWindows = navigator.platform.toUpperCase().indexOf('WIN') !== -1; + 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; + // Find the target by using the composed path to get the element through the shadow boundaries. const $anchor = (('composedPath' in e) as any) ? e.composedPath().find(($elem) => $elem instanceof HTMLAnchorElement) diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tree-picker/config/source-type-picker/property-editor-ui-tree-picker-source-type-picker.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tree-picker/config/source-type-picker/property-editor-ui-tree-picker-source-type-picker.element.ts index 7354007a01..16b11ffa40 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tree-picker/config/source-type-picker/property-editor-ui-tree-picker-source-type-picker.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editor/uis/tree-picker/config/source-type-picker/property-editor-ui-tree-picker-source-type-picker.element.ts @@ -1,5 +1,5 @@ import { UmbInputDocumentTypeElement } from '@umbraco-cms/backoffice/document-type'; -import { UmbMediaTypeInputElement } from '@umbraco-cms/backoffice/media-type'; +import { UmbInputMediaTypeElement } from '@umbraco-cms/backoffice/media-type'; import { UmbMemberTypeInputElement } from '@umbraco-cms/backoffice/member-type'; import type { UmbTreePickerSource } from '@umbraco-cms/backoffice/components'; import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry'; @@ -62,7 +62,7 @@ export class UmbPropertyEditorUITreePickerSourceTypePickerElement extends UmbLit this.value = (event.target).selectedIds; break; case 'media': - this.value = (event.target).selectedIds; + this.value = (event.target).selectedIds; break; case 'member': this.value = (event.target).selectedIds; @@ -98,9 +98,9 @@ export class UmbPropertyEditorUITreePickerSourceTypePickerElement extends UmbLit } #renderTypeMedia() { - return html``; + .selectedIds=${this.value || []}>`; } #renderTypeMember() { diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/components/index.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/components/index.ts index df9290d984..5952801b2b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/components/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/components/index.ts @@ -1,3 +1,3 @@ -import './media-type-input/media-type-input.element.js'; +import './input-media-type/input-media-type.element.js'; -export * from './media-type-input/media-type-input.element.js'; +export * from './input-media-type/input-media-type.element.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/components/media-type-input/media-type-input.context.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/components/input-media-type/input-media-type.context.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/media/media-types/components/media-type-input/media-type-input.context.ts rename to src/Umbraco.Web.UI.Client/src/packages/media/media-types/components/input-media-type/input-media-type.context.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/components/media-type-input/media-type-input.element.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/components/input-media-type/input-media-type.element.ts similarity index 92% rename from src/Umbraco.Web.UI.Client/src/packages/media/media-types/components/media-type-input/media-type-input.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/media/media-types/components/input-media-type/input-media-type.element.ts index 30f65c151a..787e5be130 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/components/media-type-input/media-type-input.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/components/input-media-type/input-media-type.element.ts @@ -1,12 +1,12 @@ -import { UmbMediaTypePickerContext } from './media-type-input.context.js'; +import { UmbMediaTypePickerContext } from './input-media-type.context.js'; import { css, html, customElement, property, state, ifDefined } from '@umbraco-cms/backoffice/external/lit'; import { FormControlMixin } from '@umbraco-cms/backoffice/external/uui'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; import type { MediaTypeItemResponseModel } from '@umbraco-cms/backoffice/backend-api'; import { splitStringToArray } from '@umbraco-cms/backoffice/utils'; -@customElement('umb-media-type-input') -export class UmbMediaTypeInputElement extends FormControlMixin(UmbLitElement) { +@customElement('umb-input-media-type') +export class UmbInputMediaTypeElement extends FormControlMixin(UmbLitElement) { /** * This is a minimum amount of selected items in this input. * @type {number} @@ -130,10 +130,10 @@ export class UmbMediaTypeInputElement extends FormControlMixin(UmbLitElement) { ]; } -export default UmbMediaTypeInputElement; +export default UmbInputMediaTypeElement; declare global { interface HTMLElementTagNameMap { - 'umb-media-type-input': UmbMediaTypeInputElement; + 'umb-input-media-type': UmbInputMediaTypeElement; } } diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/views/structure/media-type-workspace-view-structure.element.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/views/structure/media-type-workspace-view-structure.element.ts index 69159f4a50..63aa48f2e5 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/views/structure/media-type-workspace-view-structure.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/views/structure/media-type-workspace-view-structure.element.ts @@ -1,5 +1,5 @@ import { UmbMediaTypeWorkspaceContext } from '../../media-type-workspace.context.js'; -import type { UmbMediaTypeInputElement } from '../../../components/media-type-input/media-type-input.element.js'; +import type { UmbInputMediaTypeElement } from '../../../components/input-media-type/input-media-type.element.js'; import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import type { UUIToggleElement } from '@umbraco-cms/backoffice/external/uui'; @@ -59,16 +59,16 @@ export class UmbMediaTypeWorkspaceViewStructureElement extends UmbLitElement imp
- - +