normalize urls so design url an preview url are similar

Polymer · Jun 18, 2014 · 13554ba · 13554ba
1 parent c3b9c8d
commit 13554ba
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/elements/design-frame/design-frame.html b/elements/design-frame/design-frame.html
@@ -67,7 +67,12 @@
   },
 
   'import': function(urls, callback) {
-    Polymer.import(urls, callback);
+    /* normalize metadata imports to our expectation that the design space
+    is inside a component folder */
+    var imports = urls.map(function(u) {
+      return u.replace('components/', '../');
+    });
+    Polymer.import(imports, callback);
   }
 
 });

diff --git a/elements/designer-element/frame.html b/elements/designer-element/frame.html
@@ -2,14 +2,14 @@
 <html>
 <head>
   <title>Polymer Designer</title>
-  <!-- normalize url to be same as designer -->
-  <base href="../../">
-  <script src="components/platform/platform.js"></script>
+  <!-- normalize url to be same as preview -->
+  <base href="../../components/element/">
+  <script src="../platform/platform.js"></script>
   <script>
     window.parent.postMessage('designer-loading', location.href);
   </script>
 
-  <link rel="import" href="elements/design-frame/design-frame.html">
+  <link rel="import" href="../../elements/design-frame/design-frame.html">
 
   <style>