Make paths relative only if they start the same.

googlearchive · Aug 22, 2013 · 701d348 · 701d348
1 parent 830760c
commit 701d348
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 2 deletions.
diff --git a/src/HTMLImports.js b/src/HTMLImports.js
@@ -288,7 +288,7 @@ var path = {
       return url;
     }
     url = this.compressUrl(this.urlToPath(baseUrl) + url);
-    if (relativeToDocument && !this.isAbsUrl(url)) {
+    if (relativeToDocument) {
       url = path.makeRelPath(path.getDocumentUrl(document), url);
     }
     return url;
@@ -325,6 +325,10 @@ var path = {
     var s, t;
     s = this.compressUrl(inSource).split("/");
     t = this.compressUrl(inTarget).split("/");
+    // bail if target is not relative to source
+    if (!s.length || s[0] !== t[0]) {
+      return inTarget;
+    }
     while (s.length && s[0] === t[0]){
       s.shift();
       t.shift();

diff --git a/test/html/imports/abs.html b/test/html/imports/abs.html
@@ -0,0 +1 @@
+<img src="../../foo.png">
diff --git a/test/html/path.html b/test/html/path.html
@@ -6,6 +6,15 @@
   <script src="../../tools/test/htmltest.js"></script>
   <script src="../../node_modules/chai/chai.js"></script>
   <script src="../../html-imports.js"></script>
+  <script>
+      var parts = window.location.pathname.split('/');
+      parts.pop();
+      var absBase = parts.join('/');
+      var l = document.createElement('link');
+      l.setAttribute('rel', 'import');
+      l.href = absBase + '/imports/abs.html';
+      document.head.appendChild(l);
+    </script>
 </head>
 <body>
   <script>
@@ -16,7 +25,18 @@
   url = 'http://foo/bar?baz="foo/../bar"';
   chai.assert.equal(path.compressUrl(url), url, 'query string is not counted in path compression');
 
-  done();
+  url = '/foo/bar/baz"';
+  chai.assert.equal(path.compressUrl(url), url, 'compressUrl handles url\'s starting with / as abs');
+  document.addEventListener('HTMLImportsLoaded', function() {
+    var i = document.querySelector('[rel=import]');
+    var importDoc = i.import.content;
+    var parts = window.location.href.split('/');
+    parts.pop();
+    parts.pop();
+    var expectedPath = parts.join('/') + '/foo.png';
+    chai.assert.equal(importDoc.querySelector('img').src, expectedPath);
+    done();  
+  });
   </script>
 </body>
 </html>