From fb6fe0402386ada3cd6b244c0a81ffcf173a5775 Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@github.com>
Date: Thu, 3 Jan 2013 17:27:27 -0700
Subject: [PATCH] Passivize more event names: 'change(d)' &
 'screen-lines-change(d)'

---
 spec/app/display-buffer-spec.coffee | 4 ++--
 src/app/display-buffer.coffee       | 8 ++++----
 src/app/edit-session.coffee         | 4 ++--
 src/app/editor.coffee               | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/spec/app/display-buffer-spec.coffee b/spec/app/display-buffer-spec.coffee
index fa827ef74..cd7ca484c 100644
--- a/spec/app/display-buffer-spec.coffee
+++ b/spec/app/display-buffer-spec.coffee
@@ -8,7 +8,7 @@ describe "DisplayBuffer", ->
     editSession = fixturesProject.buildEditSessionForPath('sample.js', { tabLength })
     { buffer, displayBuffer } = editSession
     changeHandler = jasmine.createSpy 'changeHandler'
-    displayBuffer.on 'change', changeHandler
+    displayBuffer.on 'changed', changeHandler
 
   afterEach ->
     editSession.destroy()
@@ -200,7 +200,7 @@ describe "DisplayBuffer", ->
     beforeEach ->
       editSession2 = fixturesProject.buildEditSessionForPath('two-hundred.txt')
       { buffer, displayBuffer } = editSession2
-      displayBuffer.on 'change', changeHandler
+      displayBuffer.on 'changed', changeHandler
 
     afterEach ->
       editSession2.destroy()
diff --git a/src/app/display-buffer.coffee b/src/app/display-buffer.coffee
index adf4cfd8a..27e3b1a45 100644
--- a/src/app/display-buffer.coffee
+++ b/src/app/display-buffer.coffee
@@ -39,7 +39,7 @@ class DisplayBuffer
     @buildLineMap()
     screenDelta = @getLastRow() - end
     bufferDelta = 0
-    @trigger 'change', { start, end, screenDelta, bufferDelta }
+    @trigger 'changed', { start, end, screenDelta, bufferDelta }
 
   lineForRow: (row) ->
     @lineMap.lineForScreenRow(row)
@@ -95,7 +95,7 @@ class DisplayBuffer
       end = oldScreenRange.end.row
       screenDelta = newScreenRange.end.row - oldScreenRange.end.row
       bufferDelta = 0
-      @trigger 'change', { start, end, screenDelta, bufferDelta }
+      @trigger 'changed', { start, end, screenDelta, bufferDelta }
 
     fold
 
@@ -124,7 +124,7 @@ class DisplayBuffer
       screenDelta = newScreenRange.end.row - oldScreenRange.end.row
       bufferDelta = 0
 
-      @trigger 'change', { start, end, screenDelta, bufferDelta }
+      @trigger 'changed', { start, end, screenDelta, bufferDelta }
 
   destroyFoldsContainingBufferRow: (bufferRow) ->
     for row, folds of @activeFolds
@@ -225,7 +225,7 @@ class DisplayBuffer
     @lineMap.replaceScreenRows(start, end, newScreenLines)
     screenDelta = @lastScreenRowForBufferRow(tokenizedBufferEnd + tokenizedBufferDelta) - end
 
-    @trigger 'change', { start, end, screenDelta, bufferDelta }
+    @trigger 'changed', { start, end, screenDelta, bufferDelta }
 
   buildLineForBufferRow: (bufferRow) ->
     @buildLinesForBufferRows(bufferRow, bufferRow)
diff --git a/src/app/edit-session.coffee b/src/app/edit-session.coffee
index 5c53afa64..f5f759c77 100644
--- a/src/app/edit-session.coffee
+++ b/src/app/edit-session.coffee
@@ -61,9 +61,9 @@ class EditSession
 
     @preserveCursorPositionOnBufferReload()
 
-    @displayBuffer.on "change.edit-session-#{@id}", (e) =>
+    @displayBuffer.on "changed.edit-session-#{@id}", (e) =>
       @refreshAnchorScreenPositions() unless e.bufferDelta
-      @trigger 'screen-lines-change', e
+      @trigger 'screen-lines-changed', e
 
   destroy: ->
     throw new Error("Edit session already destroyed") if @destroyed
diff --git a/src/app/editor.coffee b/src/app/editor.coffee
index 360f55a46..9f02fc042 100644
--- a/src/app/editor.coffee
+++ b/src/app/editor.coffee
@@ -784,7 +784,7 @@ class Editor extends View
       @newSelections.push(selection)
       @requestDisplayUpdate()
 
-    @activeEditSession.on 'screen-lines-change.editor', (e) => @handleScreenLinesChange(e)
+    @activeEditSession.on 'screen-lines-changed.editor', (e) => @handleScreenLinesChange(e)
 
     @newCursors = @activeEditSession.getCursors()
     @newSelections = @activeEditSession.getSelections()