From 54453e87fa34e973145e110626cbcf7435cf387f Mon Sep 17 00:00:00 2001 From: Kevin Jahns Date: Thu, 1 Mar 2018 16:44:18 +0100 Subject: [PATCH] fix consecutive undo,redo,undo,redo.. (abc test) --- src/Struct/Item.js | 17 +++++++++-------- src/Type/y-xml/YXmlText.js | 1 - 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Struct/Item.js b/src/Struct/Item.js index 2f9f87b7..c1613c8d 100644 --- a/src/Struct/Item.js +++ b/src/Struct/Item.js @@ -77,18 +77,19 @@ export default class Item { if (parent._redone !== null) { parent = parent._redone // find next cloned items - while (left !== null && left._redone === null) { + while (left !== null) { + if (left._redone !== null && left._redone._parent === parent) { + left = left._redone + break + } left = left._left } - if (left !== null) { - left = left._redone - } - while (right !== null && right._redone === null) { + while (right !== null) { + if (right._redone !== null && right._redone._parent === parent) { + right = right._redone + } right = right._right } - if (right !== null) { - right = right._redone - } } struct._origin = left struct._left = left diff --git a/src/Type/y-xml/YXmlText.js b/src/Type/y-xml/YXmlText.js index 3678774f..7fbd48d5 100644 --- a/src/Type/y-xml/YXmlText.js +++ b/src/Type/y-xml/YXmlText.js @@ -77,7 +77,6 @@ export default class YXmlText extends YText { return this._dom } _delete (y, createDelete) { - console.log('deleting text type..', this._id) this._unbindFromDom() super._delete(y, createDelete) }