From: Brion Vibber <brion@users.mediawiki.org>
Date: Thu, 28 Apr 2011 00:18:01 +0000 (+0000)
Subject: Declare some local vars/funcs as local so they don't stomp on JS global namespaces... 
X-Git-Tag: 1.31.0-rc.0~30528
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmembres/cotisations/gestion/rappel_supprimer.php?a=commitdiff_plain;h=53393a4fa897fa968db79036192afaf30541a97c;p=lhc%2Fweb%2Fwiklou.git

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

diff --git a/resources/mediawiki.action/mediawiki.action.history.js b/resources/mediawiki.action/mediawiki.action.history.js
index 98a97cd0a0..580c570306 100644
--- 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 ae21e3c2f9..1b2cefe05b 100644
--- 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 69b80e6636..cd986b4283 100644
--- 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 fa670bc226..7e2eed6b9a 100644
--- 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, '&nbsp;&nbsp;' );
+			var escapedtitle = mw.html.escape( title ).replace( /  /g, '&nbsp;&nbsp;' );
 			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 c7a64887ab..24f67a9036 100644
--- 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 '&#039;';