From 6073d820ff25f824b575a797f160b3204e0e9863 Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Sat, 2 May 2015 15:19:20 +0100
Subject: Search completion; generalize Google regexp.

---
 background_scripts/search_engines.coffee | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'background_scripts')

diff --git a/background_scripts/search_engines.coffee b/background_scripts/search_engines.coffee
index f07a9df4..e96e2c76 100644
--- a/background_scripts/search_engines.coffee
+++ b/background_scripts/search_engines.coffee
@@ -7,11 +7,17 @@
 #
 class Google
   constructor: ->
+    @regexps = [
+      # We include matches for the major English-speaking TLDs.
+      new RegExp "^https?://[a-z]+\.google\.(com|ie|co.uk|ca|com.au)/"
+      # NOTE(smblott). A  temporary hack, just for me, and just for development. Will be removed.
+      new RegExp "localhost/.*/booky"
+      ]
+
   name: "Google"
   match: (searchUrl) ->
-    return true if /^https?:\/\/[a-z]+.google.com\//.test searchUrl
-    # NOTE(smblott). A  temporary hack, just for me, and just for development. Will be removed.
-    return true if /localhost\/.*\/booky/.test searchUrl
+    for re in @regexps
+      return true if re.test searchUrl
     false
 
   getUrl: (queryTerms) ->
-- 
cgit v1.2.3