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

removed some unnecessary setTimeouts

Browse Source
This commit is contained in:
Kevin Jahns 2017-05-21 00:31:16 +02:00
parent 42abcc897c
commit 020dacdad4
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Connector.js
View File

@ -240,11 +240,7 @@ export default function extendConnector (Y/* :any */) {
} }
if (this.broadcastOpBuffer.length === 0) { if (this.broadcastOpBuffer.length === 0) {
this.broadcastOpBuffer = ops this.broadcastOpBuffer = ops
if (this.y.db.transactionInProgress) { this.y.db.whenTransactionsFinished().then(broadcastOperations)
this.y.db.whenTransactionsFinished().then(broadcastOperations)
} else {
setTimeout(broadcastOperations, 0)
}
} else { } else {
this.broadcastOpBuffer = this.broadcastOpBuffer.concat(ops) this.broadcastOpBuffer = this.broadcastOpBuffer.concat(ops)
} }
@ -365,6 +361,7 @@ export default function extendConnector (Y/* :any */) {
*/ */
defer.resolve() defer.resolve()
}) })
return this.syncStep2
} else if (message.type === 'sync done') { } else if (message.type === 'sync done') {
var self = this var self = this
this.syncStep2.then(function () { this.syncStep2.then(function () {

16
src/y.js
View File

@ -132,16 +132,14 @@ export default function Y (opts/* :YOptions */) /* :Promise<YConfig> */ {
opts.connector = Y.utils.copyObject(opts.connector) opts.connector = Y.utils.copyObject(opts.connector)
opts.db = Y.utils.copyObject(opts.db) opts.db = Y.utils.copyObject(opts.db)
opts.share = Y.utils.copyObject(opts.share) opts.share = Y.utils.copyObject(opts.share)
setTimeout(function () { Y.requestModules(modules).then(function () {
Y.requestModules(modules).then(function () { var yconfig = new YConfig(opts)
var yconfig = new YConfig(opts) yconfig.db.whenUserIdSet(function () {
yconfig.db.whenUserIdSet(function () { yconfig.init(function () {
yconfig.init(function () { resolve(yconfig)
resolve(yconfig)
})
}) })
}).catch(reject) })
}, 0) }).catch(reject)
} }
}) })
} }