github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-01-27 09:53:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5743 from overleaf/jk-cm-realtime-integration

Browse source 
[web] CodeMirror 6 integration with real-time / ShareJs

GitOrigin-RevId: e8507ea1365828140948472625b3de6ab8a227c5
This commit is contained in:
Alf Eaton 2021-11-15 12:11:59 +00:00 committed by Copybot
parent 9c9beef305
commit 205d853cea
3 changed files with 50 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
services/web/frontend/js/ide/connection/EditorWatchdogManager.js
View file

@ -178,6 +178,21 @@ export default class EditorWatchdogManager {
attachToEditor(editorName, editor) {
let onChange
if (editorName === 'CM6') {
// Code Mirror 6
this._log('attach to editor', editorName)
onChange = (_editor, changeDescription) => {
if (changeDescription.origin === 'remote') return
if (!(changeDescription.removed || changeDescription.inserted)) return
this.onEdit()
}
editor.on('change', onChange)
const detachFromEditor = () => {
this._log('detach from editor', editorName)
editor.off('change', onChange)
}
return detachFromEditor
}
if (editorName === 'CM') {
// CM is passing the CM instance as first parameter, then the change.
onChange = (editor, change) => {

22
services/web/frontend/js/ide/editor/Document.js
View file

@ -86,6 +86,7 @@ export default Document = (function () {
this.wantToBeJoined = false
this._checkAceConsistency = () => this._checkConsistency(this.ace)
this._checkCMConsistency = () => this._checkConsistency(this.cm)
this._checkCM6Consistency = () => this._checkConsistency(this.cm6)
this._bindToEditorEvents()
this._bindToSocketEvents()
}
@ -133,6 +134,27 @@ export default Document = (function () {
return this.ide.$scope.$emit('document:closed', this.doc)
}
attachToCM6(cm6) {
this.cm6 = cm6
if (this.doc != null) {
this.doc.attachToCM6(this.cm6)
}
if (this.cm6 != null) {
this.cm6.on('change', this._checkCM6Consistency)
}
return this.ide.$scope.$emit('document:opened', this.doc)
}
detachFromCM6() {
if (this.doc != null) {
this.doc.detachFromCM6()
}
if (this.cm6 != null) {
this.cm6.off('change', this._checkCM6Consistency)
}
return this.ide.$scope.$emit('document:closed', this.doc)
}
submitOp(...args) {
return this.doc != null
? this.doc.submitOp(...Array.from(args || []))

13
services/web/frontend/js/ide/editor/ShareJsDoc.js
View file

@ -381,6 +381,19 @@ export default ShareJsDoc = (function () {
: undefined
} // If we're waiting for the project to join, try again in 0.5 seconds
attachToCM6(cm6) {
this._attachToEditor('CM6', cm6, () => {
cm6.attachShareJs(this._doc)
})
}
detachFromCM6() {
this._maybeDetachEditorWatchdogManager()
if (this._doc.detach_cm6) {
this._doc.detach_cm6()
}
}
_startInflightOpTimeout(update) {
this._startFatalTimeoutTimer(update)
const retryOp = () => {