Move findModeQueryHasResults to findModeQuery.hasResults

3 files changed, 10 insertions, 11 deletions

diff --git a/content_scripts/hud.coffee b/content_scripts/hud.coffee
index 5e1b955a..7fb70bb5 100644
--- a/content_scripts/hud.coffee
+++ b/content_scripts/hud.coffee
@@ -76,15 +76,15 @@ HUD =
     window.scrollTo @findMode.scrollX, @findMode.scrollY if @findMode.options.returnToViewport
     if event.keyCode == keyCodes.backspace || event.keyCode == keyCodes.deleteKey
       @findMode.exit()
-      new PostFindMode if findModeQueryHasResults
+      new PostFindMode if findModeQuery.hasResults
     else if event.keyCode == keyCodes.enter
       handleEnterForFindMode()
       @findMode.exit()
-      new PostFindMode if findModeQueryHasResults
+      new PostFindMode if findModeQuery.hasResults
     else if KeyboardUtils.isEscape event
       @findMode.exit()
       handleEscapeForFindMode()
-      new PostFindMode if findModeQueryHasResults
+      new PostFindMode if findModeQuery.hasResults
 
   isReady: do ->
     ready = false
diff --git a/content_scripts/mode_find.coffee b/content_scripts/mode_find.coffee
index 67ec8dd9..c0e4d953 100644
--- a/content_scripts/mode_find.coffee
+++ b/content_scripts/mode_find.coffee
@@ -84,7 +84,7 @@ class FindMode extends Mode
     # match as the user adds matching characters, or removes previously-matched characters. See #1434.
     @restoreSelection()
     query = if findModeQuery.isRegex then getNextQueryFromRegexMatches(0) else findModeQuery.parsedQuery
-    window.findModeQueryHasResults = executeFind(query, { caseSensitive: !findModeQuery.ignoreCase })
+    window.findModeQuery.hasResults = executeFind(query, { caseSensitive: !findModeQuery.ignoreCase })
 
 getCurrentRange = ->
   selection = getSelection()
diff --git a/content_scripts/vimium_frontend.coffee b/content_scripts/vimium_frontend.coffee
index c1c8288c..d8327a9f 100644
--- a/content_scripts/vimium_frontend.coffee
+++ b/content_scripts/vimium_frontend.coffee
@@ -5,8 +5,7 @@
 # "domReady".
 #
 
-window.findModeQuery = { rawQuery: "", matchCount: 0 }
-window.findModeQueryHasResults = false
+window.findModeQuery = { rawQuery: "", matchCount: 0, hasResults: false }
 isShowingHelpDialog = false
 keyPort = null
 isEnabledForUrl = true
@@ -710,7 +709,7 @@ window.executeFind = (query, options) ->
 restoreDefaultSelectionHighlight = -> document.body.classList.remove("vimiumFindMode")
 
 focusFoundLink = ->
-  if (findModeQueryHasResults)
+  if (findModeQuery.hasResults)
     link = getLinkFromSelection()
     link.focus() if link
 
@@ -719,7 +718,7 @@ selectFoundInputElement = ->
   # might be disabled and therefore unable to receive focus), we use the approximate heuristic of checking
   # that the last anchor node is an ancestor of our element.
   findModeAnchorNode = document.getSelection().anchorNode
-  if (findModeQueryHasResults && document.activeElement &&
+  if (findModeQuery.hasResults && document.activeElement &&
       DomUtils.isSelectable(document.activeElement) &&
       DomUtils.isDOMDescendant(findModeAnchorNode, document.activeElement))
     DomUtils.simulateSelect(document.activeElement)
@@ -750,12 +749,12 @@ findAndFocus = (backwards) ->
   Marks.setPreviousPosition()
   query = getFindModeQuery backwards
 
-  window.findModeQueryHasResults =
+  window.findModeQuery.hasResults =
     executeFind(query, { backwards: backwards, caseSensitive: !findModeQuery.ignoreCase })
 
-  if findModeQueryHasResults
+  if findModeQuery.hasResults
     focusFoundLink()
-    new PostFindMode() if findModeQueryHasResults
+    new PostFindMode() if findModeQuery.hasResults
   else
     HUD.showForDuration("No matches for '" + findModeQuery.rawQuery + "'", 1000)