Skip to content

[stable27] fix: Pass origin along the initial state update #4323

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.

Sign up for GitHub

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

Merged
mejo- merged 2 commits into from
Jun 20, 2023
Merged

[stable27] fix: Pass origin along the initial state update #4323

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de627a3
fix: Pass origin along the initial state update
juliusknorr Jun 18, 2023
4208120
chore(assets): Recompile assets
nextcloud-command Jun 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
fix: Pass origin along the initial state update 
Signed-off-by: Julius Härtl <[email protected]>
  • Loading branch information
@juliusknorr @mejo-
juliusknorr authored and mejo- committed Jun 20, 2023
commit de627a3dfce3baf7cc36ed7c82773d7e3566739a
2 changes: 1 addition & 1 deletion src/components/Editor.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,7 +480,7 @@ export default {

onLoaded({ documentSource, documentState }) {
if (documentState) {
applyDocumentState(this.$ydoc, documentState)
applyDocumentState(this.$ydoc, documentState, this.$providers[0])
}

this.hasConnectionIssue = false
Expand Down
5 changes: 3 additions & 2 deletions src/helpers/yjs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,9 @@ export function getDocumentState(ydoc) {
*
* @param {Doc} ydoc - apply state to this doc
* @param {string} documentState - base64 encoded doc state
* @param {object} origin - initiator object e.g. WebsocketProvider
*/
export function applyDocumentState(ydoc, documentState) {
export function applyDocumentState(ydoc, documentState, origin) {
const update = decodeArrayBuffer(documentState)
applyUpdate(ydoc, update)
applyUpdate(ydoc, update, origin)
}