Merge pull request #4357 from d3x7r0/master

Allow a url to omit the protocol
2014-02-28 14:32:19 -06:00 · 2014-02-28 14:32:19 -06:00 · 5c40d686d4
commit 5c40d686d4
parent a9caf97f85 220a8e4f0e
1 changed files with 5 additions and 1 deletions
--- a/src/shared/util.js
+++ b/src/shared/util.js
@ -228,7 +228,11 @@ function combineUrl(baseUrl, url) {
  if (url.charAt(0) == '/') {
    // absolute path
    var i = baseUrl.indexOf('://');
-    i = baseUrl.indexOf('/', i + 3);
+    if (url.charAt(1) === '/') {
+      ++i;
+    } else {
+      i = baseUrl.indexOf('/', i + 3);
+    }
    return baseUrl.substring(0, i) + url;
  } else {
    // relative path