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

update

Browse Source
This commit is contained in:
Kevin Jahns
2015-12-01 19:27:14 +01:00
parent 8d14a9cbba
commit 3a55ca4f21
10 changed files with 81 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Database.js
View File

@@ -186,8 +186,8 @@ module.exports = function (Y /* :any */) {
}
}
getNextOpId () {
if (this._temporaryUserIdGenerator != null) {
return this._temporaryUserIdGenerator()
if (this._nextUserId != null) {
return this._nextUserId
} else if (this.userId == null) {
throw new Error('OperationStore not yet initialized!')
} else {
@@ -390,7 +390,7 @@ module.exports = function (Y /* :any */) {
}
}
requestTransaction (makeGen/* :any */, callImmediately) {
if (callImmediately) {
if (true || callImmediately) { // TODO: decide whether this is ok or not..
this.waitingTransactions.push(makeGen)
if (!this.transactionInProgress) {
this.transactionInProgress = true