jenkins-bot has submitted this change and it was merged.
Change subject: Update jquery.webfonts to 17e61547
......................................................................
Update jquery.webfonts to 17e61547
Change-Id: Ib73c2504e2c90c3bfcada30ec59aeec40116a504
---
M lib/jquery.webfonts.js
1 file changed, 6 insertions(+), 8 deletions(-)
Approvals:
Santhosh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/jquery.webfonts.js b/lib/jquery.webfonts.js
index 52920cb..466c0f3 100644
--- a/lib/jquery.webfonts.js
+++ b/lib/jquery.webfonts.js
@@ -387,7 +387,7 @@
* @return {String} CSS
*/
getCSS: function( fontFamily, variant ) {
- var webfonts, base, version, versionSuffix,
+ var webfonts, base,
fontFaceRule, userAgent, fontStyle, fontFormats,
fontconfig = this.repository.get( fontFamily );
@@ -404,15 +404,13 @@
}
base = this.repository.base;
- version = fontconfig.version;
- versionSuffix = '?version=' + version;
fontFaceRule = '@font-face { font-family: \'' +
fontFamily + '\';\n';
userAgent = window.navigator.userAgent;
fontStyle = fontconfig.fontstyle || 'normal';
fontFormats = [];
if ( fontconfig.eot ) {
- fontFaceRule += '\tsrc: url(\'' + base +
fontconfig.eot + versionSuffix + '\');\n';
+ fontFaceRule += '\tsrc: url(\'' + base +
fontconfig.eot + '\');\n';
}
fontFaceRule += '\tsrc: ';
@@ -424,22 +422,22 @@
}
if ( fontconfig.woff2 ) {
- fontFormats.push( '\t\turl(\'' + base +
fontconfig.woff2 + versionSuffix
+ fontFormats.push( '\t\turl(\'' + base +
fontconfig.woff2
+ '\') format(\'woff2\')' );
}
if ( fontconfig.woff ) {
- fontFormats.push( '\t\turl(\'' + base +
fontconfig.woff + versionSuffix
+ fontFormats.push( '\t\turl(\'' + base +
fontconfig.woff
+ '\') format(\'woff\')' );
}
if ( fontconfig.svg ) {
- fontFormats.push( '\t\turl(\'' + base +
fontconfig.svg + versionSuffix + '#'
+ fontFormats.push( '\t\turl(\'' + base +
fontconfig.svg + '#'
+ fontFamily + '\') format(\'svg\')' );
}
if ( fontconfig.ttf ) {
- fontFormats.push( '\t\turl(\'' + base +
fontconfig.ttf + versionSuffix
+ fontFormats.push( '\t\turl(\'' + base +
fontconfig.ttf
+ '\') format(\'truetype\')' );
}
--
To view, visit https://gerrit.wikimedia.org/r/291875
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib73c2504e2c90c3bfcada30ec59aeec40116a504
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: 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
