diff options
| -rw-r--r-- | src/core.js | 2 | ||||
| -rw-r--r-- | src/css.js | 2 | ||||
| -rw-r--r-- | src/effects.js | 8 | ||||
| -rw-r--r-- | src/event.js | 2 | ||||
| -rw-r--r-- | src/offset.js | 2 | ||||
| -rw-r--r-- | src/traversing.js | 10 | ||||
| -rw-r--r-- | test/unit/event.js | 12 |
7 files changed, 19 insertions, 19 deletions
diff --git a/src/core.js b/src/core.js index 1e1bd3ef1..586e372de 100644 --- a/src/core.js +++ b/src/core.js @@ -302,7 +302,7 @@ jQuery.fn = jQuery.prototype = { jQuery.fn.init.prototype = jQuery.fn; jQuery.extend = jQuery.fn.extend = function() { - var options, name, src, copy, copyIsArray, clone, + var options, name, src, copy, copyIsArray, clone, target = arguments[0] || {}, i = 1, length = arguments.length, diff --git a/src/css.js b/src/css.js index 19c6342d2..8a982312f 100644 --- a/src/css.js +++ b/src/css.js @@ -263,7 +263,7 @@ if ( document.defaultView && document.defaultView.getComputedStyle ) { if ( document.documentElement.currentStyle ) { currentStyle = function( elem, name ) { - var left, + var left, ret = elem.currentStyle && elem.currentStyle[ name ], rsLeft = elem.runtimeStyle && elem.runtimeStyle[ name ], style = elem.style; diff --git a/src/effects.js b/src/effects.js index bebcc431f..58a15139c 100644 --- a/src/effects.js +++ b/src/effects.js @@ -519,21 +519,21 @@ function defaultDisplay( nodeName ) { disabled[ idx ] = style.disabled; style.disabled = true; } - - // To accurately check an element's default display value, + + // To accurately check an element's default display value, // create a temp element and check it's default display, this // will ensure that the value returned is not a user-tampered // value. elem = jQuery("<" + nodeName + ">").appendTo("body"); display = elem.css("display"); - + // Remove temp element elem.remove(); if ( display === "none" || display === "" ) { display = "block"; } - + // Store the correct default display elemdisplay[ nodeName ] = display; diff --git a/src/event.js b/src/event.js index 758c8f560..daafe54aa 100644 --- a/src/event.js +++ b/src/event.js @@ -33,7 +33,7 @@ jQuery.event = { handler = returnFalse; } else if ( !handler ) { // Fixes bug #7229. Fix recommended by jdalton - return; + return; } var handleObjIn, handleObj; diff --git a/src/offset.js b/src/offset.js index a10d30a0f..1003c400c 100644 --- a/src/offset.js +++ b/src/offset.js @@ -275,7 +275,7 @@ jQuery.each( ["Left", "Top"], function( i, name ) { if ( win ) { win.scrollTo( !i ? val : jQuery(win).scrollLeft(), - i ? val : jQuery(win).scrollTop() + i ? val : jQuery(win).scrollTop() ); } else { diff --git a/src/traversing.js b/src/traversing.js index 90601df55..fe2e33d88 100644 --- a/src/traversing.js +++ b/src/traversing.js @@ -204,11 +204,11 @@ jQuery.each({ }, function( name, fn ) { jQuery.fn[ name ] = function( until, selector ) { var ret = jQuery.map( this, fn, until ), - // The variable 'args' was introduced in - // https://github.com/jquery/jquery/commit/52a0238 - // to work around a bug in Chrome 10 (Dev) and should be removed when the bug is fixed. - // http://code.google.com/p/v8/issues/detail?id=1050 - args = slice.call(arguments); + // The variable 'args' was introduced in + // https://github.com/jquery/jquery/commit/52a0238 + // to work around a bug in Chrome 10 (Dev) and should be removed when the bug is fixed. + // http://code.google.com/p/v8/issues/detail?id=1050 + args = slice.call(arguments); if ( !runtil.test( name ) ) { selector = until; diff --git a/test/unit/event.js b/test/unit/event.js index 6b78a2495..b7b260462 100644 --- a/test/unit/event.js +++ b/test/unit/event.js @@ -615,18 +615,18 @@ test("unbind(type)", function() { message = "unbind many with function"; $elem.bind('error1 error2',error) - .unbind('error1 error2', error ) - .trigger('error1').triggerHandler('error2'); + .unbind('error1 error2', error ) + .trigger('error1').triggerHandler('error2'); message = "unbind many"; // #3538 $elem.bind('error1 error2',error) - .unbind('error1 error2') - .trigger('error1').triggerHandler('error2'); + .unbind('error1 error2') + .trigger('error1').triggerHandler('error2'); message = "unbind without a type or handler"; $elem.bind("error1 error2.test",error) - .unbind() - .trigger("error1").triggerHandler("error2"); + .unbind() + .trigger("error1").triggerHandler("error2"); }); test("unbind(eventObject)", function() { |