fix: fixed core bug with getPreservedText (closes #328)

Automattic · Mar 11, 2019 · a3f6610 · a3f6610
1 parent ce4aa01
commit a3f6610
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 15 deletions.
diff --git a/lib/cheerio.js b/lib/cheerio.js
@@ -1,5 +1,5 @@
 'use strict';
-
+    
 /**
  * Module dependencies.
  */

diff --git a/lib/inline.js b/lib/inline.js
@@ -352,8 +352,8 @@ function getStylesData($, options) {
         mediaQueries: options.preserveMediaQueries,
         fontFaces: options.preserveFontFaces,
         keyFrames: options.preserveKeyFrames,
-        pseudos: juiceClient.ignoredPseudos
-      });
+        pseudos: options.preservePseudos
+      }, juiceClient.ignoredPseudos);
       if (preservedText) {
         styleElement.childNodes[0].nodeValue = preservedText;
       } else {

diff --git a/lib/utils.js b/lib/utils.js
@@ -85,7 +85,7 @@ exports.parseCSS = function(css) {
  * @api public
  */
 
-exports.getPreservedText = function(css, options) {
+exports.getPreservedText = function(css, options, ignoredPseudos) {
   var parsed = mensch.parse(css, {position: true, comments: true});
   var rules = typeof parsed.stylesheet != 'undefined' && parsed.stylesheet.rules ? parsed.stylesheet.rules : [];
   var preserved = [];
@@ -95,7 +95,7 @@ exports.getPreservedText = function(css, options) {
     if ((options.fontFaces && rules[i].type === 'font-face') ||
         (options.mediaQueries && rules[i].type === 'media') ||
         (options.keyFrames && rules[i].type === 'keyframes') ||
-        (options.pseudos && rules[i].selectors && this.matchesPseudo(rules[i].selectors[0], options.pseudos))) {
+        (options.pseudos && rules[i].selectors && this.matchesPseudo(rules[i].selectors[0], ignoredPseudos))) {
       preserved.unshift(
         mensch.stringify(
           { stylesheet: { rules: [ rules[i] ] }},

diff --git a/test/cases/juice-content/height-attr.html b/test/cases/juice-content/height-attr.html
@@ -29,7 +29,7 @@
             </td>
         </tr>
     </table>
-    <img src="" alt="high" class="px">
-    <img src="" alt="high" class="percentage">
+    <img src alt="high" class="px">
+    <img src alt="high" class="percentage">
 </body>
 </html>
diff --git a/test/cases/juice-content/height-attr.out b/test/cases/juice-content/height-attr.out
@@ -22,7 +22,7 @@
             </td>
         </tr>
     </table>
-    <img src="" alt="high" class="px" style="height: 200px;" height="200">
-    <img src="" alt="high" class="percentage" style="height: 50%;">
+    <img src alt="high" class="px" style="height: 200px;" height="200">
+    <img src alt="high" class="percentage" style="height: 50%;">
 </body>
 </html>
diff --git a/test/cases/juice-content/width-attr.html b/test/cases/juice-content/width-attr.html
@@ -29,7 +29,7 @@
             </td>
         </tr>
     </table>
-    <img src="" alt="wide" class="px">
-    <img src="" alt="wide" class="percentage">
+    <img src alt="wide" class="px">
+    <img src alt="wide" class="percentage">
 </body>
 </html>
diff --git a/test/cases/juice-content/width-attr.out b/test/cases/juice-content/width-attr.out
@@ -22,7 +22,7 @@
             </td>
         </tr>
     </table>
-    <img src="" alt="wide" class="px" style="width: 200px;" width="200">
-    <img src="" alt="wide" class="percentage" style="width: 50%;">
+    <img src alt="wide" class="px" style="width: 200px;" width="200">
+    <img src alt="wide" class="percentage" style="width: 50%;">
 </body>
 </html>
diff --git a/test/juice.test.js b/test/juice.test.js
@@ -189,6 +189,6 @@ it('test style attributes and important priority', function() {
 
 it('test that preserved text order is stable', function() {
   assert.deepEqual(
-      utils.getPreservedText('div { color: red; } @media (min-width: 320px) { div { color: green; } } @media (max-width: 640px) { div { color: blue; } }', { mediaQueries: true }).replace(/\s+/g, ' '),
+      utils.getPreservedText('div { color: red; } @media (min-width: 320px) { div { color: green; } } @media (max-width: 640px) { div { color: blue; } }', { mediaQueries: true }, juice.ignoredPseudos).replace(/\s+/g, ' '),
       ' @media (min-width: 320px) { div { color: green; } } @media (max-width: 640px) { div { color: blue; } } ');
-});
+});