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

fix transaction wait bug

Browse Source
This commit is contained in:
Kevin Jahns 2015-11-25 16:04:01 +01:00
parent aa2e7fd917
commit 940a44bb7c
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Database.js
View File

@ -341,8 +341,12 @@ module.exports = function (Y) {
} }
} }
requestTransaction (makeGen, callImmediately) { requestTransaction (makeGen, callImmediately) {
if (callImmediately) { if (callImmediately || true) {
this.transact(makeGen) this.waitingTransactions.push(makeGen)
if (!this.transactionInProgress) {
this.transactionInProgress = true
this.transact(this.getNextRequest())
}
} else { } else {
this.waitingTransactions.push(makeGen) this.waitingTransactions.push(makeGen)
if (!this.transactionInProgress) { if (!this.transactionInProgress) {

2
src/Types/Map.spec.js
View File

@ -3,7 +3,7 @@
'use strict' 'use strict'
var Y = require('../SpecHelper.js') var Y = require('../SpecHelper.js')
var numberOfYMapTests = 100 var numberOfYMapTests = 500
var repeatMapTeasts = 1 var repeatMapTeasts = 1
for (let database of databases) { for (let database of databases) {

4
src/y.js
View File

@ -85,7 +85,9 @@ class YConfig {
yield* this.store.tryExecute.call(this, model) yield* this.store.tryExecute.call(this, model)
var root = yield* this.getType(model.id) var root = yield* this.getType(model.id)
this.store.y.root = root this.store.y.root = root
callback() setTimeout(function () {
callback()
}, 0)
}) })
} }
isConnected () { isConnected () {