From fe6ae65c988051d720085b6bd5c6e7b3a4e1ac50 Mon Sep 17 00:00:00 2001 From: Nikerabbit Date: Wed, 14 Oct 2020 14:31:49 +0000 Subject: [PATCH] Revert "Update jquery.webfonts" This reverts commit e0e69d35b216cc314c5bc82c80dd35d1774fa8d8. Reason for revert: causes more JS errors Change-Id: Iceef32eb2f858d7b28e1e173d63c060c4407c2bd --- lib/jquery.webfonts/src/jquery.webfonts.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/jquery.webfonts/src/jquery.webfonts.js b/lib/jquery.webfonts/src/jquery.webfonts.js index e7f146cb..a28ca39d 100644 --- a/lib/jquery.webfonts/src/jquery.webfonts.js +++ b/lib/jquery.webfonts/src/jquery.webfonts.js @@ -200,8 +200,7 @@ $elements.each( function( i, element ) { var fontFamilyStyle, fontFamily, - $element = $( element ), - elementLanguage = element.attributes.lang; + $element = $( element ); if ( $element.is( webfonts.options.exclude ) ) { return; @@ -215,7 +214,7 @@ if ( fontFamilyStyle ) { // if it is overridable, override. always. 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 if ( fontFamily ) { addToFontQueue( fontFamily ); @@ -231,7 +230,7 @@ } // 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. if ( webfonts.hasExplicitFontStyle ( $element ) && !webfonts.isOverridable( fontFamilyStyle ) ) { @@ -240,7 +239,7 @@ // browser settings. return; } else { - fontFamily = webfonts.getFont( elementLanguage, element.className.split(/\s+/) ); + fontFamily = webfonts.getFont( element.lang, element.className.split(/\s+/) ); } if ( !fontFamily ) {