From 4a2b2e61342001910abd9ca7fd4932e2a9d7ed8a Mon Sep 17 00:00:00 2001
From: Shin'ya Ueoka <ueokande@i-beam.org>
Date: Sun, 17 Feb 2019 12:32:14 +0900
Subject: Fix scroller target

---
 src/content/scrolls.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/content/scrolls.js b/src/content/scrolls.js
index a307aa7..1fa88d1 100644
--- a/src/content/scrolls.js
+++ b/src/content/scrolls.js
@@ -63,7 +63,7 @@ class Scroller {
 
   scrollTo(x, y) {
     let behavior = this.smooth ? 'smooth' : 'auto';
-    window.scrollTo({
+    this.element.scrollTo({
       left: x,
       top: y,
       behavior: behavior,
@@ -76,7 +76,7 @@ class Scroller {
 
   scrollBy(x, y) {
     let behavior = this.smooth ? 'smooth' : 'auto';
-    window.scrollBy({
+    this.element.scrollBy({
       left: x,
       top: y,
       behavior: behavior,
-- 
cgit v1.2.3


From b9d41333c170ca43db8e6cd5159f074fde35b43a Mon Sep 17 00:00:00 2001
From: Shin'ya Ueoka <ueokande@i-beam.org>
Date: Sun, 17 Feb 2019 12:50:24 +0900
Subject: Work around for scrollBy() after scrollTo() does not work

---
 src/content/scrolls.js | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

(limited to 'src')

diff --git a/src/content/scrolls.js b/src/content/scrolls.js
index 1fa88d1..f3124a1 100644
--- a/src/content/scrolls.js
+++ b/src/content/scrolls.js
@@ -62,29 +62,22 @@ class Scroller {
   }
 
   scrollTo(x, y) {
-    let behavior = this.smooth ? 'smooth' : 'auto';
+    if (!this.smooth) {
+      this.element.scrollTo(x, y);
+      return;
+    }
     this.element.scrollTo({
       left: x,
       top: y,
-      behavior: behavior,
+      behavior: 'smooth',
     });
-    if (!this.smooth) {
-      return;
-    }
     this.prepareReset();
   }
 
   scrollBy(x, y) {
-    let behavior = this.smooth ? 'smooth' : 'auto';
-    this.element.scrollBy({
-      left: x,
-      top: y,
-      behavior: behavior,
-    });
-    if (!this.smooth) {
-      return;
-    }
-    this.prepareReset();
+    let left = this.element.scrollLeft + x;
+    let top = this.element.scrollTop + y;
+    this.scrollTo(left, top);
   }
 
   prepareReset() {
-- 
cgit v1.2.3