From f3fadd3895da5d8d08f971fe5f291450fc51e121 Mon Sep 17 00:00:00 2001
From: Kevin Jahns <kevin.jahns@rwth-aachen.de>
Date: Mon, 11 Apr 2016 15:07:08 +0200
Subject: [PATCH] test suite works again with "contentS" feature!
---
src/Struct.js | 2 +-
src/Transaction.js | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/Struct.js b/src/Struct.js
index 0bffeb65..12da1534 100644
--- a/src/Struct.js
+++ b/src/Struct.js
@@ -241,7 +241,7 @@ module.exports = function (Y/* :any */) {
} else {
if (right == null || left == null) {
if (right == null) {
- parent.end = op.id
+ parent.end = Y.utils.getLastId(op)
}
if (left == null) {
parent.start = op.id
diff --git a/src/Transaction.js b/src/Transaction.js
index 659a949a..1bb4ea03 100644
--- a/src/Transaction.js
+++ b/src/Transaction.js
@@ -599,7 +599,7 @@ module.exports = function (Y/* :any */) {
setParent = true
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
setParent = true
parent.end = o.left
@@ -987,7 +987,7 @@ module.exports = function (Y/* :any */) {
}
o = yield* this.getInsertion(o.left)
// 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()
}
if (o.id[1] < (startSS[o.id[0]] || 0)) {