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

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

Browse Source 
Also make sure that correct language is passed to the getFont
It was wrong in current version - UI language was passed always
(introduced in a refactoring to avoid code duplication for content
and ui language- commit: 98bb1c200c )

Change-Id: I62860f9d62538915628ad21e5d904e56bdcc9430
This commit is contained in:
Santhosh Thottingal
2013-05-27 14:39:47 +05:30
parent 164568e516
commit f23666a15a
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 () {