From ac067652c140e723bbea4939224a5ab55a12a683 Mon Sep 17 00:00:00 2001
From: Steven Orvell <sorvell@google.com>
Date: Fri, 3 Mar 2017 16:42:11 -0800
Subject: [PATCH] * allow setting `rootPath` * disallow setting `importPath`
 (this is supported in 2.x but not 1.x)

---
 src/lib/resolve-url.html  |  3 ++-
 src/mini/template.html    | 18 +++++++++---------
 test/unit/resolveurl.html | 36 +++++++++++++++++++++++++++++++++++-
 3 files changed, 46 insertions(+), 11 deletions(-)

diff --git a/src/lib/resolve-url.html b/src/lib/resolve-url.html
index 74fc5f43fc..ac90f2734a 100644
--- a/src/lib/resolve-url.html
+++ b/src/lib/resolve-url.html
@@ -94,7 +94,8 @@
     };
 
     // NOTE: IE11 does not support baseURI
-    Polymer.rootPath = pathFromUrl(document.baseURI || window.location.href);
+    Polymer.rootPath = Polymer.Settings.rootPath ||
+      pathFromUrl(document.baseURI || window.location.href);
 
   })();
 
diff --git a/src/mini/template.html b/src/mini/template.html
index ca9587e29f..06cc31cde6 100644
--- a/src/mini/template.html
+++ b/src/mini/template.html
@@ -31,15 +31,15 @@
         module = Polymer.DomModule.import(this.is);
         this._template = module && module.querySelector('template');
       }
-      if (!this._importPath) {
-        if (module) {
-          var assetPath = module.getAttribute('assetpath') || '';
-          var importURL = Polymer.ResolveUrl.resolveUrl(assetPath,
-          module.ownerDocument.baseURI);
-          this._importPath = Polymer.ResolveUrl.pathFromUrl(importURL);
-        } else {
-          this._importPath = '';
-        }
+      // NOTE: users setting `_importPath` is supported in Polymer 2.x but not
+      // 1.x.
+      if (module) {
+        var assetPath = module.getAttribute('assetpath') || '';
+        var importURL = Polymer.ResolveUrl.resolveUrl(assetPath,
+        module.ownerDocument.baseURI);
+        this._importPath = Polymer.ResolveUrl.pathFromUrl(importURL);
+      } else {
+        this._importPath = '';
       }
       // stick finger in footgun
       if (this._template && this._template.hasAttribute('is')) {
diff --git a/test/unit/resolveurl.html b/test/unit/resolveurl.html
index b755aec9fa..416b720ef3 100644
--- a/test/unit/resolveurl.html
+++ b/test/unit/resolveurl.html
@@ -13,6 +13,11 @@
   <meta charset="UTF-8">
   <script src="../../../webcomponentsjs/webcomponents-lite.js"></script>
   <script src="../../../web-component-tester/browser.js"></script>
+  <script>
+    Polymer = {
+      rootPath: 'earlyRootPath/'
+    }
+  </script>
   <link rel="import" href="../../polymer.html">
   <link id="elements" rel="import" href="sub/resolveurl-elements.html">
 </head>
@@ -34,6 +39,26 @@
     </template>
   </dom-module>
 
+  <dom-module id="x-early">
+    <template>
+      <style>
+        :host {
+          background: url('foo.png');
+        }
+      </style>
+      <img id="root" src$="[[rootPath]]foo.png">
+      <img id="import" src$="[[importPath]]foo.png">
+    </template>
+    <script>
+    HTMLImports.whenReady(function() {
+      Polymer({ is: 'x-early'})
+    });
+    </script>
+  </dom-module>
+
+  <dom-module id="x-resolve">
+  </dom-module>
+
   <script>
     addEventListener('HTMLImportsLoaded', function() {
       Polymer({is: 'x-resolve'});
@@ -129,17 +154,26 @@
         document.body.removeChild(el);
       });
 
+      test('rootPath set early', function() {
+        var el = document.createElement('x-early');
+        document.body.appendChild(el);
+        var matchRoot = /earlyRootPath\//i;
+        assert.match(el.$.root.getAttribute('src'), matchRoot);
+        document.body.removeChild(el);
+      });
+
       test('Hybrid-url: changes via setting importPath/rootPath when defining element', function() {
         Polymer.rootPath = 'defineRoot/';
         Polymer({
           is: 'x-late',
+          // NOTE: setting importPath is not supported in Polymer 1.x.
           _importPath: 'defineImport/'
         });
         var el = document.createElement('x-late');
         document.body.appendChild(el);
         var matchRoot = /defineRoot\//i;
         var matchImport = /defineImport\//i;
-        assert.match(el.$.import.getAttribute('src'), matchImport);
+        assert.notMatch(el.$.import.getAttribute('src'), matchImport);
         assert.match(el.$.root.getAttribute('src'), matchRoot);
         document.body.removeChild(el);
       });