bryce/mediawiki-extensions-UniversalLanguageSelector
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update jquery.webfonts to 14b7700 from upstream"

Browse Source
This commit is contained in:
jenkins-bot
2017-03-27 08:36:00 +00:00
committed by Gerrit Code Review
parent 942440559d 033bf62c00
commit 2e587f8bb4
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/jquery.webfonts/src/jquery.webfonts.js
View File

@@ -388,13 +388,15 @@
*/
getCSS: function( fontFamily, variant ) {
var webfonts, base,
fontFaceRule, userAgent, fontStyle, fontFormats,
fontFaceRule, userAgent, fontStyle, fontFormats, fullFontName,
fontconfig = this.repository.get( fontFamily );
variant = variant || 'normal';
fullFontName = fontFamily;
if ( variant !== 'normal' ) {
if ( fontconfig.variants !== undefined && fontconfig.variants[variant] ) {
fullFontName = fontconfig.variants[variant];
fontconfig = this.repository.get( fontconfig.variants[variant] );
}
}
@@ -418,7 +420,7 @@
if ( userAgent.match( /Android 2\.3/ ) === null ) {
// Android 2.3.x does not respect local() syntax.
// http://code.google.com/p/android/issues/detail?id=10609
fontFaceRule += 'local(\'' + fontFamily + '\'),';
fontFaceRule += 'local(\'' + fullFontName + '\'),';
}
if ( fontconfig.woff2 ) {