[MediaWiki-commits] [Gerrit] Remove webfonts enabling checkbox and associated preference - change (mediawiki...UniversalLanguageSelector)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove webfonts enabling checkbox and associated preference
..
Remove webfonts enabling checkbox and associated preference
Bug: 48535
Change-Id: If735a733717596fae03042c5e277bd538bd8501f
---
M i18n/en.json
M resources/js/ext.uls.displaysettings.js
M resources/js/ext.uls.webfonts.js
3 files changed, 4 insertions(+), 103 deletions(-)
Approvals:
Santhosh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/i18n/en.json b/i18n/en.json
index 9f760d9..feb9126 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 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();
- } );
-
-
[MediaWiki-commits] [Gerrit] Remove webfonts enabling checkbox and associated preference - change (mediawiki...UniversalLanguageSelector)
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' );
-
