Merge pull request #67 from PolymerElements/issue-65

If a relative baseUri is given, resolve it to an absolute one
PolymerElements · Sep 18, 2015 · ceee0ed · ceee0ed
2 parents ddec485 + 712cb2b
commit ceee0ed
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/platinum-sw-register.html b/platinum-sw-register.html
@@ -237,15 +237,17 @@
     _constructServiceWorkerUrl: function() {
       var paramsPromises = [];
       var children = Polymer.dom(this).children;
+      var baseUri = new URL(this.baseUri, window.location.href);
+
       for (var i = 0; i < children.length; i++) {
         if (typeof children[i]._getParameters === 'function') {
-          paramsPromises.push(children[i]._getParameters(this.baseUri));
+          paramsPromises.push(children[i]._getParameters(baseUri));
         }
       }
 
       return Promise.all(paramsPromises).then(function(paramsResolutions) {
         var params = {
-          baseURI: this.baseUri,
+          baseURI: baseUri,
           version: this._version
         };