jenkins-bot has submitted this change and it was merged.
Change subject: Keep previous input settings if new language selected and
cancelled
......................................................................
Keep previous input settings if new language selected and cancelled
Bug: 56913
Change-Id: If25c0cc07ae233085d1b270f9a75a0002ffe1882
---
M resources/js/ext.uls.inputsettings.js
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/js/ext.uls.inputsettings.js
b/resources/js/ext.uls.inputsettings.js
index 57e5f94..814304a 100644
--- a/resources/js/ext.uls.inputsettings.js
+++ b/resources/js/ext.uls.inputsettings.js
@@ -63,9 +63,9 @@
this.contentLanguage = this.getContentLanguage();
this.$imes = null;
this.$parent = $parent;
- this.savedRegistry = $.extend( true, {},
$.ime.preferences.registry );
// ime system is lazy loaded, make sure it is initialized
mw.ime.init();
+ this.savedRegistry = $.extend( true, {},
$.ime.preferences.registry );
}
InputSettings.prototype = {
@@ -366,10 +366,10 @@
}
},
onSelect: function ( langCode ) {
- inputSettings.markDirty();
$.ime.preferences.setLanguage( langCode
);
inputSettings.$parent.show();
inputSettings.prepareLanguages();
+ inputSettings.markDirty();
},
languages: mw.ime.getLanguagesWithIME()
} );
--
To view, visit https://gerrit.wikimedia.org/r/95120
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If25c0cc07ae233085d1b270f9a75a0002ffe1882
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Santhosh <santhosh.thottin...@gmail.com>
Gerrit-Reviewer: Nikerabbit <niklas.laxst...@gmail.com>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
