From 747da52c0bc0aee46f87cdc7bcf0ecf0ebb0fc6f Mon Sep 17 00:00:00 2001 From: Kevin Jahns Date: Wed, 19 Jul 2017 21:19:41 +0200 Subject: [PATCH 1/2] fix two clients syncing at the time --- examples/textarea/index.html | 2 +- examples/textarea/index.js | 2 +- src/Connector.js | 2 -- src/Transaction.js | 4 ++-- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/examples/textarea/index.html b/examples/textarea/index.html index 7931839b..8b0b474f 100644 --- a/examples/textarea/index.html +++ b/examples/textarea/index.html @@ -6,7 +6,7 @@ - + diff --git a/examples/textarea/index.js b/examples/textarea/index.js index 407e1e51..f51cef2d 100644 --- a/examples/textarea/index.js +++ b/examples/textarea/index.js @@ -7,7 +7,7 @@ Y({ }, connector: { name: 'websockets-client', - room: 'Textarea-example' + room: 'Textarea-example-dev' // url: '127.0.0.1:1234' }, sourceDir: '/bower_components', diff --git a/src/Connector.js b/src/Connector.js index e2ced372..c04e53f7 100644 --- a/src/Connector.js +++ b/src/Connector.js @@ -1,5 +1,3 @@ -/* @flow */ -'use strict' function canRead (auth) { return auth === 'read' || auth === 'write' } function canWrite (auth) { return auth === 'write' } diff --git a/src/Transaction.js b/src/Transaction.js index 335ca095..ed3f615f 100644 --- a/src/Transaction.js +++ b/src/Transaction.js @@ -96,7 +96,7 @@ export default function extendTransaction (Y) { send.push(Y.Struct[op.struct].encode(op)) } } - if (this.store.y.connector.isSynced && send.length > 0) { // TODO: && !this.store.forwardAppliedOperations (but then i don't send delete ops) + if (send.length > 0) { // TODO: && !this.store.forwardAppliedOperations (but then i don't send delete ops) // is connected, and this is not going to be send in addOperation this.store.y.connector.broadcastOps(send) } @@ -712,7 +712,7 @@ export default function extendTransaction (Y) { } * addOperation (op) { yield * this.os.put(op) - if (this.store.y.connector.isSynced && this.store.forwardAppliedOperations && typeof op.id[1] !== 'string') { + if (this.store.forwardAppliedOperations && typeof op.id[1] !== 'string') { // is connected, and this is not going to be send in addOperation this.store.y.connector.broadcastOps([op]) } From 442ea7ec70e333d5d3b8d3072939a71eaa2efcb5 Mon Sep 17 00:00:00 2001 From: Kevin Jahns Date: Wed, 19 Jul 2017 21:22:37 +0200 Subject: [PATCH 2/2] 13.0.0-5 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6aaa92f2..538dac7c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "yjs", - "version": "13.0.0-4", + "version": "13.0.0-5", "lockfileVersion": 1, "dependencies": { "acorn": { diff --git a/package.json b/package.json index 4e0df5a9..8cb4cfe0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "yjs", - "version": "13.0.0-4", + "version": "13.0.0-5", "description": "A framework for real-time p2p shared editing on any data", "main": "./y.node.js", "browser": "./y.js",