jenkins-bot has submitted this change and it was merged. Change subject: Fix cancel behaviour of display settings ......................................................................
Fix cancel behaviour of display settings Font selection becomes persistent despite cancelling it Bug: 47976 Change-Id: Iea4b65a8a13da3cb4a86f5b6521d62cb1372b42a --- M resources/js/ext.uls.displaysettings.js 1 file changed, 6 insertions(+), 3 deletions(-) Approvals: Amire80: Looks good to me, approved jenkins-bot: Verified diff --git a/resources/js/ext.uls.displaysettings.js b/resources/js/ext.uls.displaysettings.js index f1a69c4..f75fc72 100644 --- a/resources/js/ext.uls.displaysettings.js +++ b/resources/js/ext.uls.displaysettings.js @@ -434,7 +434,8 @@ var displaySettings = this, $contentFontSelector = this.$template.find( '#content-font-selector' ), $uiFontSelector = this.$template.find( '#ui-font-selector' ), - oldFont = $uiFontSelector.find( 'option:selected' ).val(), + oldUIFont = $uiFontSelector.find( 'option:selected' ).val(), + oldContentFont = $contentFontSelector.find( 'option:selected' ).val(), $tabButtons = displaySettings.$template.find( '.uls-display-settings-tab-switcher button' ); // TODO all these repeated selectors can be placed in object constructor. @@ -444,7 +445,8 @@ } ); displaySettings.$template.find( 'button.uls-display-settings-cancel' ).on( 'click', function () { - mw.webfonts.preferences.setFont( displaySettings.contentLanguage, oldFont ); + mw.webfonts.preferences.setFont( displaySettings.contentLanguage, oldContentFont ); + mw.webfonts.preferences.setFont( displaySettings.uiLanguage, oldUIFont ); if ( displaySettings.$webfonts ) { displaySettings.$webfonts.refresh(); @@ -459,7 +461,8 @@ $button.removeClass( 'down' ); } } ); - + displaySettings.prepareUIFonts(); + displaySettings.prepareContentFonts(); displaySettings.close(); } ); -- To view, visit https://gerrit.wikimedia.org/r/65670 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iea4b65a8a13da3cb4a86f5b6521d62cb1372b42a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector Gerrit-Branch: master Gerrit-Owner: Santhosh <santhosh.thottin...@gmail.com> Gerrit-Reviewer: Amire80 <amir.ahar...@mail.huji.ac.il> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits