jenkins-bot has submitted this change and it was merged.
Change subject: Update from upstream
......................................................................
Update from upstream
Unbreaks escaping.
Change-Id: If7774237ba7993f366c6999c9fcefcd56d9221d2
---
M lib/jquery.webfonts.js
1 file changed, 12 insertions(+), 12 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/jquery.webfonts.js b/lib/jquery.webfonts.js
index 88c817e..4cc01e0 100644
--- a/lib/jquery.webfonts.js
+++ b/lib/jquery.webfonts.js
@@ -253,15 +253,15 @@
base = this.repository.base;
version = fontconfig.version;
versionSuffix = '?version=' + version + '&20120101';
- styleString = '@font-face { font-family: \'' +
fontFamily + '\';\\n';
+ styleString = '@font-face { font-family: \'' +
fontFamily + '\';\n';
userAgent = window.navigator.userAgent;
fontStyle = fontconfig.fontstyle || 'normal';
fontFormats = [];
if ( fontconfig.eot ) {
- styleString += '\\tsrc: url(\'' + base +
fontconfig.eot + versionSuffix + '\');\\n';
+ styleString += '\tsrc: url(\'' + base +
fontconfig.eot + versionSuffix + '\');\n';
}
- styleString += '\\tsrc: ';
+ styleString += '\tsrc: ';
// If the font is present locally, use it.
if ( userAgent.match( /Android 2\.3/ ) === null ) {
// Android 2.3.x does not respect local()
syntax.
@@ -269,30 +269,30 @@
styleString += 'local(\'' + fontFamily + '\'),';
}
if ( fontconfig.woff ) {
- fontFormats.push( '\\t\\turl(\'' + base +
fontconfig.woff + versionSuffix
+ fontFormats.push( '\t\turl(\'' + base +
fontconfig.woff + versionSuffix
+ '\') format(\'woff\')' );
}
if ( fontconfig.svg ) {
- fontFormats.push( '\\t\\turl(\'' + base +
fontconfig.svg + versionSuffix + '#'
+ fontFormats.push( '\t\turl(\'' + base +
fontconfig.svg + versionSuffix + '#'
+ fontFamily + '\')
format(\'svg\')' );
}
if ( fontconfig.ttf ) {
- fontFormats.push( '\\t\\turl(\'' + base +
fontconfig.ttf + versionSuffix
+ fontFormats.push( '\t\turl(\'' + base +
fontconfig.ttf + versionSuffix
+ '\') format(\'truetype\')' );
}
- styleString += fontFormats.join() + ';\\n';
+ styleString += fontFormats.join() + ';\n';
if ( fontconfig.fontweight ) {
- styleString += '\\tfont-weight:' +
fontconfig.fontweight + ';';
+ styleString += '\tfont-weight:' +
fontconfig.fontweight + ';';
}
- styleString += '\\tfont-style:' + fontStyle + ';';
+ styleString += '\tfont-style:' + fontStyle + ';';
if ( fontconfig.fontweight !== undefined ) {
- styleString += '\font-weight:' +
fontconfig.fontweight + ';';
+ styleString += '\tfont-weight:' +
fontconfig.fontweight + ';';
}
if ( fontconfig.fontstyle !== undefined ) {
- styleString += '\\tfont-style:' +
fontconfig.fontstyle + ';';
+ styleString += '\tfont-style:' +
fontconfig.fontstyle + ';';
} else {
- styleString += '\\tfont-style: normal;';
+ styleString += '\tfont-style: normal;';
}
styleString += '}';
--
To view, visit https://gerrit.wikimedia.org/r/61562
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If7774237ba7993f366c6999c9fcefcd56d9221d2
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Amire80 <[email protected]>
Gerrit-Reviewer: Nikerabbit <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
