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

fix two clients syncing at the time

Browse Source
This commit is contained in:
Kevin Jahns 2017-07-19 21:19:41 +02:00
parent cd3f4a72d6
commit 747da52c0b
4 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/textarea/index.html
View File

@ -6,7 +6,7 @@
<script src="../../../y-array/y-array.js"></script> <script src="../../../y-array/y-array.js"></script>
<script src="../../../y-text/dist/y-text.js"></script> <script src="../../../y-text/dist/y-text.js"></script>
<script src="../../../y-memory/y-memory.js"></script> <script src="../../../y-memory/y-memory.js"></script>
<script src="../../../y-websockets-client/dist/y-websockets-client.js"></script> <script src="../../../y-websockets-client/y-websockets-client.js"></script>
<script src="./index.js"></script> <script src="./index.js"></script>
</body> </body>
</html> </html>

2
examples/textarea/index.js
View File

@ -7,7 +7,7 @@ Y({
}, },
connector: { connector: {
name: 'websockets-client', name: 'websockets-client',
room: 'Textarea-example' room: 'Textarea-example-dev'
// url: '127.0.0.1:1234' // url: '127.0.0.1:1234'
}, },
sourceDir: '/bower_components', sourceDir: '/bower_components',

2
src/Connector.js
View File

@ -1,5 +1,3 @@
/* @flow */
'use strict'
function canRead (auth) { return auth === 'read' || auth === 'write' } function canRead (auth) { return auth === 'read' || auth === 'write' }
function canWrite (auth) { return auth === 'write' } function canWrite (auth) { return auth === 'write' }

4
src/Transaction.js
View File

@ -96,7 +96,7 @@ export default function extendTransaction (Y) {
send.push(Y.Struct[op.struct].encode(op)) 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 // is connected, and this is not going to be send in addOperation
this.store.y.connector.broadcastOps(send) this.store.y.connector.broadcastOps(send)
} }
@ -712,7 +712,7 @@ export default function extendTransaction (Y) {
} }
* addOperation (op) { * addOperation (op) {
yield * this.os.put(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 // is connected, and this is not going to be send in addOperation
this.store.y.connector.broadcastOps([op]) this.store.y.connector.broadcastOps([op])
} }