Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/65658
Change subject: Get the saved font using the fontSelector defined in
mw.webfonts.setup
......................................................................
Get the saved font using the fontSelector defined in mw.webfonts.setup
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: 98bb1c200c8c8fe89a2b7ae1442e2354c6a48266 )
Change-Id: I62860f9d62538915628ad21e5d904e56bdcc9430
---
M resources/js/ext.uls.displaysettings.js
M resources/js/ext.uls.webfonts.js
2 files changed, 2 insertions(+), 5 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector
refs/changes/58/65658/1
diff --git a/resources/js/ext.uls.displaysettings.js
b/resources/js/ext.uls.displaysettings.js
index 892ba0a..f1a69c4 100644
--- a/resources/js/ext.uls.displaysettings.js
+++ b/resources/js/ext.uls.displaysettings.js
@@ -358,7 +358,8 @@
// Remove all current fonts
$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 ) {
var $fontOption;
diff --git a/resources/js/ext.uls.webfonts.js b/resources/js/ext.uls.webfonts.js
index 614a4db..206f664 100644
--- a/resources/js/ext.uls.webfonts.js
+++ b/resources/js/ext.uls.webfonts.js
@@ -62,10 +62,6 @@
font = repository.defaultFont( language
);
}
- if ( font === 'system' ) {
- font = null;
- }
-
return font;
},
exclude: ( function () {
--
To view, visit https://gerrit.wikimedia.org/r/65658
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I62860f9d62538915628ad21e5d904e56bdcc9430
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Santhosh <santhosh.thottin...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
