From 46ee1444e08815cd3ec4d1f008d62d13b35ad777 Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Thu, 6 Nov 2014 08:50:59 +0000
Subject: Include scheme for domain suggestions; tighter test for valid domain.

---
 lib/utils.coffee | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/utils.coffee b/lib/utils.coffee
index e2ed8d98..62749496 100644
--- a/lib/utils.coffee
+++ b/lib/utils.coffee
@@ -33,17 +33,18 @@ Utils =
           return true if url.startsWith prefix
       false
 
+  hasFullUrlPrefix: do ->
+    urlPrefix = new RegExp "^[a-z]{3,}://."
+    (url) -> urlPrefix.test url
+
   # Completes a partial URL (without scheme)
   createFullUrl: (partialUrl) ->
-    unless /^[a-z]{3,}:\/\//.test partialUrl
-      "http://" + partialUrl
-    else
-      partialUrl
+    if @hasFullUrlPrefix(partialUrl) then partialUrl else ("http://" + partialUrl)
 
   # Tries to detect if :str is a valid URL.
   isUrl: (str) ->
     # Starts with a scheme: URL
-    return true if /^[a-z]{3,}:\/\//.test str
+    return true if @hasFullUrlPrefix str
 
     # Must not contain spaces
     return false if ' ' in str
-- 
cgit v1.2.3