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

Merge "Get the saved font using the fontSelector defined in mw.webfonts.setup"

Browse Source
This commit is contained in:
jenkins-bot
2013-05-27 11:05:45 +00:00
committed by Gerrit Code Review
parent 4861ff1ea7 f23666a15a
commit 702197a8a7
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -358,7 +358,8 @@
// Remove all current fonts // Remove all current fonts
$fontSelector.find( 'option' ).remove(); $fontSelector.find( 'option' ).remove();
savedFont = mw.webfonts.preferences.getFont( this.uiLanguage ); // Get the saved font using the fontSelector defined in mw.webfonts.setup
savedFont = this.$webfonts.getFont( language );
$.each( fonts, function ( key, font ) { $.each( fonts, function ( key, font ) {
var $fontOption; var $fontOption;

4
resources/js/ext.uls.webfonts.js
View File

@@ -62,10 +62,6 @@
font = repository.defaultFont( language ); font = repository.defaultFont( language );
} }
if ( font === 'system' ) {
font = null;
}
return font; return font;
}, },
exclude: ( function () { exclude: ( function () {