Skip to content

Conversation

@backportbot
Copy link

@backportbot backportbot bot commented Jul 3, 2024

Backport of #5941

Warning, This backport's changes differ from the original and might be incomplete ⚠️

Todo

  • Review and resolve any conflicts
  • Amend HEAD commit to remove the line stating to skip CI

Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

`this.$syncService` is cleared during the `close` method.

However we need the `baseVersionEtag` to ensure the editing session
on the server
is still in sync with our local ydoc.

Signed-off-by: Max <[email protected]>
@backportbot backportbot bot added bug Something isn't working 3. to review labels Jul 3, 2024
@backportbot backportbot bot added this to the Nextcloud 28.0.8 milestone Jul 3, 2024
* `close` is for closing the editor.
  It tries to save the document and clean everything up.
* `disconnect` is for cleaning up the current collaboration sessions.
  It will not save the document and asumes the editing will be resumed
  after a reconnect.

Move `sendRemainingSteps` out to the sync service.
Also make close in the websocket polyfill sync.
Just clean up the polyfills state.

Signed-off-by: Max <[email protected]>
@max-nextcloud max-nextcloud force-pushed the backport/5941/stable28 branch from a2ba0cd to a2b5ef2 Compare July 3, 2024 11:35
@max-nextcloud max-nextcloud marked this pull request as ready for review July 3, 2024 11:35
@juliusknorr juliusknorr merged commit 5c54d58 into stable28 Jul 3, 2024
@juliusknorr juliusknorr deleted the backport/5941/stable28 branch July 3, 2024 20:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to review bug Something isn't working

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants