From a32479a6c97f83afefa86b02ec13de74e8c0a60f Mon Sep 17 00:00:00 2001 From: Tiago Alves Date: Wed, 14 Nov 2018 13:52:48 +0000 Subject: [PATCH] Added support for single quotes in css. --- demo/app/font-awesome.css | 4 ++-- src/lib.ts | 2 +- src/test/cleanvalue.spec.ts | 7 +++++++ src/test/font-awesome.css | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/demo/app/font-awesome.css b/demo/app/font-awesome.css index 1a83e0b..148758f 100644 --- a/demo/app/font-awesome.css +++ b/demo/app/font-awesome.css @@ -1,8 +1,8 @@ .fa-glass:before { - content: "\f000"; + content: '\f000'; } .fa-music:before { - content: "\f001"; + content: '\f001'; } .fa-search:before { content: "\f002"; diff --git a/src/lib.ts b/src/lib.ts index c68525f..7eb8f70 100644 --- a/src/lib.ts +++ b/src/lib.ts @@ -24,7 +24,7 @@ export const mapCss = (data: any, debug?: boolean): object => { }; export const cleanValue = (val: string): string | void => { - const matches = val.match(/content\s*:\s*"\\f([^"]+)"/i); + const matches = val.match(/content\s*:\s*["|']\\f([^"|^']+)["|']/i) if (matches) { return `\\uf${matches[1]}`; } diff --git a/src/test/cleanvalue.spec.ts b/src/test/cleanvalue.spec.ts index 97a6f8b..3641ee1 100644 --- a/src/test/cleanvalue.spec.ts +++ b/src/test/cleanvalue.spec.ts @@ -39,4 +39,11 @@ describe('Test cleanValue function', () => { ); }); + it('with single quotes', () => { + assert.strictEqual( + lib.cleanValue("content: '\\f000'; "), + '\\uf000', + ); + }); + }); diff --git a/src/test/font-awesome.css b/src/test/font-awesome.css index 8b2c602..beec1c8 100644 --- a/src/test/font-awesome.css +++ b/src/test/font-awesome.css @@ -11,4 +11,4 @@ } .fa-gear:before, .fa-cog:before{ content:"\f013"; } .fa-rotate-right:before,.fa-repeat:before{content:"\f01e"} -.fa-dedent:before,.fa-outdent:before{content:"\f03b"}.fa-photo:before,.fa-image:before,.fa-picture-o:before{content:"\f03e"} +.fa-dedent:before,.fa-outdent:before{content:'\f03b'}.fa-photo:before,.fa-image:before,.fa-picture-o:before{content:'\f03e'}