* Fixed mistake made in r74271 where some functions were moved from core jquery.wikiE...

* Also fixed IE bug, where "delete window.myThing;" fails but "delete myThing;" succeeds.

diff --git a/includes/ResourceLoaderModule.php b/includes/ResourceLoaderModule.php
index a87f83a..22ab727 100644 (file)
--- a/includes/ResourceLoaderModule.php
+++ b/includes/ResourceLoaderModule.php
@@ -1123,11 +1123,11 @@ class ResourceLoaderStartUpModule extends ResourceLoaderModule {
                        // Startup function
                        $configuration = FormatJson::encode( $this->getConfig( $context ) );
                        $registrations = self::getModuleRegistrations( $context );
-                       $out .= "window.startUp = function() {\n\t$registrations\n\tmediaWiki.config.set( $configuration );\n};";
+                       $out .= "var startUp = function() {\n\t$registrations\n\tmediaWiki.config.set( $configuration );\n};";
                        
                        // Conditional script injection
                        $scriptTag = Xml::escapeJsString( Html::linkedScript( $wgLoadScript . '?' . wfArrayToCGI( $query ) ) );
-                       $out .= "if ( isCompatible() ) {\n\tdocument.write( '$scriptTag' );\n}\ndelete window['isCompatible'];";
+                       $out .= "if ( isCompatible() ) {\n\tdocument.write( '$scriptTag' );\n}\ndelete isCompatible;";
                }
 
                return $out;

diff --git a/resources/mediawiki/mediawiki.js b/resources/mediawiki/mediawiki.js
index 0c4422a..8d4e03a 100644 (file)
--- a/resources/mediawiki/mediawiki.js
+++ b/resources/mediawiki/mediawiki.js
@@ -758,10 +758,9 @@ window.mediaWiki = new ( function( $ ) {
        
 } )( jQuery );
 
-
 /* Auto-register from pre-loaded startup scripts */
 
-if ( typeof window['startUp'] === 'function' ) {
-       window['startUp']();
-       delete window['startUp'];
+if ( typeof startUp === 'function' ) {
+       startUp();
+       delete startUp;
 }
\ No newline at end of file

diff --git a/resources/startup.js b/resources/startup.js
index 93dd75e..4ae8791 100644 (file)
--- a/resources/startup.js
+++ b/resources/startup.js
@@ -14,7 +14,7 @@
  * * Opera 9+
  * * Chrome 1+
  */
-window.isCompatible = function() {
+var isCompatible = function() {
        // IE < 6
        if ( navigator.appVersion.indexOf( 'MSIE' ) !== -1 && parseFloat( navigator.appVersion.split( 'MSIE' )[1] ) < 6 ) {
                return false;