jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/344909 )
Change subject: Update jquery.webfonts to 14b7700 from upstream
......................................................................
Update jquery.webfonts to 14b7700 from upstream
Changes:
* Fix @font-face local() syntax
Change-Id: Ib19feb896249020f4552fd18ba4fc2fbd75a4559
---
M lib/jquery.webfonts/src/jquery.webfonts.js
1 file changed, 4 insertions(+), 2 deletions(-)
Approvals:
jenkins-bot: Verified
Santhosh: Looks good to me, approved
diff --git a/lib/jquery.webfonts/src/jquery.webfonts.js
b/lib/jquery.webfonts/src/jquery.webfonts.js
index 466c0f3..b85631e 100644
--- a/lib/jquery.webfonts/src/jquery.webfonts.js
+++ b/lib/jquery.webfonts/src/jquery.webfonts.js
@@ -388,13 +388,15 @@
*/
getCSS: function( fontFamily, variant ) {
var webfonts, base,
- fontFaceRule, userAgent, fontStyle, fontFormats,
+ fontFaceRule, userAgent, fontStyle,
fontFormats, fullFontName,
fontconfig = this.repository.get( fontFamily );
variant = variant || 'normal';
+ fullFontName = fontFamily;
if ( variant !== 'normal' ) {
if ( fontconfig.variants !== undefined &&
fontconfig.variants[variant] ) {
+ fullFontName =
fontconfig.variants[variant];
fontconfig = this.repository.get(
fontconfig.variants[variant] );
}
}
@@ -418,7 +420,7 @@
if ( userAgent.match( /Android 2\.3/ ) === null ) {
// Android 2.3.x does not respect local()
syntax.
//
http://code.google.com/p/android/issues/detail?id=10609
- fontFaceRule += 'local(\'' + fontFamily +
'\'),';
+ fontFaceRule += 'local(\'' + fullFontName +
'\'),';
}
if ( fontconfig.woff2 ) {
--
To view, visit https://gerrit.wikimedia.org/r/344909
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib19feb896249020f4552fd18ba4fc2fbd75a4559
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: KartikMistry <[email protected]>
Gerrit-Reviewer: Amire80 <[email protected]>
Gerrit-Reviewer: Nikerabbit <[email protected]>
Gerrit-Reviewer: Santhosh <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
