Permalink
Browse files

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

Merge branch 'ljharb-global_pollution_fix'
  • Loading branch information...
2 parents b982e2f + 5534fbc commit 9f7cbfc4148e6ef94832489908b7a7fe7d6fc272 @gabrielschulhof gabrielschulhof committed Nov 26, 2012
@@ -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 );
@@ -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");
@@ -717,7 +717,7 @@
module( "Programmatically generated list items", {
setup: function(){
- var item,
+ var label, item,
data = [
{
id: 1,
@@ -311,7 +311,7 @@
});
asyncTest( "Opening another page after returning from a popup works", function() {
- var eventNs = ".openingAnotherPageAfterPopup";
+ var origActive, eventNs = ".openingAnotherPageAfterPopup";
expect( 7 );
@@ -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

0 comments on commit 9f7cbfc

Please sign in to comment.