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

Release 10.0.1

Browse Source
This commit is contained in:
Kevin Jahns 2016-03-23 14:41:08 +01:00
parent 83a42271ad
commit d4ee8af772
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist

@ -1 +1 @@
Subproject commit 5cfe209688c31ae496b6c86db0dc5adbf15b8046 Subproject commit ffe0ec5a38df797b55c3b5bc64c9fd791cb82299

2
src/Database.js
View File

@ -111,7 +111,7 @@ module.exports = function (Y /* :any */) {
} }
} }
emptyGarbageCollector () { emptyGarbageCollector () {
return new Promise (resolve => { return new Promise(resolve => {
var check = () => { var check = () => {
if (this.gc1.length > 0 || this.gc2.length > 0) { if (this.gc1.length > 0 || this.gc2.length > 0) {
this.garbageCollect().then(check) this.garbageCollect().then(check)

8
src/Transaction.js
View File

@ -164,7 +164,7 @@ module.exports = function (Y/* :any */) {
if (start.opContent != null) { if (start.opContent != null) {
yield* this.deleteOperation(start.opContent) yield* this.deleteOperation(start.opContent)
} }
if (this.store.y.connector.isSynced){ if (this.store.y.connector.isSynced) {
this.store.gc1.push(start.id) this.store.gc1.push(start.id)
} }
} }
@ -415,7 +415,7 @@ module.exports = function (Y/* :any */) {
this.store.gc1.push(op.id) this.store.gc1.push(op.id)
return return
} }
} }
if (op.deleted && op.left != null) { if (op.deleted && op.left != null) {
var left = yield* this.getOperation(op.left) var left = yield* this.getOperation(op.left)
this.store.addToGarbageCollector(op, left) this.store.addToGarbageCollector(op, left)
@ -444,7 +444,7 @@ module.exports = function (Y/* :any */) {
o = yield* this.getOperation(id) o = yield* this.getOperation(id)
} }
*/ */
var deps = [] var deps = []
if (o.opContent != null) { if (o.opContent != null) {
deps.push(o.opContent) deps.push(o.opContent)
@ -561,7 +561,7 @@ module.exports = function (Y/* :any */) {
yield* this.setOperation(origin) yield* this.setOperation(origin)
} }
var parent var parent
if (o.parent != null){ if (o.parent != null) {
parent = yield* this.getOperation(o.parent) parent = yield* this.getOperation(o.parent)
} }
// remove gc'd op from parent, if it exists // remove gc'd op from parent, if it exists