From c52c0ea57f86c1c5a132819fe85e763db84ce712 Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Mon, 29 Dec 2014 16:33:23 +0000
Subject: Descriptions for custom search engines.

---
 background_scripts/settings.coffee | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'background_scripts/settings.coffee')

diff --git a/background_scripts/settings.coffee b/background_scripts/settings.coffee
index e90bc1f8..3ff74749 100644
--- a/background_scripts/settings.coffee
+++ b/background_scripts/settings.coffee
@@ -46,13 +46,19 @@ root.Settings = Settings =
   # this is a map that we use to store our search engines for use.
   searchEnginesMap: {}
 
-  # this parses the search engines settings and clears the old searchEngines and sets the new one
+  # Parse the custom search engines setting and cache it.
   parseSearchEngines: (searchEnginesText) ->
     @searchEnginesMap = {}
-    # find the split pairs by first splitting by line then splitting on the first `: `
-    split_pairs = ( pair.split( /: (.+)/, 2) for pair in searchEnginesText.split( /\n/ ) when pair[0] != "#" )
-    @searchEnginesMap[a[0]] = a[1] for a in split_pairs
-    @searchEnginesMap
+    for line in searchEnginesText.split /\n/
+      tokens = line.trim().split /\s+/
+      continue if tokens.length < 2 or tokens[0].startsWith('"') or tokens[0].startsWith("#")
+      keywords = tokens[0].split ":"
+      continue unless keywords.length == 2 and not keywords[1] # So, like: [ "w", "" ].
+      @searchEnginesMap[keywords[0]] =
+        url: tokens[1]
+        description: tokens[2..].join(" ")
+
+  # Fetch the search-engine map, building it if necessary.
   getSearchEngines: ->
     this.parseSearchEngines(@get("searchEngines") || "") if Object.keys(@searchEnginesMap).length == 0
     @searchEnginesMap
-- 
cgit v1.2.3


From 74b5c1a9bb54bbc2a2c9d30925d514e02a5515f7 Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Tue, 30 Dec 2014 07:16:45 +0000
Subject: Add description to default search engines settings.

---
 background_scripts/settings.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'background_scripts/settings.coffee')

diff --git a/background_scripts/settings.coffee b/background_scripts/settings.coffee
index 3ff74749..2fc3b43d 100644
--- a/background_scripts/settings.coffee
+++ b/background_scripts/settings.coffee
@@ -111,7 +111,7 @@ root.Settings = Settings =
     # default/fall back search engine
     searchUrl: "http://www.google.com/search?q="
     # put in an example search engine
-    searchEngines: "w: http://www.wikipedia.org/w/index.php?title=Special:Search&search=%s"
+    searchEngines: "w: http://www.wikipedia.org/w/index.php?title=Special:Search&search=%s wikipedia"
     newTabUrl: "chrome://newtab"
 
     settingsVersion: Utils.getCurrentVersion()
-- 
cgit v1.2.3