diff --git a/i18n/en.json b/i18n/en.json index 9f760d91..feb91264 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -22,9 +22,6 @@ "ext-uls-display-settings-anon-label": "Display language:", "ext-uls-display-settings-anon-same-as-content": "English (same as content)", "ext-uls-display-settings-anon-log-in-cta": "[[Special:UserLogin|Log in]] to select a different language for menus.", -"ext-uls-webfonts-settings-title": "Download font when needed", -"ext-uls-webfonts-settings-info": "Web fonts will be downloaded for displaying text in special scripts.", -"ext-uls-webfonts-settings-info-link": "More information", "ext-uls-webfonts-select-for": "Select font for $1", "ext-uls-webfonts-select-for-ui-info": "Font used for user interface", "ext-uls-webfonts-select-for-content-info": "Font used for content", diff --git a/resources/js/ext.uls.displaysettings.js b/resources/js/ext.uls.displaysettings.js index 049c3f7b..892ba0a0 100644 --- a/resources/js/ext.uls.displaysettings.js +++ b/resources/js/ext.uls.displaysettings.js @@ -78,18 +78,6 @@ + '' // End font selectors - // Webfonts enabling chechbox with label - + '
' - + '
' - + '' - + '
' - + '
' - + '' // End font settings section // Separator @@ -128,34 +116,10 @@ this.prepareLanguages(); this.prepareUIFonts(); this.prepareContentFonts(); - this.prepareWebfontsCheckbox(); this.i18n(); this.listen(); }, - prepareWebfontsCheckbox: function () { - var webFontsEnabled = this.isWebFontsEnabled(); - - if ( !webFontsEnabled ) { - this.$template.find( - '#uls-display-settings-font-selectors' - ).addClass( 'hide' ); - } - - $( '#webfonts-enable-checkbox' ).prop( 'checked', webFontsEnabled ); - }, - - isWebFontsEnabled: function () { - var enable = mw.webfonts.preferences.isEnabled(); - - // If the user didn't use the checkbox, the preference will be undefined. - // The default for now is to enable webfonts if the user didn't select anything. - if ( enable === undefined ) { - enable = true; - } - return enable; - }, - /** * Prepare the UI language selector */ @@ -371,11 +335,8 @@ // Get the language code from the right property - // uiLanguage or contentLanguage language = this[ target + 'Language' ]; - if ( this.isWebFontsEnabled() ) { - fonts = this.$webfonts.list( language ); - } else { - fonts = []; - } + fonts = this.$webfonts.list( language ); + // Possible classes: // uls-ui-fonts // uls-content-fonts @@ -408,7 +369,6 @@ } } ); - $fontSelector.prop( 'disabled', !this.isWebFontsEnabled() ); $systemFont = $( '