From ead93d0f395d04e4568593d8d83b9379f92f3863 Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@github.com>
Date: Mon, 4 Feb 2013 11:32:47 -0700
Subject: [PATCH] Rename to `DisplayBuffer.observeMarkerHeadPosition`

When you observe, you get callbacks whenever the screen or buffer
position changes, and you get the new and old position in both
coordinate types.
---
 spec/app/display-buffer-spec.coffee | 8 ++++----
 src/app/cursor.coffee               | 2 +-
 src/app/display-buffer.coffee       | 2 +-
 src/app/edit-session.coffee         | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/spec/app/display-buffer-spec.coffee b/spec/app/display-buffer-spec.coffee
index 94c96b70e..78be67cb5 100644
--- a/spec/app/display-buffer-spec.coffee
+++ b/spec/app/display-buffer-spec.coffee
@@ -619,10 +619,10 @@ describe "DisplayBuffer", ->
       beforeEach ->
         observeHandler = jasmine.createSpy("observeHandler")
 
-      describe ".observeMarkerHeadScreenPosition(marker, callback)", ->
+      describe ".observeMarkerHeadPosition(marker, callback)", ->
         it "calls the callback whenever the markers head's screen position changes with the new position and whether it was precipitated by a buffer change", ->
           marker = displayBuffer.markScreenRange([[5, 4], [5, 10]])
-          displayBuffer.observeMarkerHeadScreenPosition(marker, observeHandler)
+          displayBuffer.observeMarkerHeadPosition(marker, observeHandler)
           displayBuffer.setMarkerHeadScreenPosition(marker, [8, 20])
           expect(observeHandler).toHaveBeenCalled()
           expect(observeHandler.argsForCall[0][0]).toEqual {
@@ -668,7 +668,7 @@ describe "DisplayBuffer", ->
 
         it "does not call the callback for screen changes that don't change the position of the marker", ->
           marker = displayBuffer.markScreenPosition([3, 4])
-          displayBuffer.observeMarkerHeadScreenPosition(marker, observeHandler)
+          displayBuffer.observeMarkerHeadPosition(marker, observeHandler)
 
           buffer.insert([3, 0], '...')
           expect(observeHandler).toHaveBeenCalled()
@@ -707,7 +707,7 @@ describe "DisplayBuffer", ->
 
         it "allows observation subscriptions to be cancelled", ->
           marker = displayBuffer.markScreenRange([[5, 4], [5, 10]])
-          subscription = displayBuffer.observeMarkerHeadScreenPosition(marker, observeHandler)
+          subscription = displayBuffer.observeMarkerHeadPosition(marker, observeHandler)
           subscription.cancel()
           buffer.insert([11, 0], '...')
           expect(observeHandler).not.toHaveBeenCalled()
diff --git a/src/app/cursor.coffee b/src/app/cursor.coffee
index 92c59ed32..8d219fb4c 100644
--- a/src/app/cursor.coffee
+++ b/src/app/cursor.coffee
@@ -12,7 +12,7 @@ class Cursor
   needsAutoscroll: null
 
   constructor: ({@editSession, @marker}) ->
-    @editSession.observeMarkerHeadScreenPosition @marker, (e) =>
+    @editSession.observeMarkerHeadPosition @marker, (e) =>
       @needsAutoscroll ?= @isLastCursor() and !e.bufferChanged
       @trigger 'moved', e
       @editSession.trigger 'cursor-moved', e
diff --git a/src/app/display-buffer.coffee b/src/app/display-buffer.coffee
index cb9a1de5a..53778afe3 100644
--- a/src/app/display-buffer.coffee
+++ b/src/app/display-buffer.coffee
@@ -369,7 +369,7 @@ class DisplayBuffer
   isMarkerReversed: (id) ->
     @buffer.isMarkerReversed(id)
 
-  observeMarkerHeadScreenPosition: (id, callback) ->
+  observeMarkerHeadPosition: (id, callback) ->
     @getMarker(id).observeHeadPosition(callback)
 
   refreshMarkerScreenPositions: ->
diff --git a/src/app/edit-session.coffee b/src/app/edit-session.coffee
index c19088d87..92480ee43 100644
--- a/src/app/edit-session.coffee
+++ b/src/app/edit-session.coffee
@@ -489,8 +489,8 @@ class EditSession
   setMarkerTailBufferPosition: (args...) ->
     @displayBuffer.setMarkerTailBufferPosition(args...)
 
-  observeMarkerHeadScreenPosition: (args...) ->
-    @displayBuffer.observeMarkerHeadScreenPosition(args...)
+  observeMarkerHeadPosition: (args...) ->
+    @displayBuffer.observeMarkerHeadPosition(args...)
 
   placeMarkerTail: (args...) ->
     @displayBuffer.placeMarkerTail(args...)