From 67ac68a412f4db9886ea631b4d78af2b03af8b48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Laxstr=C3=B6m?= Date: Mon, 19 Oct 2020 09:02:36 +0200 Subject: [PATCH] Update jquery.webfonts https://github.com/wikimedia/jquery.webfonts/commit/23dc38d05940d53c56ef2018b7111c17c74b2667 Bug: T265325 Change-Id: I56ada1b32b9c68c286abfc503ed7f9aec49c76e8 --- lib/jquery.webfonts/src/jquery.webfonts.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/jquery.webfonts/src/jquery.webfonts.js b/lib/jquery.webfonts/src/jquery.webfonts.js index a28ca39d..db4ae6bf 100644 --- a/lib/jquery.webfonts/src/jquery.webfonts.js +++ b/lib/jquery.webfonts/src/jquery.webfonts.js @@ -200,7 +200,8 @@ $elements.each( function( i, element ) { var fontFamilyStyle, fontFamily, - $element = $( element ); + $element = $( element ), + elementLanguage = element.getAttribute( 'lang' ); if ( $element.is( webfonts.options.exclude ) ) { return; @@ -214,7 +215,7 @@ if ( fontFamilyStyle ) { // if it is overridable, override. always. 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 if ( fontFamily ) { addToFontQueue( fontFamily ); @@ -230,7 +231,7 @@ } // 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. if ( webfonts.hasExplicitFontStyle ( $element ) && !webfonts.isOverridable( fontFamilyStyle ) ) { @@ -239,7 +240,7 @@ // browser settings. return; } else { - fontFamily = webfonts.getFont( element.lang, element.className.split(/\s+/) ); + fontFamily = webfonts.getFont( elementLanguage, element.className.split(/\s+/) ); } if ( !fontFamily ) {