Merge pull request #5320 from @ljharb after rebasing onto master

Merge branch 'ljharb-global_pollution_fix'
jquery-archive · Nov 26, 2012 · 9f7cbfc · 9f7cbfc
2 parents b982e2f + 5534fbc
commit 9f7cbfc
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/tests/jquery.testHelper.js b/tests/jquery.testHelper.js
@@ -373,7 +373,7 @@
 		versionTest: function( l, t, r ) {
 			var lAr = l.split( "." ), lLength = lAr.length,
 				rAr = r.split( "." ), rLength = rAr.length,
-				lVal, rVal, lRes = "", rRes = "", min, max, str, idx1, diff;
+				lVal, rVal, lRes = "", rRes = "", min, max, str, idx, idx1, diff;
 			for ( idx = 0 ; idx < lLength || idx < rLength ; idx++ ) {
 				str = {};
 				lVal = ( idx < lLength ? parseInt( lAr[ idx ] ) : 0 );

diff --git a/tests/unit/event/event_core.js b/tests/unit/event/event_core.js
@@ -313,7 +313,7 @@
 
 	asyncTest( "stopImmediatePropagation() prevents tap propagation and execution of 2nd handler", function(){
 		var tap = 0,
-			$cf = $( "#qunit-fixture" );
+			$cf = $( "#qunit-fixture" ),
 			$doc = $( document ),
 			docTapCB = function(){
 				ok(false, "tap should NOT be triggered on document");

diff --git a/tests/unit/listview/listview_core.js b/tests/unit/listview/listview_core.js
@@ -717,7 +717,7 @@
 
 	module( "Programmatically generated list items", {
 		setup: function(){
-			var item,
+			var label, item,
 				data = [
 					{
 						id: 1,

diff --git a/tests/unit/navigation/sequence-tests/sequence_tests.js b/tests/unit/navigation/sequence-tests/sequence_tests.js
@@ -311,7 +311,7 @@
 	});
 
 	asyncTest( "Opening another page after returning from a popup works", function() {
-		var eventNs = ".openingAnotherPageAfterPopup";
+		var origActive, eventNs = ".openingAnotherPageAfterPopup";
 
 		expect( 7 );
 

diff --git a/tests/unit/select/select_core.js b/tests/unit/select/select_core.js
@@ -18,7 +18,7 @@
 	};
 
 	// Check if two chunks of DOM are identical
-	domEqual = function( l, r ) {
+	var domEqual = function( l, r ) {
 		var idx, idxAttr, lattr, rattr;
 
 		// If the lengths of the two jQuery objects are different, the DOM