| Index: trunk/phase3/includes/resourceloader/ResourceLoader.php |
| — | — | @@ -563,7 +563,7 @@ |
| 564 | 564 | 'mw.loader.implement', |
| 565 | 565 | array( |
| 566 | 566 | $name, |
| 567 | | - new XmlJsCode( "function( $, mw ) {{$scripts}}" ), |
| | 567 | + new XmlJsCode( "function( $ ) {{$scripts}}" ), |
| 568 | 568 | (object)$styles, |
| 569 | 569 | (object)$messages |
| 570 | 570 | ) ); |
| — | — | @@ -667,10 +667,10 @@ |
| 668 | 668 | $dependencies = null, $group = null ) |
| 669 | 669 | { |
| 670 | 670 | if ( is_array( $name ) ) { |
| 671 | | - return Xml::encodeJsCall( 'mw.loader.register', array( $name ) ); |
| | 671 | + return Xml::encodeJsCall( 'mediaWiki.loader.register', array( $name ) ); |
| 672 | 672 | } else { |
| 673 | 673 | $version = (int) $version > 1 ? (int) $version : 1; |
| 674 | | - return Xml::encodeJsCall( 'mw.loader.register', |
| | 674 | + return Xml::encodeJsCall( 'mediaWiki.loader.register', |
| 675 | 675 | array( $name, $version, $dependencies, $group ) ); |
| 676 | 676 | } |
| 677 | 677 | } |
| — | — | @@ -693,7 +693,7 @@ |
| 694 | 694 | * @param $configuration Array: List of configuration values keyed by variable name |
| 695 | 695 | */ |
| 696 | 696 | public static function makeConfigSetScript( array $configuration ) { |
| 697 | | - return Xml::encodeJsCall( 'mw.config.set', array( $configuration ) ); |
| | 697 | + return Xml::encodeJsCall( 'mediaWiki.config.set', array( $configuration ) ); |
| 698 | 698 | } |
| 699 | 699 | |
| 700 | 700 | /** |
| Index: trunk/phase3/includes/resourceloader/ResourceLoaderStartUpModule.php |
| — | — | @@ -178,7 +178,7 @@ |
| 179 | 179 | $registrations = self::getModuleRegistrations( $context ); |
| 180 | 180 | $out .= "var startUp = function() {\n" . |
| 181 | 181 | "\t$registrations\n" . |
| 182 | | - "\t" . Xml::encodeJsCall( 'mw.config.set', array( $configuration ) ) . |
| | 182 | + "\t" . Xml::encodeJsCall( 'mediaWiki.config.set', array( $configuration ) ) . |
| 183 | 183 | "};\n"; |
| 184 | 184 | |
| 185 | 185 | // Conditional script injection |
| Index: trunk/phase3/resources/mediawiki.special/mediawiki.special.search.js |
| — | — | @@ -1,11 +1,11 @@ |
| 2 | 2 | /* |
| 3 | 3 | * JavaScript for Specical:Search |
| 4 | 4 | */ |
| 5 | | -( function( $, mw ) { |
| | 5 | +( function( $ ) { |
| 6 | 6 | |
| 7 | 7 | // Emulate HTML5 autofocus behavior in non HTML5 compliant browsers |
| 8 | 8 | if ( !( 'autofocus' in document.createElement( 'input' ) ) ) { |
| 9 | 9 | $( 'input[autofocus]:first' ).focus(); |
| 10 | 10 | } |
| 11 | 11 | |
| 12 | | -} )( jQuery, mediaWiki ); |
| \ No newline at end of file |
| | 12 | +} )( jQuery ); |
| \ No newline at end of file |
| Index: trunk/phase3/resources/mediawiki/mediawiki.js |
| — | — | @@ -670,7 +670,7 @@ |
| 671 | 671 | } |
| 672 | 672 | // Execute script |
| 673 | 673 | try { |
| 674 | | - registry[module].script( jQuery, mediaWiki ); |
| | 674 | + registry[module].script( jQuery ); |
| 675 | 675 | registry[module].state = 'ready'; |
| 676 | 676 | // Run jobs who's dependencies have just been met |
| 677 | 677 | for ( var j = 0; j < jobs.length; j++ ) { |
| Index: trunk/phase3/resources/mediawiki/mediawiki.log.js |
| — | — | @@ -2,7 +2,7 @@ |
| 3 | 3 | * Implementation for mediaWiki.log stub |
| 4 | 4 | */ |
| 5 | 5 | |
| 6 | | -(function ($, mw) { |
| | 6 | +(function ($) { |
| 7 | 7 | |
| 8 | 8 | /** |
| 9 | 9 | * Log output to the console. |
| — | — | @@ -22,7 +22,7 @@ |
| 23 | 23 | } |
| 24 | 24 | // Try to use an existing console |
| 25 | 25 | if ( typeof window.console !== 'undefined' && typeof window.console.log == 'function' ) { |
| 26 | | - window.console.log( string ); |
| | 26 | + console.log( string ); |
| 27 | 27 | } else { |
| 28 | 28 | // Set timestamp |
| 29 | 29 | var d = new Date(); |
| — | — | @@ -61,4 +61,4 @@ |
| 62 | 62 | } |
| 63 | 63 | }; |
| 64 | 64 | |
| 65 | | -})(jQuery, mediaWiki); |
| | 65 | +})(jQuery); |
| \ No newline at end of file |