Merge changes I83d4808a,If8ea8c1f
* changes: JsHint fixes - Move the invocation into the parens that contain the function. Fix Bug 39096 - Narayam compatibility with ULS
This commit is contained in:
@@ -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 );
|
||||
@@ -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 {
|
||||
|
||||
@@ -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 ) {
|
||||
|
||||
@@ -361,4 +361,4 @@
|
||||
$.fn.languagesettings.modules = $.extend( $.fn.languagesettings.modules, {
|
||||
display: DisplaySettings
|
||||
} );
|
||||
} ) ( jQuery, mediaWiki, window );
|
||||
}( jQuery, mediaWiki, window ) );
|
||||
|
||||
@@ -197,4 +197,4 @@
|
||||
mw.uls.changeLanguage( $(this).attr( 'lang' ) );
|
||||
} );
|
||||
} );
|
||||
} )( jQuery, mediaWiki, window, document );
|
||||
}( jQuery, mediaWiki, window, document ) );
|
||||
|
||||
@@ -170,4 +170,4 @@
|
||||
|
||||
$.fn.languagesettings.Constructor = LanguageSettings;
|
||||
|
||||
} )( jQuery );
|
||||
}( jQuery ) );
|
||||
|
||||
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user