Support multiple font-{x} rules. (#7)

ronik-design · Dec 21, 2016 · d54476a · d54476a
1 parent 56c3ee4
commit d54476a
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 11 deletions.
diff --git a/index.js b/index.js
@@ -28,7 +28,7 @@ var declWalker = function (decl) {
 
     var objFit = decl.value;
 
-    var existingFont = getLastPropertyDecl(parent, /font|font-family/);
+    var existingFont = getLastPropertyDecl(parent, /^font(-family)?$/);
     var objPosition = getLastPropertyDecl(parent, 'object-position');
 
     var value = [

diff --git a/test.js b/test.js
@@ -15,19 +15,19 @@ function run(t, input, output, opts = {}) {
 test('adds font-family declaration', (t) => {
     return run(
         t,
-        'a{object-fit:cover}',
-        'a{font-family:"object-fit:cover";object-fit:cover}',
+        'a{object-fit:cover;}',
+        'a{font-family:"object-fit:cover";object-fit:cover;}',
         { }
     );
 });
 
 test('adds object-position declaration', (t) => {
     return run(
         t,
-        'a{object-fit: cover;object-position: top}',
+        'a{object-fit: cover;object-position: top;}',
         'a{font-family: "object-fit:cover;object-position:top";' +
         'object-fit: cover;' +
-        'object-position: top}',
+        'object-position: top;}',
         { }
     );
 });
@@ -38,14 +38,16 @@ test('keeps existing font-family declaration', (t) => {
         'a{' +
             'object-fit: cover;' +
             'object-position: top;' +
-            'font-family: "Helvetica Neue", Helvetica, sans-serif' +
+            'font-family: "Helvetica Neue", Helvetica, sans-serif;' +
+            'font-weight: bold;' +
         '}',
         'a{' +
             'object-fit: cover;' +
             'object-position: top;' +
             'font-family: ' +
                 '"object-fit:cover;object-position:top", ' +
-                '"Helvetica Neue", Helvetica, sans-serif' +
+                '"Helvetica Neue", Helvetica, sans-serif;' +
+            'font-weight: bold;' +
         '}',
         { }
     );
@@ -58,15 +60,17 @@ test('keeps the last existing font-family declaration', (t) => {
             'font-family: overridden;' +
             'object-fit: cover;' +
             'object-position: top;' +
-            'font-family: "Helvetica Neue", Helvetica, sans-serif' +
+            'font-family: "Helvetica Neue", Helvetica, sans-serif;' +
+            'font-weight: bold;' +
         '}',
         'a{' +
             'font-family: overridden;' +
             'object-fit: cover;' +
             'object-position: top;' +
             'font-family: ' +
                 '"object-fit:cover;object-position:top", ' +
-                '"Helvetica Neue", Helvetica, sans-serif' +
+                '"Helvetica Neue", Helvetica, sans-serif;' +
+            'font-weight: bold;' +
         '}',
         { }
     );
@@ -79,7 +83,8 @@ test('keeps existing font declaration', (t) => {
             'font-family: overridden;' +
             'object-fit: cover;' +
             'object-position: top;' +
-            'font: strong 1em/1 "Helvetica Neue", Helvetica, sans-serif' +
+            'font: strong 1em/1 "Helvetica Neue", Helvetica, sans-serif;' +
+            'font-weight: normal;' +
         '}',
         'a{' +
             'font-family: overridden;' +
@@ -88,7 +93,8 @@ test('keeps existing font declaration', (t) => {
             'font: strong 1em/1 "Helvetica Neue", Helvetica, sans-serif;' +
             'font-family: ' +
                 '"object-fit:cover;object-position:top", ' +
-                '"Helvetica Neue", Helvetica, sans-serif' +
+                '"Helvetica Neue", Helvetica, sans-serif;' +
+            'font-weight: normal;' +
         '}',
         { }
     );