From 74347ea874b47c2d355fbf6dbbecc9a2b008b289 Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@github.com>
Date: Fri, 19 Jul 2013 16:28:24 -0700
Subject: [PATCH] Upgrade telepath to allow marker attributes to be updated

---
 spec/app/display-buffer-spec.coffee                 | 4 ++--
 src/packages/collaboration/lib/session-utils.coffee | 4 ++--
 vendor/telepath                                     | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/spec/app/display-buffer-spec.coffee b/spec/app/display-buffer-spec.coffee
index 14c46f6f3..48844144e 100644
--- a/spec/app/display-buffer-spec.coffee
+++ b/spec/app/display-buffer-spec.coffee
@@ -873,5 +873,5 @@ describe "DisplayBuffer", ->
         marker2 = marker1.copy(b: 3)
         expect(marker2.getBufferRange()).toEqual marker1.getBufferRange()
         expect(displayBuffer.getMarkerCount()).toBe initialMarkerCount + 2
-        expect(marker1.getAttributes()).toEqual a: 1, b: 2, invalidation: 'overlap'
-        expect(marker2.getAttributes()).toEqual a: 1, b: 3, invalidation: 'overlap'
+        expect(marker1.getAttributes()).toEqual a: 1, b: 2
+        expect(marker2.getAttributes()).toEqual a: 1, b: 3
diff --git a/src/packages/collaboration/lib/session-utils.coffee b/src/packages/collaboration/lib/session-utils.coffee
index 339d7a58b..36de3da08 100644
--- a/src/packages/collaboration/lib/session-utils.coffee
+++ b/src/packages/collaboration/lib/session-utils.coffee
@@ -12,13 +12,13 @@ module.exports =
       event.id = nextOutputEventId++
       console.log 'sending event', event.id, event
       connection.send(event)
-    doc.on('output', outputListener)
+    doc.on('replicate-change', outputListener)
 
     queuedEvents = []
     nextInputEventId = 1
     handleInputEvent = (event) ->
       console.log 'received event', event.id, event
-      doc.handleInputEvent(event)
+      doc.applyRemoteChange(event)
       nextInputEventId = event.id + 1
     flushQueuedEvents = ->
       loop
diff --git a/vendor/telepath b/vendor/telepath
index c12246df2..8337309f3 160000
--- a/vendor/telepath
+++ b/vendor/telepath
@@ -1 +1 @@
-Subproject commit c12246df2efe961409ded4ccb12a0d7b42672944
+Subproject commit 8337309f31ed5660760ca0eac8ea4bbb9877c7f2