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

Merge remote-tracking branch 'origin/v15/feature/tiptap' into v15/feature/rte/tiptap/render-toolbar

Browse Source
This commit is contained in:
JesmoDev
2024-09-30 15:02:57 +02:00
parent e0c705ccb7 58a832de7a
commit d12ff5c20a
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.UI.Client/src/packages/rte/components/rte-base.element.ts
View File

@@ -12,8 +12,6 @@ import {
type UmbBlockRteTypeModel,
} from '@umbraco-cms/backoffice/block-rte';
import { UMB_PROPERTY_CONTEXT, UMB_PROPERTY_DATASET_CONTEXT } from '@umbraco-cms/backoffice/property';
import { observeMultiple } from '@umbraco-cms/backoffice/observable-api';
import { debounceTime } from '@umbraco-cms/backoffice/external/rxjs';
export abstract class UmbRteBaseElement extends UmbLitElement implements UmbPropertyEditorUiElement {
public set config(config: UmbPropertyEditorConfigCollection | undefined) {

1
src/Umbraco.Web.UI.Client/src/packages/rte/tiny-mce/plugins/tiny-mce-block-picker.plugin.ts
View File

@@ -115,6 +115,7 @@ export default class UmbTinyMceMultiUrlPickerPlugin extends UmbTinyMcePluginBase
const blockEl = `<${blockTag} ${UMB_BLOCK_RTE_DATA_CONTENT_KEY}="${block.key}"></${blockTag}>`;
editor.selection.setContent(blockEl);
editor.setDirty(true);
});
}
}