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

Update jquery.webfonts

Browse Source 
https://github.com/wikimedia/jquery.webfonts/commit/95ff58e089

Bug: T265325
Change-Id: Id28fbfa12dc7a9aba21c26cafb5427db8b052d0f
This commit is contained in:
Niklas Laxström
2020-10-13 13:35:32 +02:00
parent 1ae44d3b1b
commit e0e69d35b2
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -200,7 +200,8 @@
$elements.each( function( i, element ) { $elements.each( function( i, element ) {
var fontFamilyStyle, fontFamily, var fontFamilyStyle, fontFamily,
$element = $( element ); $element = $( element ),
elementLanguage = element.attributes.lang;
if ( $element.is( webfonts.options.exclude ) ) { if ( $element.is( webfonts.options.exclude ) ) {
return; return;
@@ -214,7 +215,7 @@
if ( fontFamilyStyle ) { if ( fontFamilyStyle ) {
// if it is overridable, override. always. // if it is overridable, override. always.
if ( webfonts.isOverridable( fontFamilyStyle ) ) { if ( webfonts.isOverridable( fontFamilyStyle ) ) {
fontFamily = webfonts.getFont( element.lang || webfonts.language ); fontFamily = webfonts.getFont( elementLanguage || webfonts.language );
// We do not have fonts for all languages // We do not have fonts for all languages
if ( fontFamily ) { if ( fontFamily ) {
addToFontQueue( fontFamily ); addToFontQueue( fontFamily );
@@ -230,7 +231,7 @@
} }
// Load and apply fonts for other language tagged elements (batched) // Load and apply fonts for other language tagged elements (batched)
if ( element.lang && element.lang !== webfonts.language ) { if ( elementLanguage && elementLanguage !== webfonts.language ) {
// language differs. We may want to apply a different font. // language differs. We may want to apply a different font.
if ( webfonts.hasExplicitFontStyle ( $element ) && if ( webfonts.hasExplicitFontStyle ( $element ) &&
!webfonts.isOverridable( fontFamilyStyle ) ) { !webfonts.isOverridable( fontFamilyStyle ) ) {
@@ -239,7 +240,7 @@
// browser settings. // browser settings.
return; return;
} else { } else {
fontFamily = webfonts.getFont( element.lang, element.className.split(/\s+/) ); fontFamily = webfonts.getFont( elementLanguage, element.className.split(/\s+/) );
} }
if ( !fontFamily ) { if ( !fontFamily ) {