From 6f113bdf19ec16d1448dc0c7b0238185809b5427 Mon Sep 17 00:00:00 2001
From: Santhosh Thottingal <santhosh.thottingal@gmail.com>
Date: Wed, 13 Nov 2013 14:21:11 +0530
Subject: [PATCH] Keep previous input settings if new language selected and
 cancelled

Bug: 56913
Change-Id: If25c0cc07ae233085d1b270f9a75a0002ffe1882
---
 resources/js/ext.uls.inputsettings.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/js/ext.uls.inputsettings.js b/resources/js/ext.uls.inputsettings.js
index 57e5f946..814304ab 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()
 			} );