From 8d84a97b2bca406bc87cba2af40d0b9d25788a5d Mon Sep 17 00:00:00 2001
From: probablycorey <cj@github.com>
Date: Fri, 13 Jun 2014 11:36:40 -0700
Subject: [PATCH] Move scroll view measurements to componentWillUpdate

---
 src/editor-component.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/editor-component.coffee b/src/editor-component.coffee
index 4e1e2ab34..7ac0e8c57 100644
--- a/src/editor-component.coffee
+++ b/src/editor-component.coffee
@@ -167,6 +167,7 @@ EditorComponent = React.createClass
 
   componentWillUpdate: ->
     if @props.editor.isAlive()
+      @requestScrollViewMeasurement()
       @props.parentView.trigger 'cursor:moved' if @cursorsMoved
       @props.parentView.trigger 'selection:changed' if @selectionChanged
 
@@ -176,7 +177,6 @@ EditorComponent = React.createClass
     @updateParentViewFocusedClassIfNeeded(prevState)
     @measureScrollbars() if @measuringScrollbars
     @measureLineHeightAndCharWidthsIfNeeded(prevState)
-    @requestScrollViewMeasurement()
     @props.parentView.trigger 'editor:display-updated'
 
   requestUpdate: ->