From d4ee8af772a550b778b2cf04377a729fcd4c8c09 Mon Sep 17 00:00:00 2001 From: Kevin Jahns Date: Wed, 23 Mar 2016 14:41:08 +0100 Subject: [PATCH] Release 10.0.1 --- dist | 2 +- src/Database.js | 2 +- src/Transaction.js | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dist b/dist index 5cfe2096..ffe0ec5a 160000 --- a/dist +++ b/dist @@ -1 +1 @@ -Subproject commit 5cfe209688c31ae496b6c86db0dc5adbf15b8046 +Subproject commit ffe0ec5a38df797b55c3b5bc64c9fd791cb82299 diff --git a/src/Database.js b/src/Database.js index 0b55cfec..650a8f4f 100644 --- a/src/Database.js +++ b/src/Database.js @@ -111,7 +111,7 @@ module.exports = function (Y /* :any */) { } } emptyGarbageCollector () { - return new Promise (resolve => { + return new Promise(resolve => { var check = () => { if (this.gc1.length > 0 || this.gc2.length > 0) { this.garbageCollect().then(check) diff --git a/src/Transaction.js b/src/Transaction.js index 3a5344a7..3ac10c24 100644 --- a/src/Transaction.js +++ b/src/Transaction.js @@ -164,7 +164,7 @@ module.exports = function (Y/* :any */) { if (start.opContent != null) { yield* this.deleteOperation(start.opContent) } - if (this.store.y.connector.isSynced){ + if (this.store.y.connector.isSynced) { this.store.gc1.push(start.id) } } @@ -415,7 +415,7 @@ module.exports = function (Y/* :any */) { this.store.gc1.push(op.id) return } - } + } if (op.deleted && op.left != null) { var left = yield* this.getOperation(op.left) this.store.addToGarbageCollector(op, left) @@ -444,7 +444,7 @@ module.exports = function (Y/* :any */) { o = yield* this.getOperation(id) } */ - + var deps = [] if (o.opContent != null) { deps.push(o.opContent) @@ -561,7 +561,7 @@ module.exports = function (Y/* :any */) { yield* this.setOperation(origin) } var parent - if (o.parent != null){ + if (o.parent != null) { parent = yield* this.getOperation(o.parent) } // remove gc'd op from parent, if it exists