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

test suite works again with "contentS" feature!

Browse Source
This commit is contained in:
Kevin Jahns 2016-04-11 15:07:08 +02:00
parent 08a79d0e7b
commit f3fadd3895
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Struct.js
View File

@ -241,7 +241,7 @@ module.exports = function (Y/* :any */) {
} else { } else {
if (right == null || left == null) { if (right == null || left == null) {
if (right == null) { if (right == null) {
parent.end = op.id parent.end = Y.utils.getLastId(op)
} }
if (left == null) { if (left == null) {
parent.start = op.id parent.start = op.id

4
src/Transaction.js
View File

@ -599,7 +599,7 @@ module.exports = function (Y/* :any */) {
setParent = true setParent = true
parent.start = o.right parent.start = o.right
} }
if (Y.utils.compareIds(parent.end, o.id)) { if (Y.utils.matchesId(o, parent.end)) {
// gc'd op is the end // gc'd op is the end
setParent = true setParent = true
parent.end = o.left parent.end = o.left
@ -987,7 +987,7 @@ module.exports = function (Y/* :any */) {
} }
o = yield* this.getInsertion(o.left) o = yield* this.getInsertion(o.left)
// we set another o, check if we can reduce $missing_origins // we set another o, check if we can reduce $missing_origins
while (missing_origins.length > 0 && Y.utils.compareIds(missing_origins[missing_origins.length - 1].origin, o.id)) { while (missing_origins.length > 0 && Y.utils.matchesId(o, missing_origins[missing_origins.length - 1].origin)) {
missing_origins.pop() missing_origins.pop()
} }
if (o.id[1] < (startSS[o.id[0]] || 0)) { if (o.id[1] < (startSS[o.id[0]] || 0)) {