diff --git a/src/packages/collaboration/lib/session-utils.coffee b/src/packages/collaboration/lib/session-utils.coffee index 7c91405ac..9c708a41f 100644 --- a/src/packages/collaboration/lib/session-utils.coffee +++ b/src/packages/collaboration/lib/session-utils.coffee @@ -39,13 +39,13 @@ module.exports = event.id = nextOutputEventId++ console.log 'sending event', event.id, event connection.send(event) - doc.on('replicate-change', outputListener) + doc.on('replicate-patch', outputListener) queuedEvents = [] nextInputEventId = 1 handleInputEvent = (event) -> console.log 'received event', event.id, event - doc.applyRemoteChange(event) + doc.applyPatch(event) nextInputEventId = event.id + 1 flushQueuedEvents = -> loop @@ -66,7 +66,7 @@ module.exports = queuedEvents.push(event) connection.on 'close', -> - doc.off('replicate-change', outputListener) + doc.off('replicate-patch', outputListener) connection.on 'error', (error) -> console.error 'connection error', error.stack ? error diff --git a/src/packages/collaboration/lib/session.coffee b/src/packages/collaboration/lib/session.coffee index 23930fea3..241b39b65 100644 --- a/src/packages/collaboration/lib/session.coffee +++ b/src/packages/collaboration/lib/session.coffee @@ -163,7 +163,7 @@ class Session event.site = window.site.id connectDocument: -> - @doc.on 'replicate-change', (event) => + @doc.on 'replicate-patch', (event) => @stampEvent(event) console.log "sending replication event", event @channel.broadcast('document-changed', event) @@ -171,7 +171,7 @@ class Session @channel.on 'document-changed', (event) => console.log "receiving replication event", event @verifyEvent(event) - @doc.applyRemoteChange(event) + @doc.applyPatch(event) snapshotRepository: (callback) -> patrick.snapshot project.getPath(), (error, repoSnapshot) => diff --git a/vendor/telepath b/vendor/telepath index 1ffdbdb51..473df67fe 160000 --- a/vendor/telepath +++ b/vendor/telepath @@ -1 +1 @@ -Subproject commit 1ffdbdb51ff6b96f6408fc6b36c13df26b7ae5d3 +Subproject commit 473df67feca57c818487353b3e81b034a4ebe6b2