Use document.location for makeRelPath

document.baseURI is a string, does not have properties like .host
googlearchive · Apr 9, 2014 · 896e245 · goto100 · Apr 25, 2014 · dfreedm
1 parent ccb7c30
commit 896e245
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 1 deletion.
diff --git a/src/url.js b/src/url.js
@@ -85,7 +85,7 @@ function resolveRelativeUrl(baseUrl, url) {
 }
 
 function makeDocumentRelPath(url) {
-  var root = document.baseURI;
+  var root = document.location;
   var u = new URL(url, root);
   if (u.host === root.host && u.port === root.port &&
       u.protocol === root.protocol) {

diff --git a/test/html/url.html b/test/html/url.html
@@ -0,0 +1,27 @@
+<!--
+Copyright 2013 The Polymer Authors. All rights reserved.
+Use of this source code is governed by a BSD-style
+license that can be found in the LICENSE file.
+-->
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>URL integration test</title>
+  <script src="../../../tools/test/htmltest.js"></script>
+  <script src="../../../tools/test/chai/chai.js"></script>
+  <script src="../../platform.js"></script>
+</head>
+<body>
+  <script>
+    var root = document.location;
+    var path = '/foo/bar';
+    var u = new URL(path, root);
+    chai.assert.equal(u.host, root.host);
+    chai.assert.equal(u.port, root.port);
+    chai.assert.equal(u.protocol, root.protocol);
+    chai.assert.equal(u.pathname, path);
+    done();
+  </script>
+</body>
+</html>
diff --git a/test/js/tests.js b/test/js/tests.js
@@ -23,6 +23,7 @@ htmlSuite('integration', function() {
 });
 
 htmlSuite('URL Loader', function() {
+  htmlTest('html/url.html');
   htmlTest('html/loader-deduplicate.html');
 });