Merge "Fire the ime-enable/disable hook upon saving the preferences"

resources/js/ext.uls.eventlogger.js

@@ -110,16 +110,18 @@
 
 		/**
 		 * Log IME disabling
+		 * @param {string} context Where the setting was changed.
 		 */
-		disableIME: function () {
+		disableIME: function ( context ) {
-			this.log( { action: 'ime-disable' } );
+			this.log( { action: 'ime-disable', context: context } );
 		},
 
 		/**
 		 * Log IME enabling
+		 * @param {string} context Where the setting was changed.
 		 */
-		enableIME: function () {
+		enableIME: function ( context ) {
-			this.log( { action: 'ime-enable' } );
+			this.log( { action: 'ime-enable', context: context } );
 		},
 
 		/**

resources/js/ext.uls.ime.js

@@ -81,13 +81,11 @@
 		disable: function () {
 			this.registry.isDirty = true;
 			this.registry.enable = false;
-			mw.hook( 'mw.uls.ime.disable' ).fire();
 		},
 
 		enable: function () {
 			this.registry.isDirty = true;
 			this.registry.enable = true;
-			mw.hook( 'mw.uls.ime.enable' ).fire();
 		},
 
 		isEnabled: function () {
@@ -152,6 +150,7 @@
 			$.ime.preferences.save( function () {
 				mw.ime.disable();
 				imeNotification();
+				mw.hook( 'mw.uls.ime.disable' ).fire( 'menu' );
 			} );
 			e.stopPropagation();
 		} );

resources/js/ext.uls.inputsettings.js

@@ -528,12 +528,20 @@
 		 * Handle the apply button press
 		 */
 		apply: function () {
-			var inputSettings = this;
+			var toggleHookName,
+				inputSettings = this;
 
 			mw.hook( 'mw.uls.ime.change' ).fire(
 				$.ime.preferences.getIM( $.ime.preferences.getLanguage() )
 			);
 
+			if ( inputSettings.savedRegistry.enable !== $.ime.preferences.isEnabled() ) {
+				toggleHookName = $.ime.preferences.isEnabled() ?
+					'mw.uls.ime.enable' :
+					'mw.uls.ime.disable';
+				mw.hook( toggleHookName ).fire( 'inputsettings' );
+			}
+
 			// Save the preferences
 			$.ime.preferences.save( function ( result ) {
 				// closure for not losing the scope