Deploy 11.2.4

This commit is contained in:
Kevin Jahns 2016-08-04 19:25:20 +02:00
parent 653a436b88
commit c926ce09f5
5 changed files with 10 additions and 10 deletions

View File

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

8
y.es6
View File

@ -954,13 +954,12 @@ module.exports = function (Y /* :any */) {
var opid = op.id
var isGarbageCollected = yield* this.isGarbageCollected(opid)
if (!isGarbageCollected) {
// TODO: reduce number of get / put calls for op ..
yield* Y.Struct[op.struct].execute.call(this, op)
yield* this.addOperation(op)
yield* this.store.operationAdded(this, op)
if (!Y.utils.compareIds(opid, op.id)) {
// operationAdded changed op
op = yield* this.getOperation(opid)
}
// operationAdded can change op..
op = yield* this.getOperation(opid)
// if insertion, try to combine with left
yield* this.tryCombineWithLeft(op)
}
@ -1024,6 +1023,7 @@ module.exports = function (Y /* :any */) {
// Delete if DS says this is actually deleted
var len = op.content != null ? op.content.length : 1
var startId = op.id // You must not use op.id in the following loop, because op will change when deleted
// TODO: !! console.log('TODO: change this before commiting')
for (let i = 0; i < len; i++) {
var id = [startId[0], startId[1] + i]
var opIsDeleted = yield* transaction.isDeleted(id)

File diff suppressed because one or more lines are too long

6
y.js

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long