jenkins-bot has submitted this change and it was merged.
Change subject: Cleanup for jslint and coding conventions
......................................................................
Cleanup for jslint and coding conventions
Change-Id: I6884759d9622220721840f44220648dce7838ff6
---
M resources/js/ext.uls.displaysettings.js
1 file changed, 15 insertions(+), 11 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/js/ext.uls.displaysettings.js
b/resources/js/ext.uls.displaysettings.js
index fab120f..661cf1e 100644
--- a/resources/js/ext.uls.displaysettings.js
+++ b/resources/js/ext.uls.displaysettings.js
@@ -314,7 +314,8 @@
* @param target String 'ui' or 'content'
*/
prepareFontSelector: function ( target ) {
- var language, fonts, $fontSelector, savedFont,
$systemFont, $fontLabel, $fontsSection;
+ var language, fonts, $fontSelector, savedFont,
+ $systemFont, $fontLabel, $fontsSection;
// Get the language code from the right property -
// uiLanguage or contentLanguage
@@ -347,8 +348,10 @@
savedFont = mw.webfonts.preferences.getFont(
this.uiLanguage );
$.each( fonts, function ( key, font ) {
+ var $fontOption;
+
if ( font !== 'system' ) {
- var $fontOption = $( '<option>' ).attr(
'value', font ).text( font );
+ $fontOption = $( '<option>' ).attr(
'value', font ).text( font );
$fontSelector.append( $fontOption );
$fontOption.attr( 'selected', savedFont
=== font );
}
@@ -477,21 +480,24 @@
$uiFontSelector.on( 'change', function () {
displaySettings.enableApplyButton();
- var font = $( this ).find( 'option:selected'
).val();
- mw.webfonts.preferences.setFont(
displaySettings.uiLanguage, font );
+
+ mw.webfonts.preferences.setFont(
displaySettings.uiLanguage,
+ $( this ).find( 'option:selected'
).val()
+ );
displaySettings.$webfonts.refresh();
} );
$contentFontSelector.on( 'change', function () {
displaySettings.enableApplyButton();
- var font = $( this ).find( 'option:selected'
).val();
- mw.webfonts.preferences.setFont(
displaySettings.contentLanguage, font );
+
+ mw.webfonts.preferences.setFont(
displaySettings.contentLanguage,
+ $( this ).find( 'option:selected'
).val()
+ );
displaySettings.$webfonts.refresh();
} );
$tabButtons.on( 'click', function () {
- var $subPanels,
- $button = $( this );
+ var $button = $( this );
if ( $button.hasClass( 'down' ) ) {
return;
@@ -547,9 +553,7 @@
if ( this.uiLanguage !== this.getUILanguage() )
{
mw.uls.changeLanguage( this.uiLanguage
);
}
- } else {
- // FIXME failure. what to do?!
- }
+ } // @todo What to do in case of failure?
},
/**
--
To view, visit https://gerrit.wikimedia.org/r/61272
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6884759d9622220721840f44220648dce7838ff6
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
