Amend c8c7fc1 to handle window resize-tiggered updated

Issue #1787
codemirror · Sep 9, 2013 · 7ea6f43 · 7ea6f43
1 parent c8c7fc1
commit 7ea6f43
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/lib/codemirror.js b/lib/codemirror.js
@@ -355,7 +355,6 @@ window.CodeMirror = (function() {
 
     if (mac_geLion && scrollbarWidth(d.measure) === 0)
       d.scrollbarV.style.minWidth = d.scrollbarH.style.minHeight = mac_geMountainLion ? "18px" : "12px";
-    return needsV;
   }
 
   function visibleLines(display, doc, viewPort) {
@@ -411,12 +410,16 @@ window.CodeMirror = (function() {
     var oldFrom = cm.display.showingFrom, oldTo = cm.display.showingTo, updated;
     var visible = visibleLines(cm.display, cm.doc, viewPort);
     for (;;) {
-      var hadVScroll = cm.display.scroller.scrollHeight > cm.display.scroller.clientHeight + 1;
+      var oldWidth = cm.display.scroller.clientWidth;
       if (!updateDisplayInner(cm, changes, visible, forced)) break;
       updated = true;
       changes = [];
       updateSelection(cm);
-      if (updateScrollbars(cm) != hadVScroll) continue;
+      updateScrollbars(cm);
+      if (cm.options.lineWrapping && oldWidth != cm.display.scroller.clientWidth) {
+        forced = true;
+        continue;
+      }
       forced = false;
 
       // Clip forced viewport to actual scrollable area