Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from Aug 2, 2023

Conversation

mejo-
Copy link
Member

@mejo- mejo- commented Aug 2, 2023

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
Copy link

cypress bot commented Aug 2, 2023

1 flaky tests on run #11468 ↗︎

0 149 2 0 Flakiness 1

Details:

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

View Output Video

Test Artifacts
Sync service provider > recovers from a dropped message Output Screenshots

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

@mejo-
Copy link
Member Author

mejo- commented Aug 2, 2023

/compile

@mejo-
Copy link
Member Author

mejo- commented Aug 2, 2023

/backport b9eab5b to stable27

@mejo-
Copy link
Member Author

mejo- commented Aug 2, 2023

/backport b9eab5b to stable26

Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
@mejo- mejo- merged commit 968a934 into main Aug 2, 2023
31 checks passed
@mejo- mejo- deleted the fix/undo branch August 2, 2023 15:10
@juliushaertl
Copy link
Member

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

Sign up for free to 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