Revise patch 5062194

The previous solution broke test doc_docKeepsScroll.
codemirror · Mar 15, 2013 · 9338ba4 · 9338ba4
1 parent db62428
commit 9338ba4
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/lib/codemirror.js b/lib/codemirror.js
@@ -405,7 +405,6 @@ window.CodeMirror = (function() {
     }
     updateSelection(cm);
     updateScrollbars(cm.display, cm.doc.height);
-    cm.doc.scrollTop = cm.display.scroller.scrollTop;
 
     return updated;
   }
@@ -1271,8 +1270,10 @@ window.CodeMirror = (function() {
       var coords = cursorCoords(cm, doc.sel.head);
       newScrollPos = calculateScrollPos(cm, coords.left, coords.top, coords.left, coords.bottom);
     }
-    if (op.changes.length || newScrollPos && newScrollPos.scrollTop != null)
+    if (op.changes.length || newScrollPos && newScrollPos.scrollTop != null) {
       updated = updateDisplay(cm, op.changes, newScrollPos && newScrollPos.scrollTop);
+      if (cm.display.scroller.offsetHeight) cm.doc.scrollTop = cm.display.scroller.scrollTop;
+    }
     if (!updated && op.selectionChanged) updateSelection(cm);
     if (op.updateScrollPos) {
       display.scroller.scrollTop = display.scrollbarV.scrollTop = doc.scrollTop = newScrollPos.scrollTop;