Revert "Load jquery.ime only when user focus on editable fields"

This reverts commit 63d547915f.

Bug: 52115
Change-Id: I1d6b65622e8a103a8a892beacf268e77b9e1b2d0

Resources.php

@@ -33,12 +33,10 @@ $wgResourceModules['ext.uls.geoclient'] = array(
 $wgResourceModules['ext.uls.ime'] = array(
 	'scripts' => 'resources/js/ext.uls.ime.js',
 	'dependencies' => array(
+		'jquery.ime',
 		'ext.uls.init',
 		'ext.uls.preferences',
 	),
-	'messages' => array(
-		'uls-ime-helppage',
-	),
 ) + $resourcePaths;
 
 // Styles for users who disabled JavaScript
@@ -77,9 +75,11 @@ $wgResourceModules['ext.uls.inputsettings'] = array(
 	'dependencies' => array(
 		'ext.uls.languagesettings',
 		'ext.uls.ime',
-		'jquery.ime',
 		'jquery.i18n',
 	),
+	'messages' => array(
+		'uls-ime-helppage',
+	),
 ) + $resourcePaths;
 
 // Interface language selection module

resources/js/ext.uls.ime.js

@@ -19,7 +19,7 @@
 ( function ( $, mw, document, undefined ) {
 	'use strict';
 
-	var mwImeRulesPath, inputSelector, inputPreferences, ulsIMEPreferences, customHelpLink;
+	var mwImeRulesPath, inputSelector, inputPreferences;
 
 	mwImeRulesPath = mw.config.get( 'wgExtensionAssetsPath' ) +
 		'/UniversalLanguageSelector/lib/jquery.ime/';
@@ -57,7 +57,8 @@
 		return unique.slice( 0, 6 );
 	};
 
-	ulsIMEPreferences = {
+	// Extend the ime preference system
+	$.extend( $.ime.preferences, {
 
 		save: function ( callback ) {
 			if ( !this.registry.isDirty ) {
@@ -101,10 +102,15 @@
 		getDefaultLanguage: function () {
 			return mw.config.get( 'wgContentLanguage' );
 		}
-	};
+	} );
 
-	// Add a 'more setttings' link that takes to input settings of ULS
+	// MediaWiki specific overrides for jquery.ime
-	customHelpLink = function () {
+	$.extend( $.ime.defaults, {
+		imePath: mwImeRulesPath
+	} );
+
+	// Add a 'more settings' link that takes to input settings of ULS
+	$.fn.imeselector.Constructor.prototype.helpLink = function () {
 		var $disableInputToolsLink, $moreSettingsLink,
 			imeselector = this;
 
@@ -167,40 +173,19 @@
 		$( inputSelector ).trigger( 'destroy.ime' );
 	};
 
-	mw.ime.init = function () {
-		// Extend the ime preference system
-		$.extend( $.ime.preferences, ulsIMEPreferences );
-		// MediaWiki specific overrides for jquery.ime
-		$.extend( $.ime.defaults, {
-			imePath: mwImeRulesPath
-		} );
-		// Load the ime preferences
-		$.ime.preferences.load();
-		$.fn.imeselector.Constructor.prototype.helpLink = customHelpLink;
-	};
-
 	mw.ime.setup = function () {
-		if ( $.ime ) {
-			mw.ime.init();
-		}
 
 		$( 'body' ).on( 'focus.ime', inputSelector, function () {
 			var imeselector, $input, noImeSelector;
 
-			$input = $( this );
+			// It's possible to disable IME through the settings
-
+			// panels before it was initialized, so we need to check
-			if ( !$.ime ) {
+			// that it's supposed to be initialized
-				mw.loader.using( 'jquery.ime', function () {
-					mw.ime.init();
-					$input.trigger( 'focus.ime' );
-				} );
-				return;
-			}
-
 			if ( !$.ime.preferences.isEnabled() ) {
 				return;
 			}
 
+			$input = $( this );
 			noImeSelector = mw.config.get( 'wgULSNoImeSelectors' ).join( ', ' );
 
 			if ( noImeSelector.length && $input.is( noImeSelector ) ) {
@@ -253,7 +238,12 @@
 
 	$( document ).ready( function () {
 		mw.uls.init( function () {
-			mw.ime.setup();
+			// Load the ime preferences
+			$.ime.preferences.load();
+
+			if ( $.ime.preferences.isEnabled() ) {
+				mw.ime.setup();
+			}
 		} );
 	} );
 

resources/js/ext.uls.inputsettings.js

@@ -94,8 +94,7 @@
 			this.$parent.$settingsPanel.append( this.$template );
 
 			$enabledOnly = this.$template.find( '.enabled-only' );
-			// ime system is lazy loaded, make sure it is initialized
+
-			mw.ime.init();
 			if ( $.ime.preferences.isEnabled() ) {
 				$enabledOnly.removeClass( 'hide' );
 			} else {