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

del is applied after ins (type is always called when ins already deleted)

Browse Source
This commit is contained in:
Kevin Jahns 2016-04-06 15:45:30 +02:00
parent ecc2aef0f8
commit 5b21104da3
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/Database.js
View File

@ -381,25 +381,26 @@ module.exports = function (Y /* :any */) {
}
}
// Delete if DS says this is actually deleted
var opIsDeleted = yield* transaction.isDeleted(op.id)
if (!op.deleted && opIsDeleted) {
var delop = {
struct: 'Delete',
target: op.id
}
yield* Y.Struct['Delete'].execute.call(transaction, delop)
}
// notify parent, if it was instanciated as a custom type
if (t != null) {
let o = Y.utils.copyObject(op)
if (opIsDeleted && !o.deleted) {
// op did not reflect the created delete op (happens when not using y-memory)
o.deleted = true
}
yield* t._changed(transaction, o)
}
// Delete if DS says this is actually deleted
var len = op.content != null ? op.content.length : 1
for (var i = 0; i < len; i++) {
var id = [op.id[0], op.id[1] + i]
if (!op.deleted) {
var opIsDeleted = yield* transaction.isDeleted(id)
if (opIsDeleted) {
var delop = {
struct: 'Delete',
target: id
}
yield* this.tryExecute.call(transaction, delop)
}
}
}
}
}
whenTransactionsFinished () {