Merge "Validate the dirty flag before saving preferences in each modules"

This commit is contained in:
jenkins-bot
2013-11-13 12:40:48 +00:00
committed by Gerrit Code Review
2 changed files with 19 additions and 2 deletions

View File

@@ -571,10 +571,18 @@
}, },
/** /**
* Handle the apply button press * Handle the apply button press.
* Note that the button press may not be from the input settings module.
* For example, a user can change input settings and then go to display settings panel,
* do some changes and press apply button there. That press is applicable for all
* modules.
*/ */
apply: function () { apply: function () {
var displaySettings = this; var displaySettings = this;
if ( !displaySettings.dirty ) {
// No changes to save in this module.
return;
}
// Save the preferences // Save the preferences
mw.webfonts.preferences.save( function ( result ) { mw.webfonts.preferences.save( function ( result ) {

View File

@@ -500,7 +500,11 @@
}, },
/** /**
* Handle the apply button press * Handle the apply button press.
* Note that the button press may not be from the input settings module.
* For example, a user can change input settings and then go to display settings panel,
* do some changes and press apply button there. That press is applicable for all
* modules.
*/ */
apply: function () { apply: function () {
var previousIM, var previousIM,
@@ -510,6 +514,11 @@
currentLanguage = $.ime.preferences.getLanguage(), currentLanguage = $.ime.preferences.getLanguage(),
currentIM = $.ime.preferences.getIM( currentLanguage ); currentIM = $.ime.preferences.getIM( currentLanguage );
if ( !inputSettings.dirty ) {
// No changes to save in this module.
return;
}
if ( previousLanguage ) { if ( previousLanguage ) {
previousIM = inputSettings.savedRegistry.imes[previousLanguage]; previousIM = inputSettings.savedRegistry.imes[previousLanguage];
} }