Merge "Validate imeId before rendering"

resources/js/ext.uls.inputsettings.js

@@ -161,9 +161,22 @@
 			this.$parent.position();
 		},
 
+		/*
+		 * For the given input method id, render the selection option.
+		 *
+		 * @param {string} imeId Input method id
+		 * @param {boolean} selected Whether the input is the currently selected one.
+		 * @return {Object} jQuery object corresponding to the input method item.
+		 */
 		renderInputmethodOption: function ( imeId, selected ) {
 			var $imeLabel, name, description, inputmethod, $inputMethodItem;
 
+			if ( imeId !== 'system' && !$.ime.sources[imeId] ) {
+				// imeId not known for jquery.ime.
+				// It is very rare, but still validate it.
+				return $();
+			}
+
 			$imeLabel = $( '<label>' ).attr( {
 				'for': imeId,
 				'class': 'imelabel'
@@ -184,7 +197,8 @@
 			} else {
 				inputmethod = $.ime.inputmethods[imeId];
 				if ( !inputmethod ) {
-					// Delay in registration?
+					// The input method definition(rules) not loaded.
+					// We will show the name from $.ime.sources
 					name = $.ime.sources[imeId].name;
 					description = '';
 				} else {