Skip to content

Commit 0c61167

Browse files
committed
Merge branch 'main' into v15/bugfix/discard-changes-path-compare
2 parents 262fa48 + 5a13b77 commit 0c61167

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

src/packages/data-type/workspace/data-type-workspace-editor.element.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { UMB_DATA_TYPE_WORKSPACE_CONTEXT } from './data-type-workspace.context-token.js';
12
import { css, html, customElement } from '@umbraco-cms/backoffice/external/lit';
23
import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
34
/**
@@ -6,6 +7,14 @@ import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
67
*/
78
@customElement('umb-data-type-workspace-editor')
89
export class UmbDataTypeWorkspaceEditorElement extends UmbLitElement {
10+
constructor() {
11+
super();
12+
13+
this.consumeContext(UMB_DATA_TYPE_WORKSPACE_CONTEXT, (workspaceContext) => {
14+
workspaceContext.createPropertyDatasetContext(this);
15+
});
16+
}
17+
918
override render() {
1019
return html`
1120
<umb-workspace-editor alias="Umb.Workspace.DataType">

src/packages/tiny-mce/property-editors/tiny-mce/property-editor-ui-tiny-mce.element.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
import { customElement, html, property, state } from '@umbraco-cms/backoffice/external/lit';
22
import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
33
import { UmbPropertyValueChangeEvent } from '@umbraco-cms/backoffice/property-editor';
4-
import type { UmbPropertyEditorConfigCollection } from '@umbraco-cms/backoffice/property-editor';
5-
import type { UmbPropertyEditorUiElement } from '@umbraco-cms/backoffice/property-editor';
4+
import type {
5+
UmbPropertyEditorUiElement,
6+
UmbPropertyEditorConfigCollection,
7+
} from '@umbraco-cms/backoffice/property-editor';
68
import {
79
UmbBlockRteEntriesContext,
810
type UmbBlockRteLayoutModel,

0 commit comments

Comments
 (0)