yonote/yjs
14
0
Fork 0
Code Pull Requests 1 Releases Activity

fix the case that a new transaction starts in an event listener (afterTransaction, observe, observeDeep)

Browse Source
This commit is contained in:
Kevin Jahns
2017-11-12 13:34:23 -08:00
parent 415b66607c
commit 3d5ba7b4cc
13 changed files with 71 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Util/UndoManager.js
View File

@@ -1,16 +1,16 @@
import ID from './ID.js'
class ReverseOperation {
constructor (y) {
constructor (y, transaction) {
this.created = new Date()
const beforeState = y._transaction.beforeState
const beforeState = transaction.beforeState
this.toState = new ID(y.userID, y.ss.getState(y.userID) - 1)
if (beforeState.has(y.userID)) {
this.fromState = new ID(y.userID, beforeState.get(y.userID))
} else {
this.fromState = this.toState
}
this.deletedStructs = y._transaction.deletedStructs
this.deletedStructs = transaction.deletedStructs
}
}
@@ -70,9 +70,9 @@ export default class UndoManager {
this._redoing = false
const y = scope._y
this.y = y
y.on('afterTransaction', (y, remote) => {
if (!remote && y._transaction.changedParentTypes.has(scope)) {
let reverseOperation = new ReverseOperation(y)
y.on('afterTransaction', (y, transaction, remote) => {
if (!remote && transaction.changedParentTypes.has(scope)) {
let reverseOperation = new ReverseOperation(y, transaction)
if (!this._undoing) {
let lastUndoOp = this._undoBuffer.length > 0 ? this._undoBuffer[this._undoBuffer.length - 1] : null
if (lastUndoOp !== null && reverseOperation.created - lastUndoOp.created <= options.captureTimeout) {