jenkins-bot has submitted this change and it was merged.
Change subject: Update webfonts and uls libs from upstream
......................................................................
Update webfonts and uls libs from upstream
Change-Id: I338950789e94e1638069ca97cf29cea2d78cf3b8
---
M lib/jquery.uls/i18n/mk.json
M lib/jquery.webfonts.js
2 files changed, 20 insertions(+), 20 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/jquery.uls/i18n/mk.json b/lib/jquery.uls/i18n/mk.json
index 05015f4..7381eec 100644
--- a/lib/jquery.uls/i18n/mk.json
+++ b/lib/jquery.uls/i18n/mk.json
@@ -12,7 +12,7 @@
"uls-region-EU": "\u0415\u0432\u0440\u043e\u043f\u0430",
"uls-region-AS": "\u0410\u0437\u0438\u0458\u0430",
"uls-region-ME": "\u0411\u043b\u0438\u0437\u043e\u043a
\u0418\u0441\u0442\u043e\u043a",
- "uls-region-PA": "\u041f\u0430\u0446\u0438\u0444\u0438\u043a",
+ "uls-region-PA": "\u041e\u043a\u0435\u0430\u043d\u0438\u0458\u0430",
"uls-no-results-found": "\u041d\u0435
\u043f\u0440\u043e\u043d\u0430\u0458\u0434\u043e\u0432
\u043d\u0438\u0448\u0442\u043e",
"uls-common-languages":
"\u041f\u043e\u0437\u0430\u0441\u0442\u0430\u043f\u0435\u043d\u0438
\u0458\u0430\u0437\u0438\u0446\u0438",
"uls-no-results-suggestion-title": "\u041c\u043e\u0436\u0435 \u0434\u0430
\u0432\u0435
\u0438\u043d\u0442\u0435\u0440\u0435\u0441\u0438\u0440\u0430\u0430\u0442:",
diff --git a/lib/jquery.webfonts.js b/lib/jquery.webfonts.js
index 5f1d690..88c817e 100644
--- a/lib/jquery.webfonts.js
+++ b/lib/jquery.webfonts.js
@@ -16,7 +16,7 @@
*/
( function( $, window, document, undefined ) {
- "use strict";
+ 'use strict';
var WebFonts = function( element, options ) {
// Load defaults
@@ -252,50 +252,50 @@
base = this.repository.base;
version = fontconfig.version;
- versionSuffix = "?version=" + version + '&20120101';
- styleString = "@font-face { font-family: '" +
fontFamily + "';\n";
+ versionSuffix = '?version=' + version + '&20120101';
+ 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.
//
http://code.google.com/p/android/issues/detail?id=10609
- styleString += "local('" + fontFamily + "'),";
+ styleString += 'local(\'' + fontFamily + '\'),';
}
if ( fontconfig.woff ) {
- fontFormats.push( "\t\turl('" + base +
fontconfig.woff + versionSuffix
- + "') format('woff')" );
+ fontFormats.push( '\\t\\turl(\'' + base +
fontconfig.woff + versionSuffix
+ + '\') format(\'woff\')' );
}
if ( fontconfig.svg ) {
- fontFormats.push( "\t\turl('" + base +
fontconfig.svg + versionSuffix + "#"
- + fontFamily + "')
format('svg')" );
+ fontFormats.push( '\\t\\turl(\'' + base +
fontconfig.svg + versionSuffix + '#'
+ + fontFamily + '\')
format(\'svg\')' );
}
if ( fontconfig.ttf ) {
- fontFormats.push( "\t\turl('" + base +
fontconfig.ttf + versionSuffix
- + "') format('truetype')" );
+ 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 += "\tfont-weight:" +
fontconfig.fontweight + ";";
+ styleString += '\font-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 += "}";
+ styleString += '}';
if ( fontconfig.variants !== undefined ) {
$.each( fontconfig.variants, function (
variant, variantFontFamily ) {
--
To view, visit https://gerrit.wikimedia.org/r/61273
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I338950789e94e1638069ca97cf29cea2d78cf3b8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Amire80 <amir.ahar...@mail.huji.ac.il>
Gerrit-Reviewer: Siebrand <siebr...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
