Merge remote-tracking branch 'upstream/master' into post-1.46

2 files changed, 4 insertions, 4 deletions

diff --git a/content_scripts/scroller.coffee b/content_scripts/scroller.coffee
index 5eb1c5e2..a2617289 100644
--- a/content_scripts/scroller.coffee
+++ b/content_scripts/scroller.coffee
@@ -34,12 +34,12 @@ getDimension = (el, direction, amount) ->
   else
     amount
 
-# Perform a scroll. Return true if we successfully scrolled by the requested amount, and false otherwise.
+# Perform a scroll. Return true if we successfully scrolled by any amount, and false otherwise.
 performScroll = (element, direction, amount) ->
   axisName = scrollProperties[direction].axisName
   before = element[axisName]
   element[axisName] += amount
-  element[axisName] == amount + before
+  element[axisName] != before
 
 # Test whether `element` should be scrolled. E.g. hidden elements should not be scrolled.
 shouldScroll = (element, direction) ->
diff --git a/content_scripts/vimium.css b/content_scripts/vimium.css
index a042a4cf..f582824a 100644
--- a/content_scripts/vimium.css
+++ b/content_scripts/vimium.css
@@ -4,8 +4,8 @@
  * Vimium dialogs.
  *
  * The z-indexes of Vimium elements are very large, because we always want them to show on top. Chrome may
- * support up to Number.MAX_VALUE, which is approximately 1.7976e+308. We're using 2**31, which is the max value of a singed 32 bit int.
- * Let's use try larger valeus if 2**31 empirically isn't large enough.
+ * support up to Number.MAX_VALUE, which is approximately 1.7976e+308. We're using 2^31, which is the max
+ * value of a singed 32 bit int. Let's try larger valeus if 2**31 empirically isn't large enough.
  */
 
 /*