From 80ce8e068b819b0487901f84a28a0919c12f95e9 Mon Sep 17 00:00:00 2001
From: "Amir E. Aharoni" <amir.aharoni@mail.huji.ac.il>
Date: Tue, 18 Dec 2012 00:27:55 +0200
Subject: [PATCH] (bug 42440) Fix button state when canceling

Also changed class names to make finding cancel buttons easier.

Change-Id: Ieaf242eb03add06038307d913a87a196d41ba01d
---
 resources/js/ext.uls.displaysettings.js | 15 +++++++++++++--
 resources/js/ext.uls.inputsettings.js   |  4 ++--
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/resources/js/ext.uls.displaysettings.js b/resources/js/ext.uls.displaysettings.js
index 178f0788..ae178a86 100644
--- a/resources/js/ext.uls.displaysettings.js
+++ b/resources/js/ext.uls.displaysettings.js
@@ -80,7 +80,7 @@
 		// Apply and Cancel buttons
 		+ '<div class="row language-settings-buttons">'
 		+ '<div class="eleven columns">'
-		+ '<button class="button uls-settings-close" data-i18n="ext-uls-language-settings-cancel"></button>'
+		+ '<button class="button uls-display-settings-cancel" data-i18n="ext-uls-language-settings-cancel"></button>'
 		+ '<button class="button active blue" id="uls-displaysettings-apply" data-i18n="ext-uls-language-settings-apply" disabled></button>'
 		+ '</div>'
 		+ '</div>'
@@ -403,9 +403,20 @@
 				displaySettings.apply();
 			} );
 
-			this.$template.find( 'button.uls-settings-close' ).on( 'click', function () {
+			this.$template.find( 'button.uls-display-settings-cancel' ).on( 'click', function () {
 				mw.webfonts.preferences.setFont( displaySettings.contentLanguage, oldFont );
 				displaySettings.$webfonts.refresh();
+
+				displaySettings.$template.find( 'div.uls-ui-languages button.button' ).each( function () {
+					var $button = $( this );
+
+					if ( $button.attr( 'lang' ) === displaySettings.contentLanguage ) {
+						$button.addClass( 'down' );
+					} else {
+						$button.removeClass( 'down' );
+					}
+				} );
+
 				displaySettings.close();
 			} );
 
diff --git a/resources/js/ext.uls.inputsettings.js b/resources/js/ext.uls.inputsettings.js
index 8806ffaa..49dda790 100644
--- a/resources/js/ext.uls.inputsettings.js
+++ b/resources/js/ext.uls.inputsettings.js
@@ -61,7 +61,7 @@
 		// Apply and Cancel buttons
 		+ '<div class="row language-settings-buttons">'
 		+ '<div class="eleven columns">'
-		+ '<button class="button uls-input-settings-close" data-i18n="ext-uls-language-settings-cancel"></button>'
+		+ '<button class="button uls-input-settings-cancel" data-i18n="ext-uls-language-settings-cancel"></button>'
 		+ '<button class="active blue button uls-input-settings-apply" data-i18n="ext-uls-language-settings-apply" disabled></button>'
 		+ '</div>'
 		+ '</div>'
@@ -388,7 +388,7 @@
 				inputSettings.apply();
 			} );
 
-			inputSettings.$template.find( 'button.uls-input-settings-close' ).on( 'click', function () {
+			inputSettings.$template.find( 'button.uls-input-settings-cancel' ).on( 'click', function () {
 				inputSettings.close();
 			} );