Merge changes I83d4808a,If8ea8c1f

* changes:
  JsHint fixes - Move the invocation into the parens that contain the function.
  Fix Bug 39096 - Narayam compatibility with ULS

data/fontrepo/scripts/compile.php

@@ -34,11 +34,11 @@ ksort( $list['languages'] );
 ksort( $list['fonts'] );
 
 $json = json_encode( $list );
-$js = <<<JAVASCRIPT
+$js = <<<JAVASCRIPT
 // Please do not edit. This file is generated from data/fontrepo by data/fontrepo/scripts/compile.php
 ( function ( $ ) {
 	$.webfonts = $.webfonts || {};
 	$.webfonts.repository = $json;
-} )( jQuery );
-JAVASCRIPT;
+}( jQuery ) );
+JAVASCRIPT;
 file_put_contents( '../../../resources/js/ext.uls.webfonts.repository.js', $js );

lib/jquery.uls/css/jquery.uls.css

@@ -154,7 +154,7 @@ input#languagefilter {
 	box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1) inset;
 	color: #333;
 	display: block;
-	background-color: transparent;
+	background-color: transparent !important;
 }
 
 input:focus#languagefilter {

lib/jquery.uls/src/jquery.uls.core.js

@@ -264,8 +264,8 @@
 			if ( e.keyCode === 27 ) { // escape
 				this.hide();
 				e.preventDefault();
+				e.stopPropagation();
 			}
-			e.stopPropagation();
 		},
 
 		keypress: function( e ) {
@@ -275,8 +275,8 @@
 			if ( e.keyCode === 27 ) { // escape
 				this.hide();
 				e.preventDefault();
+				e.stopPropagation();
 			}
-			e.stopPropagation();
 		},
 
 		click: function( e ) {

resources/js/ext.uls.displaysettings.js

@@ -361,4 +361,4 @@
 	$.fn.languagesettings.modules = $.extend( $.fn.languagesettings.modules, {
 		display: DisplaySettings
 	} );
-} ) ( jQuery, mediaWiki, window );
+}( jQuery, mediaWiki, window ) );

resources/js/ext.uls.init.js

@@ -197,4 +197,4 @@
 			mw.uls.changeLanguage( $(this).attr( 'lang' ) );
 		} );
 	} );
-} )( jQuery, mediaWiki, window, document );
+}( jQuery, mediaWiki, window, document ) );

resources/js/ext.uls.languagesettings.js

@@ -170,4 +170,4 @@
 
 	$.fn.languagesettings.Constructor = LanguageSettings;
 
-} )( jQuery );
+}( jQuery ) );

resources/js/ext.uls.webfonts.repository.js

@@ -2,4 +2,4 @@
 ( function ( $ ) {
 	$.webfonts = $.webfonts || {};
 	$.webfonts.repository = {"base":"..\/data\/fontrepo\/fonts\/","languages":{"ahr":["Lohit Marathi"],"akk":["Akkadian"],"am":["AbyssinicaSIL"],"arb":["Amiri"],"as":["Lohit Assamese"],"bh":["Lohit Devanagari"],"bho":["Lohit Devanagari"],"bn":["Siyam Rupali","Lohit Bengali"],"bo":["Jomolhari"],"bpy":["Siyam Rupali","Lohit Bengali"],"bug":["Saweri"],"cdo":["CharisSIL"],"dz":["Jomolhari"],"fa":["Iranian Sans","Amiri"],"gom":["Lohit Devanagari"],"gu":["Lohit Gujarati"],"hbo":["Taamey Frank CLM"],"he":["Miriam CLM","Taamey Frank CLM"],"hi":["Lohit Devanagari"],"km":["KhmerOSbattambang","KhmerOS","KhmerOSbokor","KhmerOSfasthand","KhmerOSfreehand","KhmerOSmuol","KhmerOSmuollight","KhmerOSmuolpali","KhmerOSsiemreap"],"kn":["Lohit Kannada","Kedage"],"kok":["Lohit Devanagari"],"mai":["Lohit Devanagari"],"mak":["Saweri"],"ml":["Meera","AnjaliOldLipi"],"mr":["Lohit Marathi"],"my":["TharLon","Myanmar3","Padauk"],"ne":["Lohit Nepali","Madan"],"or":["Lohit Oriya","Utkal"],"pa":["Lohit Punjabi","Saab"],"sa":["Lohit Devanagari"],"saz":["Pagul"],"sux":["Akkadian"],"ta":["Lohit Tamil","Lohit Tamil Classical","Thendral","Thenee"],"tcy":["Lohit Kannada","Kedage"],"te":["Lohit Telugu"],"ti":["AbyssinicaSIL"]},"fonts":{"AbyssinicaSIL":{"version":"1.200","license":"OFL 1.1","eot":"AbyssinicaSIL\/AbyssinicaSIL-R.eot","ttf":"AbyssinicaSIL\/AbyssinicaSIL-R.ttf","woff":"AbyssinicaSIL\/AbyssinicaSIL-R.woff"},"Akkadian":{"version":"2.56","license":null,"eot":"Akkadian\/Akkadian.eot","ttf":"Akkadian\/Akkadian.ttf","woff":"Akkadian\/Akkadian.woff"},"Amiri":{"version":"1.0.2","license":"OFL 1.1","eot":"amiri\/amiri-regular.eot","ttf":"amiri\/amiri-regular.ttf","woff":"amiri\/amiri-regular.woff"},"AnjaliOldLipi":{"version":".0.730","license":"OFL 1.1","eot":"AnjaliOldLipi\/AnjaliOldLipi.eot","ttf":"AnjaliOldLipi\/AnjaliOldLipi.ttf","woff":"AnjaliOldLipi\/AnjaliOldLipi.woff"},"CharisSIL":{"version":"4.011","license":"OFL 1.1","eot":"CharisSIL\/CharisSIL-R.eot","ttf":"CharisSIL\/CharisSIL-R.ttf","woff":"CharisSIL\/CharisSIL-R.woff"},"Iranian Sans":{"version":"1.0","license":"IranianSans","eot":"IranianSans\/IranianSans.eot","ttf":"IranianSans\/IranianSans.ttf","woff":"IranianSans\/IranianSans.woff"},"Jomolhari":{"version":"0.003","license":"OFL 1.1","eot":"Jomolhari\/Jomolhari.eot","ttf":"Jomolhari\/Jomolhari.ttf","woff":"Jomolhari\/Jomolhari.woff"},"Kedage":{"version":"1.06","license":"GPL 2","eot":"Kedage\/Kedage.eot","ttf":"Kedage\/Kedage.ttf","woff":"Kedage\/Kedage.woff"},"KhmerOS":{"version":"1.10","license":"LGPL 2.1+","eot":"KhmerOS\/KhmerOS.eot","ttf":"KhmerOS\/KhmerOS.ttf","woff":"KhmerOS\/KhmerOS.woff"},"KhmerOSbattambang":{"version":"1.10","license":"LGPL 2.1+","eot":"KhmerOSbattambang\/KhmerOSbattambang.eot","ttf":"KhmerOSbattambang\/KhmerOSbattambang.ttf","woff":"KhmerOSbattambang\/KhmerOSbattambang.woff"},"KhmerOSbokor":{"version":"1.10","license":"LGPL 2.1+","eot":"KhmerOSbokor\/KhmerOSbokor.eot","ttf":"KhmerOSbokor\/KhmerOSbokor.ttf","woff":"KhmerOSbokor\/KhmerOSbokor.woff"},"KhmerOSfasthand":{"version":"1.10","license":"LGPL 2.1+","eot":"KhmerOSfasthand\/KhmerOSfasthand.eot","ttf":"KhmerOSfasthand\/KhmerOSfasthand.ttf","woff":"KhmerOSfasthand\/KhmerOSfasthand.woff"},"KhmerOSfreehand":{"version":"1.10","license":"LGPL 2.1+","eot":"KhmerOSfreehand\/KhmerOSfreehand.eot","ttf":"KhmerOSfreehand\/KhmerOSfreehand.ttf","woff":"KhmerOSfreehand\/KhmerOSfreehand.woff"},"KhmerOSmuol":{"version":"1.10","license":"LGPL 2.1+","eot":"KhmerOSmuol\/KhmerOSmuol.eot","ttf":"KhmerOSmuol\/KhmerOSmuol.ttf","woff":"KhmerOSmuol\/KhmerOSmuol.woff"},"KhmerOSmuollight":{"version":"1.10","license":"LGPL 2.1+","eot":"KhmerOSmuollight\/KhmerOSmuollight.eot","ttf":"KhmerOSmuollight\/KhmerOSmuollight.ttf","woff":"KhmerOSmuollight\/KhmerOSmuollight.woff"},"KhmerOSmuolpali":{"version":"1.10","license":"LGPL 2.1+","eot":"KhmerOSmuolpali\/KhmerOSmuolpali.eot","ttf":"KhmerOSmuolpali\/KhmerOSmuolpali.ttf","woff":"KhmerOSmuolpali\/KhmerOSmuolpali.woff"},"KhmerOSsiemreap":{"version":"1.10","license":"LGPL 2.1+","eot":"KhmerOSsiemreap\/KhmerOSsiemreap.eot","ttf":"KhmerOSsiemreap\/KhmerOSsiemreap.ttf","woff":"KhmerOSsiemreap\/KhmerOSsiemreap.woff"},"Lohit Assamese":{"version":"2.5.1","license":"OFL 1.1","eot":"LohitAssamese\/Lohit-Assamese.eot","ttf":"LohitAssamese\/Lohit-Assamese.ttf","woff":"LohitAssamese\/Lohit-Assamese.woff"},"Lohit Bengali":{"version":"2.5.1","license":"OFL 1.1","eot":"LohitBengali\/Lohit-Bengali.eot","ttf":"LohitBengali\/Lohit-Bengali.ttf","woff":"LohitBengali\/Lohit-Bengali.woff"},"Lohit Devanagari":{"version":"2.5.1","license":"OFL 1.1","eot":"LohitDevanagari\/Lohit-Devanagari.eot","ttf":"LohitDevanagari\/Lohit-Devanagari.ttf","woff":"LohitDevanagari\/Lohit-Devanagari.woff"},"Lohit Gujarati":{"version":"2.5.1","license":"OFL 1.1","eot":"LohitGujarati\/Lohit-Gujarati.eot","ttf":"LohitGujarati\/Lohit-Gujarati.ttf","woff":"LohitGujarati\/Lohit-Gujarati.woff"},"Lohit Kannada":{"version":"2.5.1","license":"OFL 1.1","eot":"LohitKannada\/Lohit-KannadaLine truncated
-} )( jQuery );
+}( jQuery ) );