github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #475 from sharelatex/ja-scroll-overflow-in-review-panel

Browse source 
Allow scrolling in the review panel to extend outside of top of text …
This commit is contained in:
James Allen 2017-04-05 11:08:49 +01:00 committed by GitHub
commit ce59307c91
1 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
services/web/public/coffee/ide/review-panel/directives/reviewPanelSorted.coffee
View file

@ -127,15 +127,13 @@ define [
ace.require("ace/lib/event").addMouseWheelListener scroller[0], (e) -> ace.require("ace/lib/event").addMouseWheelListener scroller[0], (e) ->
deltaY = e.wheelY deltaY = e.wheelY
old_top = parseInt(list.css("top")) old_top = parseInt(list.css("top"))
top = Math.min(0, old_top - deltaY * 4) top = old_top - deltaY * 4
list.css(top: top)
scrollAce(-top) scrollAce(-top)
e.preventDefault() e.preventDefault()
# Use these to avoid unnecessary updates. Scrolling one # We always scroll by telling Ace to scroll and then updating the
# panel causes us to scroll the other panel, but there's no # review panel. This lets Ace manage the size of the scroller and
# need to trigger the event back to the original panel. # when it overflows.
ignoreNextPanelEvent = false
ignoreNextAceEvent = false ignoreNextAceEvent = false
scrollPanel = (scrollTop, height) -> scrollPanel = (scrollTop, height) ->
@ -148,11 +146,7 @@ define [
list.css(top: - scrollTop) list.css(top: - scrollTop)
scrollAce = (scrollTop) -> scrollAce = (scrollTop) ->
if ignoreNextPanelEvent scope.reviewPanelEventsBridge.emit "externalScroll", scrollTop
ignoreNextPanelEvent = false
else
ignoreNextAceEvent = true
scope.reviewPanelEventsBridge.emit "externalScroll", scrollTop
scope.reviewPanelEventsBridge.on "aceScroll", scrollPanel scope.reviewPanelEventsBridge.on "aceScroll", scrollPanel
scope.$on "$destroy", () -> scope.$on "$destroy", () ->