Skip to content

[stable26] fix: pass file id for direct editing and fail y.js provider setup if none was passed #4128

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
May 5, 2023
Merged

[stable26] fix: pass file id for direct editing and fail y.js provider setup if none was passed #4128

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
4420aa3
fix: pass file id for direct editing and fail y.js provider setup if …
juliusknorr May 5, 2023
bb444c9
Compile assets
nextcloud-command May 5, 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 file id for direct editing and fail y.js provider setup if … 
…none was passed

Signed-off-by: Julius Härtl <[email protected]>
  • Loading branch information
@juliusknorr @backportbot-nextcloud
juliusknorr authored and backportbot-nextcloud[bot] committed May 5, 2023
commit 4420aa3a7dcbead0bab679062137bb94b333c95c
4 changes: 4 additions & 0 deletions src/services/SyncServiceProvider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ import { logger } from '../helpers/logger.js'
* @param {object} options.initialSession - initialSession to start from
*/
export default function createSyncServiceProvider({ ydoc, syncService, fileId, initialSession }) {
if (!fileId) {
// We need a file id as a unique identifier for y.js as otherwise state might leak between different files
throw new Error('fileId is required')
}
const WebSocketPolyfill = initWebSocketPolyfill(syncService, fileId, initialSession)
const websocketProvider = new WebsocketProvider(
'ws://localhost:1234',
Expand Down
1 change: 1 addition & 0 deletions src/views/DirectEditing.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
<div id="direct-editor" :class="{'icon-loading': saving}">
<Editor ref="editor"
:initial-session="initialSession"
:file-id="initial.fileId"
:active="true"
:mime="initial.mimetype"
:is-direct-editing="true"
Expand Down