Deploy 11.0.2
This commit is contained in:
parent
89a920df68
commit
b958b72f1d
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "yjs",
|
"name": "yjs",
|
||||||
"version": "11.0.1",
|
"version": "11.0.2",
|
||||||
"homepage": "y-js.org",
|
"homepage": "y-js.org",
|
||||||
"authors": [
|
"authors": [
|
||||||
"Kevin Jahns <kevin.jahns@rwth-aachen.de>"
|
"Kevin Jahns <kevin.jahns@rwth-aachen.de>"
|
||||||
|
6
y.es6
6
y.es6
@ -2709,13 +2709,15 @@ module.exports = function (Y /* : any*/) {
|
|||||||
if (op.struct === 'Insert') {
|
if (op.struct === 'Insert') {
|
||||||
for (var i = this.waiting.length - 1; i >= 0; i--) {
|
for (var i = this.waiting.length - 1; i >= 0; i--) {
|
||||||
let w = this.waiting[i]
|
let w = this.waiting[i]
|
||||||
|
// TODO: do I handle split operations correctly here? Super unlikely, but yeah..
|
||||||
|
// Also: can this case happen? Can op be inserted in the middle of a larger op that is in $waiting?
|
||||||
if (w.struct === 'Insert') {
|
if (w.struct === 'Insert') {
|
||||||
if (Y.utils.compareIds(op.left, w.id)) {
|
if (Y.utils.matchesId(w, op.left)) {
|
||||||
// include the effect of op in w
|
// include the effect of op in w
|
||||||
w.right = op.id
|
w.right = op.id
|
||||||
// exclude the effect of w in op
|
// exclude the effect of w in op
|
||||||
op.left = w.left
|
op.left = w.left
|
||||||
} else if (Y.utils.compareIds(op.right, w.id)) {
|
} else if (Y.utils.matchesId(w, op.right)) {
|
||||||
// similar..
|
// similar..
|
||||||
w.left = op.id
|
w.left = op.id
|
||||||
op.right = w.right
|
op.right = w.right
|
||||||
|
Loading…
x
Reference in New Issue
Block a user