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

Update jquery.webfonts.js to upstream dcbed4f

Browse Source 
Changes, 364c43..dcbed4f:
* dcbed4f Remove magic date from version query string
* 2354edc Merge pull request #35 from siebrand/4
* 6efa320 Update formatting
* faa1d08 Cleanup whitespace and comments

Change-Id: I84ae5f8299bbb7eb5dca4a2c1a404715b365bfe9
This commit is contained in:
Ori Livneh
2013-10-16 00:38:24 -07:00
committed by Siebrand
parent ec532d6347
commit c446001efd
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/jquery.webfonts.js
View File

@@ -211,16 +211,25 @@
// Load and apply fonts for other language tagged elements (batched)
if ( element.lang && element.lang !== webfonts.language ) {
// Child element's language differs from parent.
fontFamily = webfonts.getFont( element.lang );
if ( !fontFamily ) {
// If there is no explicit font for this language, it will
// inherit the webfont for the parent. But that is undesirable here
// since language is different. So inherit the original font of the
// element. Define it explicitly so that inheritance is broken.
// No font preference for the language.
// Check if we need to reset for this language.
// If the font of the parent element, to which webfonts were applied,
// remained the same, there is no need to reset.
if ( webfonts.$element.css( 'fontFamily' ) !== webfonts.originalFontFamily ) {
// The parent font changed.
// Is there an inheritance?
// Is the font for this element the same as parent's font?
if ( fontFamilyStyle === webfonts.$element.css( 'fontFamily' ) ) {
// Break inheritance of the font from the parent element
// by applying the original font to this element
fontFamily = webfonts.originalFontFamily;
}
}
}
// We do not have fonts for all languages
if ( fontFamily !== null ) {
append( fontQueue, fontFamily );
@@ -366,8 +375,6 @@
fontFaceRule += '\tfont-weight:' + fontconfig.fontweight + ';';
}
fontFaceRule += '\tfont-style:' + fontStyle + ';';
if ( fontconfig.fontweight !== undefined ) {
fontFaceRule += '\tfont-weight:' + fontconfig.fontweight + ';';
}