From 764d70312f292882abe4940adf9fee3d6e834327 Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Wed, 27 May 2015 13:43:34 +0100
Subject: Do not de-duplicate tabs vomnibar entries.

---
 background_scripts/completion.coffee | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/background_scripts/completion.coffee b/background_scripts/completion.coffee
index 30a7b882..ff27e518 100644
--- a/background_scripts/completion.coffee
+++ b/background_scripts/completion.coffee
@@ -29,6 +29,8 @@ class Suggestion
     @highlightTerms = true
     # @insertText is text to insert into the vomnibar input when the suggestion is selected.
     @insertText = null
+    # @deDuplicate controls whether this suggestion is a candidate for deduplication.
+    @deDuplication = true
 
     # Other options set by individual completers include:
     # - tabId (TabCompleter)
@@ -390,6 +392,7 @@ class TabCompleter
           title: tab.title
           relevancyFunction: @computeRelevancy
           tabId: tab.id
+          deDuplicate: false
       onComplete suggestions
 
   computeRelevancy: (suggestion) ->
@@ -665,7 +668,7 @@ class MultiCompleter
     suggestions =
       for suggestion in suggestions
         url = suggestion.shortenUrl()
-        continue if seenUrls[url]
+        continue if suggestion.deDuplicate and seenUrls[url]
         break if count++ == @maxResults
         seenUrls[url] = suggestion
 
-- 
cgit v1.2.3


From 402004f3567042a9fa940c3fd66ece1f60c10f88 Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Wed, 27 May 2015 15:17:17 +0100
Subject: Tap-to-open only in omni-mode vomnibar.

Do not use tab-to-open the vominibar in tabs mode.  (It doesn't make any
sense.)
---
 pages/vomnibar.coffee | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pages/vomnibar.coffee b/pages/vomnibar.coffee
index fd7fd3cc..423ffa59 100644
--- a/pages/vomnibar.coffee
+++ b/pages/vomnibar.coffee
@@ -126,9 +126,12 @@ class VomnibarUI
     if (action == "dismiss")
       @hide()
     else if action in [ "tab", "down" ]
-      if @input.value.trim().length == 0 and action == "tab" and not @seenTabToOpenCompletionList
-        @seenTabToOpenCompletionList = true
-        @update true
+      if action == "tab" and
+        @completer.name == "omni" and
+        not @seenTabToOpenCompletionList and
+        @input.value.trim().length == 0
+          @seenTabToOpenCompletionList = true
+          @update true
       else
         @selection += 1
         @selection = @initialSelectionValue if @selection == @completions.length
-- 
cgit v1.2.3