From f10dfa843c60266504469fb5ea4d6222b051364b Mon Sep 17 00:00:00 2001
From: mrmr1993
Date: Thu, 2 Nov 2017 18:31:32 +0000
Subject: Replace all references to selection.type with our FF polyfill

Credit to @gdh1995 for catching these oversights.
---
 content_scripts/mode_find.coffee | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'content_scripts')

diff --git a/content_scripts/mode_find.coffee b/content_scripts/mode_find.coffee
index 950b08e9..f19b5db4 100644
--- a/content_scripts/mode_find.coffee
+++ b/content_scripts/mode_find.coffee
@@ -6,7 +6,7 @@ class SuppressPrintable extends Mode
   constructor: (options) ->
     super options
     handler = (event) => if KeyboardUtils.isPrintable event then @suppressEvent else @continueBubbling
-    type = document.getSelection().type
+    type = DomUtils.getSelectionType()
 
     # We use unshift here, so we see events after normal mode, so we only see unmapped keys.
     @unshift
@@ -16,7 +16,7 @@ class SuppressPrintable extends Mode
       keyup: (event) =>
         # If the selection type has changed (usually, no longer "Range"), then the user is interacting with
         # the input element, so we get out of the way.  See discussion of option 5c from #1415.
-        @exit() if document.getSelection().type != type
+        @exit() if DomUtils.getSelectionType() != type
 
 # When we use find, the selection/focus can land in a focusable/editable element.  In this situation, special
 # considerations apply.  We implement three special cases:
@@ -235,17 +235,14 @@ class FindMode extends Mode
 
 getCurrentRange = ->
   selection = getSelection()
-  if selection.type == "None"
+  if DomUtils.getSelectionType(selection) == "None"
     range = document.createRange()
     range.setStart document.body, 0
     range.setEnd document.body, 0
     range
   else
-    selection.collapseToStart() if selection.type == "Range"
-    if selection.rangeCount > 0
-      selection.getRangeAt 0
-    else # Firefox returns a selection with no ranges and null anchor/focusNode in some situations.
-      null
+    selection.collapseToStart() if DomUtils.getSelectionType(selection) == "Range"
+    selection.getRangeAt 0
 
 getLinkFromSelection = ->
   node = window.getSelection().anchorNode
-- 
cgit v1.2.3


From 66cd3b27c2183bc1cc2dcc1aac82d7c12ffeff54 Mon Sep 17 00:00:00 2001
From: mrmr1993
Date: Thu, 2 Nov 2017 18:32:58 +0000
Subject: Compare with lower case strings when using toLowerCase

Credit to @gdh1995 for catching this.
---
 content_scripts/link_hints.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'content_scripts')

diff --git a/content_scripts/link_hints.coffee b/content_scripts/link_hints.coffee
index 89cf29f1..9145454a 100644
--- a/content_scripts/link_hints.coffee
+++ b/content_scripts/link_hints.coffee
@@ -663,7 +663,7 @@ LocalHints =
           "button" , "tab" , "link", "checkbox", "menuitem", "menuitemcheckbox", "menuitemradio"
         ] or
         (contentEditable = element.getAttribute "contentEditable") and
-          contentEditable.toLowerCase() in ["", "contentEditable", "true"]
+          contentEditable.toLowerCase() in ["", "contenteditable", "true"]
       isClickable = true
 
     # Check for jsaction event listeners on the element.
-- 
cgit v1.2.3