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

Revert "Update jquery.webfonts"

Browse Source 
This reverts commit e0e69d35b2.

Reason for revert: causes more JS errors

Change-Id: Iceef32eb2f858d7b28e1e173d63c060c4407c2bd
This commit is contained in:
Nikerabbit
2020-10-14 14:31:49 +00:00
committed by jenkins-bot
parent 98f0bb42bd
commit fe6ae65c98
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -200,8 +200,7 @@
$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;
@@ -215,7 +214,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( elementLanguage || webfonts.language ); fontFamily = webfonts.getFont( element.lang || 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 );
@@ -231,7 +230,7 @@
} }
// Load and apply fonts for other language tagged elements (batched) // Load and apply fonts for other language tagged elements (batched)
if ( elementLanguage && elementLanguage !== webfonts.language ) { if ( element.lang && element.lang !== 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 ) ) {
@@ -240,7 +239,7 @@
// browser settings. // browser settings.
return; return;
} else { } else {
fontFamily = webfonts.getFont( elementLanguage, element.className.split(/\s+/) ); fontFamily = webfonts.getFont( element.lang, element.className.split(/\s+/) );
} }
if ( !fontFamily ) { if ( !fontFamily ) {