Release 12.1.0

This commit is contained in:
Kevin Jahns 2016-10-29 21:45:38 +02:00
parent 3fdcf82bcc
commit 8ab16f4ada
3 changed files with 5 additions and 5 deletions

2
dist

@ -1 +1 @@
Subproject commit cf3969dff6c352db0fc872e437e007a41d89421c
Subproject commit 7744993dde4e1be525cccc24fd47318bfe9892f8

View File

@ -1,6 +1,6 @@
{
"name": "yjs",
"version": "12.0.4",
"version": "12.1.0",
"description": "A framework for real-time p2p shared editing on any data",
"main": "./src/y.js",
"scripts": {

View File

@ -25,7 +25,7 @@ module.exports = function (Y) {
},
whenTransactionsFinished: function () {
var self = this
return new Promise (function (resolve, reject) {
return new Promise(function (resolve, reject) {
// The connector first has to send the messages to the db.
// Wait for the checkAuth-function to resolve
// The test lib only has a simple checkAuth function: `() => Promise.resolve()`
@ -65,7 +65,7 @@ module.exports = function (Y) {
}
var user = globalRoom.users[userId]
return user.receiveMessage(m[0], m[1]).then(function () {
return user.y.db.whenTransactionsFinished()
return user.y.db.whenTransactionsFinished()
}, function () {})
} else {
return false
@ -83,7 +83,7 @@ module.exports = function (Y) {
}
globalRoom.whenTransactionsFinished().then(nextFlush)
} else {
var c = globalRoom.flushOne()
c = globalRoom.flushOne()
if (c) {
c.then(function () {
globalRoom.whenTransactionsFinished().then(nextFlush)