Merge pull request #1407 from smblott-github/post-1.46

Merge post-1.46 in its entirety

1 files changed, 12 insertions, 6 deletions

diff --git a/background_scripts/completion.coffee b/background_scripts/completion.coffee
index d62f82fe..d6402019 100644
--- a/background_scripts/completion.coffee
+++ b/background_scripts/completion.coffee
@@ -324,11 +324,17 @@ class SearchEngineCompleter
   searchEngines: {}
 
   filter: (queryTerms, onComplete) ->
-    searchEngineMatch = this.getSearchEngineMatches(queryTerms[0])
+    {url: url, description: description} = @getSearchEngineMatches queryTerms
     suggestions = []
-    if searchEngineMatch
-      searchEngineMatch = searchEngineMatch.replace(/%s/g, Utils.createSearchQuery queryTerms[1..])
-      suggestion = new Suggestion(queryTerms, "search", searchEngineMatch, queryTerms[0] + ": " + queryTerms[1..].join(" "), @computeRelevancy)
+    if url
+      url = url.replace(/%s/g, Utils.createSearchQuery queryTerms[1..])
+      if description
+        type = description
+        query = queryTerms[1..].join " "
+      else
+        type = "search"
+        query = queryTerms[0] + ": " + queryTerms[1..].join(" ")
+      suggestion = new Suggestion(queryTerms, type, url, query, @computeRelevancy)
       suggestions.push(suggestion)
     onComplete(suggestions)
 
@@ -337,8 +343,8 @@ class SearchEngineCompleter
   refresh: ->
     this.searchEngines = root.Settings.getSearchEngines()
 
-  getSearchEngineMatches: (queryTerm) ->
-    this.searchEngines[queryTerm]
+  getSearchEngineMatches: (queryTerms) ->
+    (1 < queryTerms.length and @searchEngines[queryTerms[0]]) or {}
 
 # A completer which calls filter() on many completers, aggregates the results, ranks them, and returns the top
 # 10. Queries from the vomnibar frontend script come through a multi completer.