Merge "Fix Bug 39829 - Language Selection does not work while using Language Code"

2012-09-03 16:35:12 +00:00
parent 97cbd51b49 3609e1f42e
commit 9b185f9f35
1 changed files with 9 additions and 1 deletions
--- a/lib/jquery.uls/src/jquery.uls.languagefilter.js
+++ b/lib/jquery.uls/src/jquery.uls.languagefilter.js
@@ -70,8 +70,16 @@
 					}
 					break;
 				case 13:
-					if ( this.options.onSelect && this.selectedLanguage ) {
+					if ( !this.options.onSelect ) {
+						break;
+					}
+					if ( this.selectedLanguage ) {
+						// this.selectLanguage will be populated from a matching search
 						this.options.onSelect( this.selectedLanguage );
+					} else if ( this.options.languages[this.$element.val()] ) {
+						// Search is yet to happen(in timeout delay),
+						// but we have a matching language code.
+						this.options.onSelect( this.$element.val() );
 					}
 					break;
 				default: