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

Merge remote-tracking branch 'origin/release/15.1' into v15/dev

Browse Source
This commit is contained in:
Jacob Overgaard
2024-12-05 10:24:49 +01:00
parent 7440b9d83d 4c009abc99
commit 3367a30914
3 changed files with 1000 additions and 722 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1690
src/Umbraco.Web.UI.Client/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

28
src/Umbraco.Web.UI.Client/package.json
View File

@@ -198,20 +198,20 @@
"npm": ">=10.1 < 11"
},
"dependencies": {
"@tiptap/core": "^2.10.2",
"@tiptap/extension-image": "^2.10.2",
"@tiptap/extension-link": "^2.10.2",
"@tiptap/extension-placeholder": "^2.10.2",
"@tiptap/extension-subscript": "^2.10.2",
"@tiptap/extension-superscript": "^2.10.2",
"@tiptap/extension-table": "^2.10.2",
"@tiptap/extension-table-cell": "^2.10.2",
"@tiptap/extension-table-header": "^2.10.2",
"@tiptap/extension-table-row": "^2.10.2",
"@tiptap/extension-text-align": "^2.10.2",
"@tiptap/extension-underline": "^2.10.2",
"@tiptap/pm": "^2.10.2",
"@tiptap/starter-kit": "^2.10.2",
"@tiptap/core": "2.10.3",
"@tiptap/extension-image": "2.10.3",
"@tiptap/extension-link": "2.10.3",
"@tiptap/extension-placeholder": "2.10.3",
"@tiptap/extension-subscript": "2.10.3",
"@tiptap/extension-superscript": "2.10.3",
"@tiptap/extension-table": "2.10.3",
"@tiptap/extension-table-cell": "2.10.3",
"@tiptap/extension-table-header": "2.10.3",
"@tiptap/extension-table-row": "2.10.3",
"@tiptap/extension-text-align": "2.10.3",
"@tiptap/extension-underline": "2.10.3",
"@tiptap/pm": "2.10.3",
"@tiptap/starter-kit": "2.10.3",
"@types/diff": "^6.0.0",
"@umbraco-ui/uui": "^1.12.2",
"@umbraco-ui/uui-css": "^1.12.1",

4
src/Umbraco.Web.UI.Client/src/packages/tiptap/plugins/block.extension.ts
View File

@@ -35,7 +35,7 @@ const umbRteBlock = Node.create({
},
parseHTML() {
return [{ tag: 'umb-rte-block' }];
return [{ tag: `umb-rte-block[${UMB_BLOCK_RTE_DATA_CONTENT_KEY}]` }];
},
renderHTML({ HTMLAttributes }) {
@@ -63,7 +63,7 @@ const umbRteBlockInline = umbRteBlock.extend({
inline: true,
parseHTML() {
return [{ tag: 'umb-rte-block-inline' }];
return [{ tag: `umb-rte-block-inline[${UMB_BLOCK_RTE_DATA_CONTENT_KEY}]` }];
},
renderHTML({ HTMLAttributes }) {