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

Release 12.1.0

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist

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

2
package.json
View File

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

6
src/Connectors/Test.js
View File

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