Deploy 11.0.2

This commit is contained in:
Kevin Jahns 2016-04-26 21:28:18 +02:00
parent 89a920df68
commit b958b72f1d
5 changed files with 8 additions and 6 deletions

View File

@ -1,6 +1,6 @@
{
"name": "yjs",
"version": "11.0.1",
"version": "11.0.2",
"homepage": "y-js.org",
"authors": [
"Kevin Jahns <kevin.jahns@rwth-aachen.de>"

6
y.es6
View File

@ -2709,13 +2709,15 @@ module.exports = function (Y /* : any*/) {
if (op.struct === 'Insert') {
for (var i = this.waiting.length - 1; i >= 0; 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 (Y.utils.compareIds(op.left, w.id)) {
if (Y.utils.matchesId(w, op.left)) {
// include the effect of op in w
w.right = op.id
// exclude the effect of w in op
op.left = w.left
} else if (Y.utils.compareIds(op.right, w.id)) {
} else if (Y.utils.matchesId(w, op.right)) {
// similar..
w.left = op.id
op.right = w.right

File diff suppressed because one or more lines are too long

2
y.js

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long