From 3c65ec183cb7de1ababb7ea8151f27c60e37b402 Mon Sep 17 00:00:00 2001 From: Santhosh Thottingal Date: Mon, 17 Nov 2014 14:19:17 +0530 Subject: [PATCH] Update jquery.webfonts Use latest upstream version. Commit: 482d0a8df22f * Adds support for WOFF2 webfont format Change-Id: Ic5e966eb14dc70017f9b15787b9ca1cb9043f23b --- lib/jquery.webfonts.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/jquery.webfonts.js b/lib/jquery.webfonts.js index c28df958..d205dee1 100644 --- a/lib/jquery.webfonts.js +++ b/lib/jquery.webfonts.js @@ -308,6 +308,7 @@ return item.replace( /[\s'"]/g, '' ); } ); fontFamily = fontFamily.replace( /[\s'"]/g, '' ); + return $.inArray( fontFamily, overridableFontFamilies ) >= 0; }, @@ -422,6 +423,11 @@ fontFaceRule += 'local(\'' + fontFamily + '\'),'; } + if ( fontconfig.woff2 ) { + fontFormats.push( '\t\turl(\'' + base + fontconfig.woff2 + versionSuffix + + '\') format(\'woff2\')' ); + } + if ( fontconfig.woff ) { fontFormats.push( '\t\turl(\'' + base + fontconfig.woff + versionSuffix + '\') format(\'woff\')' );