From 16424982ebdfcdf7f5e10498c5b23385b2d08932 Mon Sep 17 00:00:00 2001 From: "Amir E. Aharoni" Date: Tue, 5 Mar 2013 07:57:46 +0200 Subject: [PATCH] Check that ime was defined before selecting a language Fixes a regression from I759c01f894569372d69d3b879e34aafda2ed41b1. Change-Id: I5c3998b687fb92e3c90301edecb25b6a8306f423 --- resources/js/ext.uls.ime.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/resources/js/ext.uls.ime.js b/resources/js/ext.uls.ime.js index bdfb6277..1da8686a 100644 --- a/resources/js/ext.uls.ime.js +++ b/resources/js/ext.uls.ime.js @@ -139,7 +139,8 @@ mw.ime.setup = function () { $( 'body' ).on( 'focus.ime', inputSelector, function () { - var $input = $( this ); + var imeselector, + $input = $( this ); $input.ime( { languages: mw.ime.getIMELanguageList(), @@ -166,8 +167,11 @@ } } ); - $input.data( 'imeselector' ) - .selectLanguage( $.ime.preferences.getLanguage() ); + // Some fields may be uninitialized + imeselector = $input.data( 'imeselector' ); + if ( imeselector ) { + imeselector.selectLanguage( $.ime.preferences.getLanguage() ); + } } ); };