Amire80 has uploaded a new change for review. https://gerrit.wikimedia.org/r/64976
Change subject: Remove webfonts enabling checkbox and associated preference ...................................................................... Remove webfonts enabling checkbox and associated preference Bug: 48535 Change-Id: If735a733717596fae03042c5e277bd538bd8501f --- M resources/js/ext.uls.displaysettings.js M resources/js/ext.uls.webfonts.js 2 files changed, 3 insertions(+), 99 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector refs/changes/76/64976/1 diff --git a/resources/js/ext.uls.displaysettings.js b/resources/js/ext.uls.displaysettings.js index 049c3f7..892ba0a 100644 --- a/resources/js/ext.uls.displaysettings.js +++ b/resources/js/ext.uls.displaysettings.js @@ -78,18 +78,6 @@ + '</div>' // End font selectors - // Webfonts enabling chechbox with label - + '<div class="row">' - + '<div class="eleven columns">' - + '<label class="checkbox">' - + '<input type="checkbox" id="webfonts-enable-checkbox" />' - + '<strong data-i18n="ext-uls-webfonts-settings-title"></strong> ' - + '<span data-i18n="ext-uls-webfonts-settings-info"></span> ' - + '<a target="_blank" href="//www.mediawiki.org/wiki/Special:MyLanguage/Help:Extension:WebFonts" data-i18n="ext-uls-webfonts-settings-info-link"></a>' - + '</label>' - + '</div>' - + '</div>' - + '</div>' // End font settings section // Separator @@ -128,32 +116,8 @@ 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; }, /** @@ -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 = $( '<option>' ).val( 'system' ).text( $.i18n( 'ext-uls-webfonts-system-font' ) ); $fontSelector.append( $systemFont ); $systemFont.attr( 'selected', savedFont === 'system' || !savedFont ); @@ -500,36 +460,6 @@ } ); displaySettings.close(); - } ); - - displaySettings.$template.find( '#webfonts-enable-checkbox' ).on( 'click', function () { - var $fontSelectors = displaySettings.$template.find( - '#uls-display-settings-font-selectors' - ); - - displaySettings.enableApplyButton(); - - if ( this.checked ) { - $fontSelectors.removeClass( 'hide' ); - mw.webfonts.preferences.enable(); - mw.webfonts.setup(); - displaySettings.$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 { - $fontSelectors.addClass( 'hide' ); - mw.webfonts.preferences.disable(); - mw.webfonts.preferences.setFont( displaySettings.uiLanguage, 'system' ); - displaySettings.$webfonts.refresh(); - $contentFontSelector.prop( 'disabled', true ); - $uiFontSelector.prop( 'disabled', true ); - displaySettings.$webfonts.reset(); - } } ); $uiFontSelector.on( 'change', function () { diff --git a/resources/js/ext.uls.webfonts.js b/resources/js/ext.uls.webfonts.js index c50e134..2ee928d 100644 --- a/resources/js/ext.uls.webfonts.js +++ b/resources/js/ext.uls.webfonts.js @@ -25,19 +25,6 @@ mw.webfonts.preferences = { registry: { 'fonts': {}, - 'webfonts-enabled': true - }, - - isEnabled: function () { - return this.registry['webfonts-enabled']; - }, - - enable: function () { - this.registry['webfonts-enabled'] = true; - }, - - disable: function () { - this.registry['webfonts-enabled'] = false; }, setFont: function ( language, font ) { @@ -94,8 +81,6 @@ }; $( document ).ready( function () { - var webfontsEnabled; - // MediaWiki specific overrides for jquery.webfonts $.extend( $.fn.webfonts.defaults, { repository: mediawikiFontRepository, @@ -103,18 +88,7 @@ } ); mw.webfonts.preferences.load(); - - webfontsEnabled = mw.webfonts.preferences.isEnabled(); - - // If the user didn't set anything, the preference will be undefined. - // The default for now is to enable webfonts if the user didn't select anything. - if ( webfontsEnabled === undefined ) { - webfontsEnabled = true; - } - - if ( webfontsEnabled ) { - mw.webfonts.setup(); - } + mw.webfonts.setup(); } ); }( jQuery, mediaWiki, document ) ); -- To view, visit https://gerrit.wikimedia.org/r/64976 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If735a733717596fae03042c5e277bd538bd8501f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector Gerrit-Branch: master Gerrit-Owner: Amire80 <amir.ahar...@mail.huji.ac.il> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits