Inline stylesheet happens after import path fixup, so outputPath of r…

…ewriteURL should be the overall outputPath Use getTextContent when reading stylesheets
Polymer · Apr 25, 2014 · ab330f1 · ab330f1
1 parent 4e927dd
commit ab330f1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/lib/pathresolver.js b/lib/pathresolver.js
@@ -6,7 +6,9 @@
 
 var path = require('path');
 var constants = require('./constants.js');
-var setTextContent = require('./utils.js').setTextContent;
+var utils = require('./utils.js');
+var setTextContent = utils.setTextContent;
+var getTextContent = utils.getTextContent;
 
 function resolvePaths($, input, output) {
   var assetPath = path.relative(output, input);
@@ -32,7 +34,7 @@ function resolvePaths($, input, output) {
   });
   $(constants.CSS).each(function() {
     var el = $(this);
-    var text = rewriteURL(input, output, el.text());
+    var text = rewriteURL(input, output, getTextContent(el));
     setTextContent(el, text);
   });
   $(constants.ELEMENTS).each(function() {

diff --git a/lib/vulcan.js b/lib/vulcan.js
@@ -66,7 +66,7 @@ function inlineSheets($, inputPath, outputPath) {
     if (href && !excludeStyle(href)) {
       var filepath = path.resolve(options.outputDir, href);
       // fix up paths in the stylesheet to be relative to the location of the style
-      var content = pathresolver.rewriteURL(path.dirname(filepath), inputPath, readFile(filepath));
+      var content = pathresolver.rewriteURL(path.dirname(filepath), outputPath, readFile(filepath));
       var styleDoc = cheerio.load('<style>' + content + '</style>');
       // clone attributes
       styleDoc('style').attr(el.attr());