github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-07 20:31:06 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3511 from overleaf/jpa-false-positive-change-events

Browse source 
[frontend] EditorWatchdogManager: ignore false-positive change events

GitOrigin-RevId: 539cb6befce7210ed606c1e62045c9d15ce5b911
This commit is contained in:
Jakob Ackermann 2021-01-07 09:55:55 +00:00 committed by Copybot
parent ae511474f2
commit 846f2379a8
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -183,6 +183,11 @@ export default class EditorWatchdogManager {
onChange = (editor, change) => {
// Ignore remote changes.
if (change.origin === 'remote') return
// sharejs only looks at DEL or INSERT change events.
// NOTE: Keep in sync with sharejs.
if (!(change.removed || change.text)) return
this.onEdit()
}
} else {
@ -190,6 +195,11 @@ export default class EditorWatchdogManager {
onChange = change => {
// Ignore remote changes.
if (change.origin === 'remote') return
// sharejs only looks at DEL or INSERT change events.
// NOTE: Keep in sync with sharejs.
if (!(change.action === 'remove' || change.action === 'insert')) return
this.onEdit()
}
}

4
services/web/frontend/js/vendor/libs/sharejs.js vendored
View file

@ -1290,7 +1290,7 @@ define(['ace/ace','crypto-js/sha1'], function (_ignore, CryptoJSSHA1) {
var age = this.__lastSubmitTimestamp && (now - this.__lastSubmitTimestamp)
var RECOMPUTE_HASH_INTERVAL = 5000
// check the document hash regularly (but not if we have checked in the last 5 seconds)
var needToRecomputeHash = !this.__lastSubmitTimestamp || (age > RECOMPUTE_HASH_INTERVAL) || (age < 0)
var needToRecomputeHash = !this.__lastSubmitTimestamp || (age > RECOMPUTE_HASH_INTERVAL) || (age < 0)
if (needToRecomputeHash || window.sl_debugging) {
// send git hash of current snapshot
var sha1 = CryptoJSSHA1("blob " + this.snapshot.length + "\x00" + this.snapshot).toString()
@ -1449,6 +1449,7 @@ define(['ace/ace','crypto-js/sha1'], function (_ignore, CryptoJSSHA1) {
var pos = getStartOffsetPosition(delta.start);
// NOTE: Keep in sync with EditorWatchdogManager.
switch (delta.action) {
case 'insert':
text = delta.lines.join('\n');
@ -1611,6 +1612,7 @@ define(['ace/ace','crypto-js/sha1'], function (_ignore, CryptoJSSHA1) {
}
startPos += delta.from.ch;
// NOTE: Keep in sync with EditorWatchdogManager.
if (delta.removed) {
doc.del(startPos, delta.removed.join('\n').length, fromUndo);
}