diff options
| author | Stephen Blott | 2014-11-10 21:43:39 +0000 |
|---|---|---|
| committer | Stephen Blott | 2014-11-10 21:43:39 +0000 |
| commit | 0516f6af3b84ee15928e2d7a2a6d4c20ca461049 (patch) | |
| tree | 6718b8d41c3507d8818b01d6a4a9fc65fe1f25b0 /content_scripts/vimium_frontend.coffee | |
| parent | 2687fbe835e447beb875f399c4c150dfe919535e (diff) | |
| parent | df521c26fda9b8d3e8c182fc85deaf5b8c723cd4 (diff) | |
| download | vimium-0516f6af3b84ee15928e2d7a2a6d4c20ca461049.tar.bz2 | |
Merge branch 'smooth-scrolling-requestAnimationFrame' of github.com:mrmr1993/vimium into mrmr1993-smooth-scrolling-requestAnimationFrame
Diffstat (limited to 'content_scripts/vimium_frontend.coffee')
| -rw-r--r-- | content_scripts/vimium_frontend.coffee | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/content_scripts/vimium_frontend.coffee b/content_scripts/vimium_frontend.coffee index 118f985e..57503565 100644 --- a/content_scripts/vimium_frontend.coffee +++ b/content_scripts/vimium_frontend.coffee @@ -49,7 +49,7 @@ settings = loadedValues: 0 valuesToLoad: ["scrollStepSize", "linkHintCharacters", "linkHintNumbers", "filterLinkHints", "hideHud", "previousPatterns", "nextPatterns", "findModeRawQuery", "regexFindMode", "userDefinedLinkHintCss", - "helpDialog_showAdvancedCommands"] + "helpDialog_showAdvancedCommands", "smoothScroll"] isLoaded: false eventListeners: {} @@ -101,7 +101,7 @@ initializePreDomReady = -> settings.addEventListener("load", LinkHints.init.bind(LinkHints)) settings.load() - Scroller.init() + Scroller.init settings checkIfEnabledForUrl() @@ -227,10 +227,10 @@ window.focusThisFrame = (shouldHighlight) -> setTimeout((-> document.body.style.border = borderWas), 200) extend window, - scrollToBottom: -> Scroller.scrollTo "y", "max" - scrollToTop: -> Scroller.scrollTo "y", 0 - scrollToLeft: -> Scroller.scrollTo "x", 0 - scrollToRight: -> Scroller.scrollTo "x", "max" + scrollToBottom: -> Scroller.scrollTo "y", "max", true + scrollToTop: -> Scroller.scrollTo "y", 0, true + scrollToLeft: -> Scroller.scrollTo "x", 0, true + scrollToRight: -> Scroller.scrollTo "x", "max", true scrollUp: -> Scroller.scrollBy "y", -1 * settings.get("scrollStepSize") scrollDown: -> Scroller.scrollBy "y", settings.get("scrollStepSize") scrollPageUp: -> Scroller.scrollBy "y", "viewSize", -1/2 |