yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Code tidy-up

Browse Source
This commit is contained in:
leekelleher
2024-05-20 15:31:35 +01:00
parent c3bc789c14
commit 44e88bba29
3 changed files with 25 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/media-entity-picker/property-editor-ui-media-entity-picker.element.ts
View File

@@ -33,7 +33,7 @@ export class UmbPropertyEditorUIMediaEntityPickerElement extends UmbLitElement i
return undefined;
}
#onChange(event: { target: UmbInputMediaElement }) {
#onChange(event: CustomEvent & { target: UmbInputMediaElement }) {
this.value = event.target.selection?.join(',') ?? null;
this.dispatchEvent(new UmbPropertyValueChangeEvent());
}

49
src/Umbraco.Web.UI.Client/src/packages/media/media/property-editors/media-picker/property-editor-ui-media-picker.element.ts
View File

@@ -1,14 +1,14 @@
import type { UmbInputMediaElement } from '../../components/input-media/input-media.element.js';
import '../../components/input-media/input-media.element.js';
import type { UmbInputRichMediaElement } from './components/input-rich-media/input-rich-media.element.js';
import type { UmbCropModel, UmbMediaPickerPropertyValue } from './index.js';
import { html, customElement, property, state } from '@umbraco-cms/backoffice/external/lit';
import {
UmbPropertyValueChangeEvent,
type UmbPropertyEditorConfigCollection,
} from '@umbraco-cms/backoffice/property-editor';
import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry';
import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
import { customElement, html, property, state } from '@umbraco-cms/backoffice/external/lit';
import { UmbId } from '@umbraco-cms/backoffice/id';
import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
import { UmbPropertyValueChangeEvent } from '@umbraco-cms/backoffice/property-editor';
import type { NumberRangeValueType } from '@umbraco-cms/backoffice/models';
import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor';
import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/extension-registry';
import './components/input-rich-media/input-rich-media.element.js';
/**
* @element umb-property-editor-ui-media-picker
@@ -39,28 +39,19 @@ export class UmbPropertyEditorUIMediaPickerElement extends UmbLitElement impleme
private _allowedMediaTypes: Array<string> = [];
public set config(config: UmbPropertyEditorConfigCollection | undefined) {
const multiple = config?.getByAlias('multiple');
this._multiple = (multiple?.value as boolean) ?? false;
if (!config) return;
const startNodeId = config?.getByAlias('startNodeId');
this._startNode = (startNodeId?.value as string) ?? '';
this._multiple = Boolean(config.getValueByAlias('multiple'));
this._startNode = config.getValueByAlias<string>('startNodeId') ?? '';
this._focalPointEnabled = Boolean(config.getValueByAlias('enableFocalPoint'));
this._crops = config?.getValueByAlias<Array<UmbCropModel>>('crops') ?? [];
const enableFocalPoint = config?.getByAlias('enableFocalPoint');
this._focalPointEnabled = (enableFocalPoint?.value as boolean) ?? false;
const crops = config?.getByAlias('crops');
this._crops = (crops?.value as Array<UmbCropModel>) ?? [];
const filter = config?.getByAlias('filter')?.value as string;
const filter = config.getValueByAlias<string>('filter') ?? '';
this._allowedMediaTypes = filter?.split(',') ?? [];
const validationLimit = config?.getByAlias('validationLimit');
if (!validationLimit) return;
const minMax: Record<string, number> = validationLimit.value as any;
this._limitMin = minMax.min ?? 0;
this._limitMax = minMax.max ?? Infinity;
const minMax = config.getValueByAlias<NumberRangeValueType>('validationLimit');
this._limitMin = minMax?.min ?? 0;
this._limitMax = minMax?.max ?? Infinity;
}
public get config() {
return undefined;
@@ -80,8 +71,8 @@ export class UmbPropertyEditorUIMediaPickerElement extends UmbLitElement impleme
#value: Array<UmbMediaPickerPropertyValue> = [];
#onChange(event: CustomEvent) {
const selection = (event.target as UmbInputMediaElement).selection;
#onChange(event: CustomEvent & { target: UmbInputRichMediaElement }) {
const selection = event.target.selection;
const result = selection.map((mediaKey) => {
return {

5
src/Umbraco.Web.UI.Client/src/packages/packages/package-builder/workspace/workspace-package-builder.element.ts
View File

@@ -229,7 +229,10 @@ export class UmbWorkspacePackageBuilderElement extends UmbLitElement {
return html`
<umb-property-layout label="Media">
<div slot="editor">
<umb-input-media .selection=${this._package.mediaIds ?? []} @change=${this.#onMediaChange}></umb-input-media>
<umb-input-media
multiple
.selection=${this._package.mediaIds ?? []}
@change=${this.#onMediaChange}></umb-input-media>
<uui-checkbox
label="Include child nodes"
.checked=${this._package.mediaLoadChildNodes ?? false}