Skip to content

fix(editor): Don't load both Tiptap collaboration history extensions - #4621

Merged
mejo- merged 2 commits into
mainfrom
fix/undo
Aug 2, 2023
Merged

fix(editor): Don't load both Tiptap collaboration history extensions#4621
mejo- merged 2 commits into
mainfrom
fix/undo

Conversation

@mejo-

@mejo-mejo- commented Aug 2, 2023

Copy link
Copy Markdown
Member

Instead of loading Tiptap extension-history in RichText.js, let's load it only in MarkdownContentEditor.vue.

  • Editor.vue loads extension-collaboration
  • MarkdownContentEditor.vue loads extension-history

Fixes: #4601

🏁 Checklist

  • Code is properly formatted (npm run lint / npm run stylelint / composer run cs:check)
  • Sign-off message is added to all commits
  • Documentation is not required

Instead of loading Tiptap `extension-history` in RichText.js, let's load
it only in `MarkdownContentEditor.vue`.
* Editor.vue loads `extension-collaboration`
* MarkdownContentEditor.vue loads `extension-history`
Fixes: #4601
Signed-off-by: Jonas <jonas@freesources.org>
@cypress

cypressBot commented Aug 2, 2023

Copy link
Copy Markdown

1 flaky tests on run #11468 ↗︎

014920Flakiness1

Details:

fix(editor): Don't load both Tiptap collaboration history extensions
Project: TextCommit:f263b8d21e
Status: PassedDuration: 04:06 💡
Started: Aug 2, 2023 3:04 PMEnded: Aug 2, 2023 3:08 PM
Flakiness cypress/e2e/api/SyncServiceProvider.spec.js • 1 flaky test

ViewOutputVideo

Test Artifacts
Sync service provider > recovers from a dropped message OutputScreenshots

This comment has been generated by cypress-bot as a result of this project's GitHub integration settings.

@mejo-

mejo- commented Aug 2, 2023

Copy link
Copy Markdown
MemberAuthor

/compile

@mejo-

mejo- commented Aug 2, 2023

Copy link
Copy Markdown
MemberAuthor

/backport b9eab5b to stable27

@mejo-

mejo- commented Aug 2, 2023

Copy link
Copy Markdown
MemberAuthor

/backport b9eab5b to stable26

Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
@mejo-
mejo- merged commit 968a934 into mainAug 2, 2023
@mejo-
mejo- deleted the fix/undo branch August 2, 2023 15:10
@juliusknorr

Copy link
Copy Markdown
Member

Awesome, thanks for taking care of that @mejo- ❤️

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Undo broken in collaborative editing session

3 participants

@mejo-@juliusknorr@nextcloud-command