From 35ac3b972ac7911085145890864360aa9fed7c19 Mon Sep 17 00:00:00 2001 From: Santhosh Thottingal Date: Tue, 10 Sep 2013 22:19:50 -0700 Subject: [PATCH] Fix monospace font usage for input fields for latin scripts Updating jquery.webfonts from upstream Bug: 53734 Change-Id: I58c9c3fb74774e26e0f680cec0b0f9b2d3b2c11c --- lib/jquery.webfonts.js | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/lib/jquery.webfonts.js b/lib/jquery.webfonts.js index c034348d..f3edc3e3 100644 --- a/lib/jquery.webfonts.js +++ b/lib/jquery.webfonts.js @@ -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. - fontFamily = webfonts.originalFontFamily; + // 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 + ';'; }