Merge branch 'master' into post-1.46

1 files changed, 15 insertions, 3 deletions

diff --git a/lib/utils.coffee b/lib/utils.coffee
index 2efb4716..661f7e84 100644
--- a/lib/utils.coffee
+++ b/lib/utils.coffee
@@ -87,11 +87,17 @@ Utils =
     # Fallback: no URL
     return false
 
+  # Map a search query to its URL encoded form. The query may be either a string or an array of strings.
+  # E.g. "BBC Sport" -> "BBC+Sport".
+  createSearchQuery: (query) ->
+    query = query.split(/\s+/) if typeof(query) == "string"
+    query.map(encodeURIComponent).join "+"
+
   # Creates a search URL from the given :query.
   createSearchUrl: (query) ->
-    # it would be better to pull the default search engine from chrome itself,
-    # but it is not clear if/how that is possible
-    Settings.get("searchUrl") + encodeURIComponent(query)
+    # It would be better to pull the default search engine from chrome itself.  However, unfortunately chrome
+    # does not provide an API for doing so.
+    Settings.get("searchUrl") + @createSearchQuery query
 
   # Converts :string into a Google search if it's not already a URL. We don't bother with escaping characters
   # as Chrome will do that for us.
@@ -109,6 +115,12 @@ Utils =
   # detects both literals and dynamically created strings
   isString: (obj) -> typeof obj == 'string' or obj instanceof String
 
+  # Transform "zjkjkabz" into "abjkz".
+  distinctCharacters: (str) ->
+    unique = ""
+    for char in str.split("").sort()
+      unique += char unless 0 <= unique.indexOf char
+    unique
 
   # Compares two version strings (e.g. "1.1" and "1.5") and returns
   # -1 if versionA is < versionB, 0 if they're equal, and 1 if versionA is > versionB.