Merge pull request #3019 from WebsiteDeveloper/Issue-3013

jrowny · jrowny · commit 0cc3e5f41126 · 2013-03-05T15:21:26.000-08:00
Changed to check for case insensitive http: and https:
diff --git a/src/preferences/PreferencesDialogs.js b/src/preferences/PreferencesDialogs.js
@@ -56,8 +56,8 @@ define(function (require, exports, module) {
         var obj = PathUtils.parseUrl(url);
         if (!obj) {
             result = Strings.BASEURL_ERROR_UNKOWN_ERROR;
-        } else if (obj.protocol !== "http:"  && obj.protocol !== "https:") {
-            result = StringUtils.format(Strings.BASEURL_ERROR_INVALID_PROTOCOL, obj.protocol);
+        } else if (obj.href.search(/^(http|https):\/\//i) !== 0) {
+            result = StringUtils.format(Strings.BASEURL_ERROR_INVALID_PROTOCOL, obj.href.substring(0, obj.href.indexOf("//")));
         } else if (obj.search !== "") {
             result = StringUtils.format(Strings.BASEURL_ERROR_SEARCH_DISALLOWED, obj.search);
         } else if (obj.hash !== "") {
