Declare some local vars/funcs as local so they don't stomp on JS global namespaces...

diff --git a/resources/mediawiki.action/mediawiki.action.history.js b/resources/mediawiki.action/mediawiki.action.history.js
index 98a97cd..580c570 100644 (file)
--- a/resources/mediawiki.action/mediawiki.action.history.js
+++ b/resources/mediawiki.action/mediawiki.action.history.js
@@ -68,7 +68,7 @@ jQuery( function( $ ) {
                        $histForm.append( $compareLink.clone() );
                }
 
-               function updateCompare() {
+               var updateCompare = function() {
                        var $radio = $histForm.find( 'input[type=radio]:checked' );
                        var genLink = mw.config.get( 'wgScript' )
                                + '?title=' + mw.util.wikiUrlencode( mw.config.get( 'wgPageName' ) )

diff --git a/resources/mediawiki.special/mediawiki.special.preferences.js b/resources/mediawiki.special/mediawiki.special.preferences.js
index ae21e3c..1b2cefe 100644 (file)
--- a/resources/mediawiki.special/mediawiki.special.preferences.js
+++ b/resources/mediawiki.special/mediawiki.special.preferences.js
@@ -106,7 +106,8 @@ var minutesToHours = function( min ) {
 var hoursToMinutes = function( hour ) {
        var arr = hour.split( ':' );
        arr[0] = parseInt( arr[0], 10 );
-       
+
+       var minutes;
        if ( arr.length == 1 ) {
                // Specification is of the form [-]XX
                minutes = arr[0] * 60;

diff --git a/resources/mediawiki.special/mediawiki.special.upload.js b/resources/mediawiki.special/mediawiki.special.upload.js
index 69b80e6..cd986b4 100644 (file)
--- a/resources/mediawiki.special/mediawiki.special.upload.js
+++ b/resources/mediawiki.special/mediawiki.special.upload.js
@@ -83,6 +83,7 @@ jQuery( function( $ ) {
                        }
                        
                        img.onload = function() {
+                               var width, height, x, y, dx, dy;
                                // Fit the image within the previewSizexpreviewSize box
                                if ( img.width > img.height ) {
                                        width = previewSize;

diff --git a/resources/mediawiki.util/mediawiki.util.test.js b/resources/mediawiki.util/mediawiki.util.test.js
index fa670bc..7e2eed6 100644 (file)
--- a/resources/mediawiki.util/mediawiki.util.test.js
+++ b/resources/mediawiki.util/mediawiki.util.test.js
@@ -50,7 +50,7 @@
                        if ( !title ) {
                                return false;
                        }
-                       escapedtitle = mw.html.escape( title ).replace( /  /g, '  ' );
+                       var escapedtitle = mw.html.escape( title ).replace( /  /g, '  ' );
                        this.addedTests.push( [ 'HEADER', escapedtitle, mw.test.numberOfHeader++ ] );
                        this.$table.append( '<tr class="mw-mwutiltest-head" id="mw-mwutiltest-head'+mw.test.numberOfHeader+'"><th colspan="4">' + escapedtitle + '</th></tr>' );
                        return true;
@@ -403,14 +403,14 @@
                                                        }
 
                                                        exec = item[0];
-                                                       shouldreturn = item[1];
-                                                       shouldcontain = item[2];
+                                                       var shouldreturn = item[1];
+                                                       var shouldcontain = item[2];
 
                                                        numberOfTests++;
                                                        headNumberOfTests++;
-                                                       doesReturn = eval( exec );
+                                                       var doesReturn = eval( exec );
                                                        doesReturn = doesReturn + ' (' + typeof doesReturn + ')';
-                                                       $thisrow = $testrows.eq( i - numberOfHeaders ); // since headers are rows as well
+                                                       var $thisrow = $testrows.eq( i - numberOfHeaders ); // since headers are rows as well
                                                        $thisrow.find( '> td' ).eq(2).html( mw.html.escape( doesReturn ).replace(/  /g, '&nbsp;&nbsp;' ) );
 
                                                        if ( doesReturn.indexOf( shouldcontain ) !== -1 ) {

diff --git a/resources/mediawiki/mediawiki.js b/resources/mediawiki/mediawiki.js
index c7a6488..24f67a9 100644 (file)
--- a/resources/mediawiki/mediawiki.js
+++ b/resources/mediawiki/mediawiki.js
@@ -1191,7 +1191,7 @@ window.mediaWiki = new ( function( $ ) {
 
        /** HTML construction helper functions */
        this.html = new ( function () {
-               function escapeCallback( s ) {
+               var escapeCallback = function( s ) {
                        switch ( s ) {
                                case "'":
                                        return ''';