[MediaWiki-commits] [Gerrit] Revert "Remove redundant focus handler" - change (mediawiki...UniversalLanguageSelector)

2013-05-22 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Revert "Remove redundant focus handler"
..


Revert "Remove redundant focus handler"

This reverts commit 739d952a819ca44e5e414c40e927c2d7f67fe89d.
Bug: 48703

Change-Id: Ib66ed3c824f0bd5e68258eb5a39b8affc8b50e9f
---
M resources/js/ext.uls.ime.js
1 file changed, 9 insertions(+), 2 deletions(-)

Approvals:
  Amire80: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/resources/js/ext.uls.ime.js b/resources/js/ext.uls.ime.js
index ec1cd02..e645dc2 100644
--- a/resources/js/ext.uls.ime.js
+++ b/resources/js/ext.uls.ime.js
@@ -154,7 +154,8 @@
mw.ime.setup = function () {
 
$( 'body' ).on( 'focus.ime', inputSelector, function () {
-   var $input = $( this );
+   var imeselector,
+   $input = $( this );
 
$input.ime( {
languages: mw.ime.getIMELanguageList(),
@@ -179,7 +180,13 @@
 
return $ulsTrigger;
}
-   } ).focus();
+   } );
+
+   // Some fields may be uninitialized
+   imeselector = $input.data( 'imeselector' );
+   if ( imeselector ) {
+   imeselector.selectLanguage( 
$.ime.preferences.getLanguage() );
+   }
} );
 
};

-- 
To view, visit https://gerrit.wikimedia.org/r/64922
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib66ed3c824f0bd5e68258eb5a39b8affc8b50e9f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Santhosh 
Gerrit-Reviewer: Amire80 
Gerrit-Reviewer: jenkins-bot

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Revert "Remove redundant focus handler" - change (mediawiki...UniversalLanguageSelector)

2013-05-22 Thread Santhosh (Code Review) 
Santhosh has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/64922


Change subject: Revert "Remove redundant focus handler"
..

Revert "Remove redundant focus handler"

This reverts commit 739d952a819ca44e5e414c40e927c2d7f67fe89d.
Bug: 48703

Change-Id: Ib66ed3c824f0bd5e68258eb5a39b8affc8b50e9f
---
M resources/js/ext.uls.ime.js
1 file changed, 9 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector 
refs/changes/22/64922/1

diff --git a/resources/js/ext.uls.ime.js b/resources/js/ext.uls.ime.js
index ec1cd02..e645dc2 100644
--- a/resources/js/ext.uls.ime.js
+++ b/resources/js/ext.uls.ime.js
@@ -154,7 +154,8 @@
mw.ime.setup = function () {
 
$( 'body' ).on( 'focus.ime', inputSelector, function () {
-   var $input = $( this );
+   var imeselector,
+   $input = $( this );
 
$input.ime( {
languages: mw.ime.getIMELanguageList(),
@@ -179,7 +180,13 @@
 
return $ulsTrigger;
}
-   } ).focus();
+   } );
+
+   // Some fields may be uninitialized
+   imeselector = $input.data( 'imeselector' );
+   if ( imeselector ) {
+   imeselector.selectLanguage( 
$.ime.preferences.getLanguage() );
+   }
} );
 
};

-- 
To view, visit https://gerrit.wikimedia.org/r/64922
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib66ed3c824f0bd5e68258eb5a39b8affc8b50e9f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Santhosh 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits