From ef4d9cb7a6f5ddceb643deaeb94edc5886baad93 Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Sun, 10 May 2015 06:55:30 +0100
Subject: Search completion; minor tweaks.

---
 background_scripts/completion.coffee | 4 ++--
 background_scripts/main.coffee       | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'background_scripts')

diff --git a/background_scripts/completion.coffee b/background_scripts/completion.coffee
index 40123337..447c47a2 100644
--- a/background_scripts/completion.coffee
+++ b/background_scripts/completion.coffee
@@ -376,10 +376,10 @@ class SearchEngineCompleter
           searchUrl: tokens[1]
           description: description
 
-      # Deliver the resulting engines AsyncDataFetcher lookup table.
+      # Deliver the resulting engines AsyncDataFetcher table/data.
       callback engines
 
-      # Let the vomnibar know the custom search engine keywords.
+      # Let the vomnibar in the front end know the custom search engine keywords.
       port.postMessage
         handler: "keywords"
         keywords: key for own key of engines
diff --git a/background_scripts/main.coffee b/background_scripts/main.coffee
index 612f6170..d0411f6e 100644
--- a/background_scripts/main.coffee
+++ b/background_scripts/main.coffee
@@ -62,7 +62,11 @@ completers =
 completionHandlers =
   filter: (completer, request, port) ->
     completer.filter request, (response) ->
-      port.postMessage extend request, extend response, handler: "completions"
+      # We use try here because this may fail if the sender has already navigated away from the original page.
+      # This can happen, for example, when posting completion suggestions from the SearchEngineCompleter
+      # (which can be slow).
+      try
+        port.postMessage extend request, extend response, handler: "completions"
 
   refresh: (completer, _, port) -> completer.refresh port
   cancel: (completer, _, port) -> completer.cancel port
-- 
cgit v1.2.3