From 97bfe5f039ae9044fc634448ad3a97b1cdc05792 Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Fri, 29 May 2015 17:06:55 +0100
Subject: Verify keyword for custom search-engine activation.

For ...

    map s Vomnibar.activate keyword=g

... we verify that "g" is indeed a custom search-engine keyword before
setting it.  If it is not, we output a console.log message and launch a
vanilla vomnibar. (An alternative would be to bail.)
---
 lib/utils.coffee | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'lib')

diff --git a/lib/utils.coffee b/lib/utils.coffee
index cb7b4d5c..77e2b68d 100644
--- a/lib/utils.coffee
+++ b/lib/utils.coffee
@@ -245,14 +245,10 @@ SearchEngines =
           tokens = line.split /\s+/
           continue unless 2 <= tokens.length
           keyword = tokens[0].split(":")[0]
-          url = tokens[1]
+          searchUrl = tokens[1]
           description = tokens[2..].join(" ") || "search (#{keyword})"
-          continue unless Utils.hasFullUrlPrefix url
-          engines[keyword] =
-            keyword: keyword
-            searchUrl: url
-            description: description
-            searchUrlPrefix: url.split("%s")[0]
+          continue unless Utils.hasFullUrlPrefix searchUrl
+          engines[keyword] = { keyword, searchUrl, description }
 
         callback engines
 
-- 
cgit v1.2.3