Keep previous input settings if new language selected and cancelled
Bug: 56913 Change-Id: If25c0cc07ae233085d1b270f9a75a0002ffe1882
This commit is contained in:
committed by
Nikerabbit
parent
a1b8316ecc
commit
6f113bdf19
@@ -63,9 +63,9 @@
|
|||||||
this.contentLanguage = this.getContentLanguage();
|
this.contentLanguage = this.getContentLanguage();
|
||||||
this.$imes = null;
|
this.$imes = null;
|
||||||
this.$parent = $parent;
|
this.$parent = $parent;
|
||||||
this.savedRegistry = $.extend( true, {}, $.ime.preferences.registry );
|
|
||||||
// ime system is lazy loaded, make sure it is initialized
|
// ime system is lazy loaded, make sure it is initialized
|
||||||
mw.ime.init();
|
mw.ime.init();
|
||||||
|
this.savedRegistry = $.extend( true, {}, $.ime.preferences.registry );
|
||||||
}
|
}
|
||||||
|
|
||||||
InputSettings.prototype = {
|
InputSettings.prototype = {
|
||||||
@@ -366,10 +366,10 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
onSelect: function ( langCode ) {
|
onSelect: function ( langCode ) {
|
||||||
inputSettings.markDirty();
|
|
||||||
$.ime.preferences.setLanguage( langCode );
|
$.ime.preferences.setLanguage( langCode );
|
||||||
inputSettings.$parent.show();
|
inputSettings.$parent.show();
|
||||||
inputSettings.prepareLanguages();
|
inputSettings.prepareLanguages();
|
||||||
|
inputSettings.markDirty();
|
||||||
},
|
},
|
||||||
languages: mw.ime.getLanguagesWithIME()
|
languages: mw.ime.getLanguagesWithIME()
|
||||||
} );
|
} );
|
||||||
|
|||||||
Reference in New Issue
Block a user