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

fixed 10 tests

Browse Source
This commit is contained in:
Kevin Jahns
2019-04-06 13:00:32 +02:00
parent 61d9d96d15
commit 1b17b5e400
12 changed files with 133 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/structs/ItemJSON.js
View File

@@ -66,7 +66,7 @@ export class ItemJSON extends AbstractItem {
* @type {ItemJSON}
*/
// @ts-ignore
const right = splitItem(this, diff)
const right = splitItem(store, this, diff)
right.content = this.content.splice(diff)
return right
}
@@ -75,7 +75,7 @@ export class ItemJSON extends AbstractItem {
* @return {boolean}
*/
mergeWith (right) {
if (compareIDs(right.origin, this.lastId) && this.right === right) {
if (compareIDs(right.origin, this.lastId) && this.right === right && compareIDs(this.rightOrigin, right.rightOrigin)) {
this.content = this.content.concat(right.content)
return true
}