Update from upstream
Unbreak previous update. Done in pair programming with Niklas. Change-Id: I8ccd5284363f38deac6df522c879867abf583c1a
This commit is contained in:
@@ -142,7 +142,9 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
injectCSS( fontFaceRule );
|
if ( fontFaceRule !== '' ) {
|
||||||
|
injectCSS( fontFaceRule );
|
||||||
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
},
|
},
|
||||||
@@ -185,7 +187,9 @@
|
|||||||
|
|
||||||
append( fontQueue, fontFamily );
|
append( fontQueue, fontFamily );
|
||||||
// Load and apply fonts for other language tagged elements (batched)
|
// Load and apply fonts for other language tagged elements (batched)
|
||||||
} else if ( element.lang && element.lang !== webfonts.$element.attr( 'lang' ) ) {
|
}
|
||||||
|
|
||||||
|
if ( element.lang && element.lang !== webfonts.$element.attr( 'lang' ) ) {
|
||||||
fontFamily = webfonts.getFont( element.lang );
|
fontFamily = webfonts.getFont( element.lang );
|
||||||
// We do not have fonts for all languages
|
// We do not have fonts for all languages
|
||||||
if ( fontFamily !== null ) {
|
if ( fontFamily !== null ) {
|
||||||
|
|||||||
Reference in New Issue
Block a user