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:
Nikerabbit
2012-09-07 11:07:10 +00:00
committed by Gerrit Code Review
7 changed files with 10 additions and 10 deletions

View File

@@ -39,6 +39,6 @@ $js = <<<JAVASCRIPT
( function ( $ ) { ( function ( $ ) {
$.webfonts = $.webfonts || {}; $.webfonts = $.webfonts || {};
$.webfonts.repository = $json; $.webfonts.repository = $json;
} )( jQuery ); }( jQuery ) );
JAVASCRIPT; JAVASCRIPT;
file_put_contents( '../../../resources/js/ext.uls.webfonts.repository.js', $js ); file_put_contents( '../../../resources/js/ext.uls.webfonts.repository.js', $js );

View File

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

View File

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

View File

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

View File

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

View File

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

File diff suppressed because one or more lines are too long