diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/data-type.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/data-type.data.ts index 3d3ddf8594..8d193be503 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/data/data-type.data.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/data/data-type.data.ts @@ -556,7 +556,7 @@ export const data: Array = name: 'Rich Text Editor', id: 'dt-richTextEditor', parentId: null, - propertyEditorAlias: 'Umbraco.TinyMCE', + propertyEditorAlias: 'Umbraco.RichText', propertyEditorUiAlias: 'Umb.PropertyEditorUi.TinyMCE', values: [ { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/models/Umbraco.RichText.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/models/Umbraco.RichText.ts new file mode 100644 index 0000000000..aba6d62a11 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/models/Umbraco.RichText.ts @@ -0,0 +1,25 @@ +import type { ManifestPropertyEditorModel } from '@umbraco-cms/backoffice/extension-registry'; + +export const manifest: ManifestPropertyEditorModel = { + type: 'propertyEditorModel', + name: 'Rich Text', + alias: 'Umbraco.RichText', + meta: { + defaultPropertyEditorUiAlias: 'Umb.PropertyEditorUi.TinyMCE', + settings: { + properties: [ + { + alias: 'mediaParentId', + label: 'Image Upload Folder', + description: 'Choose the upload location of pasted images', + propertyEditorUiAlias: 'Umb.PropertyEditorUi.TreePicker', + }, + { + alias: 'ignoreUserStartNodes', + label: 'Ignore User Start Nodes', + propertyEditorUiAlias: 'Umb.PropertyEditorUi.Toggle', + }, + ], + }, + }, +}; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/models/Umbraco.TinyMCE.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/models/Umbraco.TinyMCE.ts deleted file mode 100644 index 8acfe1e536..0000000000 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/models/Umbraco.TinyMCE.ts +++ /dev/null @@ -1,49 +0,0 @@ -import type { ManifestPropertyEditorModel } from '@umbraco-cms/backoffice/extension-registry'; - -export const manifest: ManifestPropertyEditorModel = { - type: 'propertyEditorModel', - name: 'Tiny MCE', - alias: 'Umbraco.TinyMCE', - meta: { - defaultPropertyEditorUiAlias: 'Umb.PropertyEditorUi.TinyMCE', - settings: { - properties: [ - { - alias: 'toolbar', - label: 'Toolbar', - description: 'Pick the toolbar options that should be available when editing', - propertyEditorUiAlias: 'Umb.PropertyEditorUI.TinyMCE.ToolbarConfiguration', - }, - { - alias: 'stylesheets', - label: 'Stylesheets', - description: 'Pick the stylesheets whose editor styles should be available when editing', - propertyEditorUiAlias: 'Umb.PropertyEditorUI.TinyMCE.StylesheetsConfiguration', - }, - { - alias: 'dimensions', - label: 'Dimensions', - description: 'Set the editor dimensions', - propertyEditorUiAlias: 'Umb.PropertyEditorUI.TinyMCE.DimensionsConfiguration', - }, - { - alias: 'maxImageSize', - label: 'Maximum size for inserted images', - description: 'Maximum width or height - enter 0 to disable resizing', - propertyEditorUiAlias: 'Umb.PropertyEditorUI.TinyMCE.MaxImageSizeConfiguration', - }, - { - alias: 'mediaParentId', - label: 'Image Upload Folder', - description: 'Choose the upload location of pasted images', - propertyEditorUiAlias: 'Umb.PropertyEditorUi.TreePicker', - }, - { - alias: 'ignoreUserStartNodes', - label: 'Ignore User Start Nodes', - propertyEditorUiAlias: 'Umb.PropertyEditorUi.Toggle', - }, - ], - }, - }, -}; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/models/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/models/manifests.ts index a9409bf301..becb000f37 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/models/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/models/manifests.ts @@ -25,7 +25,7 @@ import { manifest as slider } from './Umbraco.Slider.js'; import { manifest as tags } from './Umbraco.Tags.js'; import { manifest as textArea } from './Umbraco.TextArea.js'; import { manifest as textBox } from './Umbraco.TextBox.js'; -import { manifest as tinyMCE } from './Umbraco.TinyMCE.js'; +import { manifest as richText } from './Umbraco.RichText.js'; import { manifest as trueFalse } from './Umbraco.TrueFalse.js'; import { manifest as uploadField } from './Umbraco.UploadField.js'; import { manifest as userPicker } from './Umbraco.UserPicker.js'; @@ -60,7 +60,7 @@ export const manifests: Array = [ tags, textArea, textBox, - tinyMCE, + richText, trueFalse, uploadField, userPicker, diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/tiny-mce/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/tiny-mce/manifests.ts index 53ee6f11cc..ba0aa92d86 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/tiny-mce/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/tiny-mce/manifests.ts @@ -8,7 +8,7 @@ const manifest: ManifestPropertyEditorUi = { loader: () => import('./property-editor-ui-tiny-mce.element.js'), meta: { label: 'Rich Text Editor', - propertyEditorAlias: 'Umbraco.TinyMCE', + propertyEditorAlias: 'Umbraco.RichText', icon: 'umb:browser-window', group: 'richText', settings: { @@ -29,9 +29,33 @@ const manifest: ManifestPropertyEditorUi = { label: 'Hide Label', propertyEditorUiAlias: 'Umb.PropertyEditorUi.Toggle', }, + { + alias: 'toolbar', + label: 'Toolbar', + description: 'Pick the toolbar options that should be available when editing', + propertyEditorUiAlias: 'Umb.PropertyEditorUI.TinyMCE.ToolbarConfiguration', + }, + { + alias: 'stylesheets', + label: 'Stylesheets', + description: 'Pick the stylesheets whose editor styles should be available when editing', + propertyEditorUiAlias: 'Umb.PropertyEditorUI.TinyMCE.StylesheetsConfiguration', + }, + { + alias: 'dimensions', + label: 'Dimensions', + description: 'Set the editor dimensions', + propertyEditorUiAlias: 'Umb.PropertyEditorUI.TinyMCE.DimensionsConfiguration', + }, + { + alias: 'maxImageSize', + label: 'Maximum size for inserted images', + description: 'Maximum width or height - enter 0 to disable resizing', + propertyEditorUiAlias: 'Umb.PropertyEditorUI.TinyMCE.MaxImageSizeConfiguration', + }, ], }, }, }; -export const manifests = [manifest, ...configuration]; \ No newline at end of file +export const manifests = [manifest, ...configuration];