Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions lib/inline.js
Original file line number Diff line number Diff line change
Expand Up @@ -491,20 +491,29 @@ module.exports = function makeJuiceClient(juiceClient) {

function juiceDocument($, options) {
options = utils.getDefaultOptions(options);

// Track data-embed style elements before getStylesData removes the attribute
var embedStyleElements = new Set();
if (options.removeInlinedSelectors && !options.removeStyleTags) {
$('style[data-embed]').each(function() {
embedStyleElements.add(this);
});
}

var css = extractCssFromDocument($, options);
css += '\n' + options.extraCss;

var inlinedSelectors = inlineDocument($, css, options);

// If removeInlinedSelectors is enabled, update style tags to remove inlined rules
if (inlinedSelectors && !options.removeStyleTags) {
updateStyleTags($, inlinedSelectors, options);
updateStyleTags($, inlinedSelectors, options, embedStyleElements);
}

return $;
}

function updateStyleTags($, inlinedSelectors, options) {
function updateStyleTags($, inlinedSelectors, options, embedStyleElements) {
var stylesList = $('style');
stylesList.each(function() {
var styleElement = this;
Expand All @@ -514,7 +523,8 @@ module.exports = function makeJuiceClient(juiceClient) {
return;
}

if ($(styleElement).attr('data-embed') !== undefined) {
// Skip data-embed style elements (attribute may have been removed by getStylesData)
if (embedStyleElements && embedStyleElements.has(styleElement)) {
return;
}

Expand Down
10 changes: 10 additions & 0 deletions test/juice.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -406,6 +406,16 @@ it('removeInlinedSelectors', function() {
assert.ok(result.indexOf('<style>') === -1, 'style tag should be removed as all rules are inlined');
});

it('preserves styles in `data-embed` style tags', function() {
var result = juice(
'<style>div { color: blue; }</style><style data-embed>img {color: red}</style><div>Test</div>',
{ removeStyleTags: false, removeInlinedSelectors: true }
);
assert.ok(result.indexOf('style="color: blue;"') > -1, 'div styles should be inlined');
assert.ok(result.indexOf('<style>img {color: red}</style>') > -1, 'data-embed style tag content should be completely untouched');
assert.ok(result.indexOf('data-embed') === -1, 'data-embed attribute should be removed');
});

it('/* juice ignore */ (entire file)', function () {
var css = '/* juice ignore */\nbody { color: red; }\n.test { color: blue; }';
var html = '<body><div class="test">Hello</div></body>';
Expand Down