bryce/mediawiki-extensions-UniversalLanguageSelector
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix the webfonts preferences"

Browse Source
This commit is contained in:
Siebrand
2013-01-02 15:21:19 +00:00
committed by Gerrit Code Review
parent bd42a61c0e 086ee5ff1d
commit ca9a7e6f3c
2 changed files with 77 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
resources/js/ext.uls.displaysettings.js
View File

@@ -293,7 +293,11 @@
// Get the language code from the right property -
// uiLanguage or contentLanguage
language = this[ target + 'Language' ];
fonts = this.$webfonts.list( language );
if ( this.isWebFontsEnabled() ) {
fonts = this.$webfonts.list( language );
} else {
fonts = [];
}
// Possible classes:
// uls-ui-fonts
// uls-content-fonts
@@ -425,11 +429,19 @@
if ( this.checked ) {
mw.webfonts.preferences.enable();
$contentFontSelector.prop( 'disabled', false );
mw.webfonts.setup();
that.$webfonts = $( 'body' ).data( 'webfonts' );
$contentFontSelector.removeAttr( 'disabled' );
$uiFontSelector.prop( 'disabled', false );
displaySettings.prepareContentFonts();
displaySettings.prepareUIFonts();
displaySettings.i18n();
displaySettings.$webfonts.apply( $uiFontSelector.find( 'option:selected' ) );
displaySettings.$webfonts.refresh();
} else {
mw.webfonts.preferences.disable();
mw.webfonts.preferences.setFont( that.uiLanguage, 'system' );
that.$webfonts.refresh();
$contentFontSelector.prop( 'disabled', true );
$uiFontSelector.prop( 'disabled', true );
displaySettings.$webfonts.reset();