Merge Utils.hasChromePrefix from mrmr1993.

2 files changed, 21 insertions, 5 deletions

diff --git a/lib/utils.coffee b/lib/utils.coffee
index a93831d7..bbcee1a0 100644
--- a/lib/utils.coffee
+++ b/lib/utils.coffee
@@ -25,11 +25,13 @@ Utils =
     id = 0
     -> id += 1
 
-  hasChromePrefix: (url) ->
-    chromePrefixes = [ "about", "view-source", "chrome-extension", "data" ]
-    for prefix in chromePrefixes
-      return true if url.startsWith prefix
-    false
+  hasChromePrefix: do ->
+    chromePrefixes = [ "about:", "view-source:", "chrome-extension:", "data:" ]
+    (url) ->
+      if 0 < url.indexOf ":"
+        for prefix in chromePrefixes
+          return true if url.startsWith prefix
+      false
 
   # Completes a partial URL (without scheme)
   createFullUrl: (partialUrl) ->
diff --git a/tests/unit_tests/utils_test.coffee b/tests/unit_tests/utils_test.coffee
index 76a023ed..b2d656ab 100644
--- a/tests/unit_tests/utils_test.coffee
+++ b/tests/unit_tests/utils_test.coffee
@@ -47,6 +47,20 @@ context "convertToUrl",
     assert.equal "http://www.google.com/search?q=google", Utils.convertToUrl("google")
     assert.equal "http://www.google.com/search?q=go%20ogle.com", Utils.convertToUrl("go ogle.com")
 
+context "hasChromePrefix",
+  should "detect chrome prefixes of URLs", ->
+    assert.isTrue Utils.hasChromePrefix "about:foobar"
+    assert.isTrue Utils.hasChromePrefix "view-source:foobar"
+    assert.isTrue Utils.hasChromePrefix "chrome-extension:foobar"
+    assert.isTrue Utils.hasChromePrefix "data:foobar"
+    assert.isTrue Utils.hasChromePrefix "data:"
+    assert.isFalse Utils.hasChromePrefix ""
+    assert.isFalse Utils.hasChromePrefix "about"
+    assert.isFalse Utils.hasChromePrefix "view-source"
+    assert.isFalse Utils.hasChromePrefix "chrome-extension"
+    assert.isFalse Utils.hasChromePrefix "data"
+    assert.isFalse Utils.hasChromePrefix "data :foobar"
+
 context "Function currying",
   should "Curry correctly", ->
     foo = (a, b) -> "#{a},#{b}"