aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Blott2015-05-03 11:34:19 +0100
committerStephen Blott2015-05-03 11:39:08 +0100
commit98636859e0944b82fa6e3988e0ca943b5a27b145 (patch)
tree4171655ada74bb60b18ace9069d4da74735d4e5e
parent07a62680008b6c86b0cf8a12969334bd7c1e389c (diff)
downloadvimium-98636859e0944b82fa6e3988e0ca943b5a27b145.tar.bz2
Search completion; tweaks and fixes.
-rw-r--r--background_scripts/completion.coffee2
-rw-r--r--pages/vomnibar.coffee4
2 files changed, 4 insertions, 2 deletions
diff --git a/background_scripts/completion.coffee b/background_scripts/completion.coffee
index 5b5dc191..c8650f45 100644
--- a/background_scripts/completion.coffee
+++ b/background_scripts/completion.coffee
@@ -342,7 +342,7 @@ class SearchEngineCompleter
# For custom search engines, we add an auto-selected suggestion.
if custom
title = if description? then query else queryTerms[0] + ": " + query
- suggestions.push @mkSuggestion false, queryTerms, type, mkUrl(query), description, @computeRelevancy, 1
+ suggestions.push @mkSuggestion false, queryTerms, type, mkUrl(query), title, @computeRelevancy, 1
suggestions[0].autoSelect = true
queryTerms = queryTerms[1..]
diff --git a/pages/vomnibar.coffee b/pages/vomnibar.coffee
index 3520537e..831f8dd3 100644
--- a/pages/vomnibar.coffee
+++ b/pages/vomnibar.coffee
@@ -179,9 +179,11 @@ class VomnibarUI
update: (updateSynchronously, callback) =>
if (updateSynchronously)
- # The use entered something. Don't reset any previous text.
+ # The user entered something. Don't reset any previous text, and re-enable custom search engine auto
+ # selection.
if @previousText?
@previousText = null
+ @previousAutoSelect = null
@selection = -1
# cancel scheduled update
if @updateTimer?