Fix wheel scrolling and set forceScroll from op

I broke this in 0ad53e0. Closes codemirror#4713.
evs-chris · Apr 28, 2017 · c98bd22 · c98bd22
1 parent b93ab2d
commit c98bd22
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/display/operations.js b/src/display/operations.js
@@ -140,7 +140,7 @@ function endOperation_finish(op) {
     display.wheelStartX = display.wheelStartY = null
 
   // Propagate the scroll position to the actual DOM scroller
-  if (op.scrollTop != null) setScrollTop(cm, op.scrollTop, true)
+  if (op.scrollTop != null) setScrollTop(cm, op.scrollTop, op.forceScroll)
 
   if (op.scrollLeft != null) setScrollLeft(cm, op.scrollLeft, true, true)
   // If we need to scroll a specific position into view, do so.

diff --git a/src/display/scrolling.js b/src/display/scrolling.js
@@ -156,16 +156,17 @@ export function scrollToCoordsRange(cm, from, to, margin) {
 export function updateScrollTop(cm, val) {
   if (Math.abs(cm.doc.scrollTop - val) < 2) return
   if (!gecko) updateDisplaySimple(cm, {top: val})
-  setScrollTop(cm, val)
+  setScrollTop(cm, val, true)
   if (gecko) updateDisplaySimple(cm)
   startWorker(cm, 100)
 }
+
 export function setScrollTop(cm, val, forceScroll) {
   val = Math.min(cm.display.scroller.scrollHeight - cm.display.scroller.clientHeight, val)
   if (cm.display.scroller.scrollTop == val && !forceScroll) return
   cm.doc.scrollTop = val
   cm.display.scrollbars.setScrollTop(val)
-  cm.display.scroller.scrollTop = val
+  if (cm.display.scroller.scrollTop != val) cm.display.scroller.scrollTop = val
 }
 
 // Sync scroller and scrollbar, ensure the gutter elements are