X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fcore.js;h=c9076b682d9a6a6b2c9c3494f47ae9af319f9d54;hb=e5e24bd33f348f89bedc76b2b650a2b4c5a0a024;hp=1353ebad2b66ac5edcff4bca9406bc97bd0bc99b;hpb=17b1e407d101c5c7f91db633df3a80cd9b4466ae;p=jquery.git diff --git a/src/core.js b/src/core.js index 1353eba..c9076b6 100644 --- a/src/core.js +++ b/src/core.js @@ -465,13 +465,13 @@ jQuery.fn = jQuery.prototype = { var parts = key.split("."); parts[1] = parts[1] ? "." + parts[1] : ""; - if ( value == null ) { + if ( value === undefined ) { var data = this.triggerHandler("getData" + parts[1] + "!", [parts[0]]); - if ( data == undefined && this.length ) + if ( data === undefined && this.length ) data = jQuery.data( this[0], key ); - return data == null && parts[1] ? + return data === undefined && parts[1] ? this.data( parts[0] ) : data; } else @@ -566,9 +566,9 @@ jQuery.extend = jQuery.fn.extend = function() { target = {}; // extend jQuery itself if only one argument is passed - if ( length == 1 ) { + if ( length == i ) { target = this; - i = 0; + --i; } for ( ; i < length; i++ ) @@ -576,17 +576,19 @@ jQuery.extend = jQuery.fn.extend = function() { if ( (options = arguments[ i ]) != null ) // Extend the base object for ( var name in options ) { + var src = target[ name ], copy = options[ name ]; + // Prevent never-ending loop - if ( target === options[ name ] ) + if ( target === copy ) continue; // Recurse if we're merging object values - if ( deep && options[ name ] && typeof options[ name ] == "object" && target[ name ] && !options[ name ].nodeType ) - target[ name ] = jQuery.extend( deep, target[ name ], options[ name ] ); + if ( deep && copy && typeof copy == "object" && src && !copy.nodeType ) + target[ name ] = jQuery.extend( deep, src, copy ); // Don't bring in undefined values - else if ( options[ name ] != undefined ) - target[ name ] = options[ name ]; + else if ( copy !== undefined ) + target[ name ] = copy; } @@ -667,7 +669,7 @@ jQuery.extend({ jQuery.cache[ id ] = {}; // Prevent overriding the named cache with undefined values - if ( data != undefined ) + if ( data !== undefined ) jQuery.cache[ id ][ name ] = data; // Return the named cache data, or the ID for the element @@ -718,24 +720,26 @@ jQuery.extend({ // args is for internal usage only each: function( object, callback, args ) { + var name, i = 0, length = object.length; + if ( args ) { - if ( object.length == undefined ) { - for ( var name in object ) + if ( length == undefined ) { + for ( name in object ) if ( callback.apply( object[ name ], args ) === false ) break; } else - for ( var i = 0, length = object.length; i < length; i++ ) - if ( callback.apply( object[ i ], args ) === false ) + for ( ; i < length; ) + if ( callback.apply( object[ i++ ], args ) === false ) break; // A special, fast, case for the most common use of each } else { - if ( object.length == undefined ) { - for ( var name in object ) + if ( length == undefined ) { + for ( name in object ) if ( callback.call( object[ name ], name, object[ name ] ) === false ) break; } else - for ( var i = 0, length = object.length, value = object[0]; + for ( var value = object[0]; i < length && callback.call( value, i, value ) !== false; value = object[++i] ){} } @@ -820,7 +824,7 @@ jQuery.extend({ }, curCSS: function( elem, name, force ) { - var ret; + var ret, style = elem.style; // A helper method for determining if an element's values are broken function color( elem ) { @@ -834,7 +838,7 @@ jQuery.extend({ // We need to handle opacity special in IE if ( name == "opacity" && jQuery.browser.msie ) { - ret = jQuery.attr( elem.style, "opacity" ); + ret = jQuery.attr( style, "opacity" ); return ret == "" ? "1" : @@ -842,17 +846,17 @@ jQuery.extend({ } // Opera sometimes will give the wrong display answer, this fixes it, see #2037 if ( jQuery.browser.opera && name == "display" ) { - var save = elem.style.outline; - elem.style.outline = "0 solid black"; - elem.style.outline = save; + var save = style.outline; + style.outline = "0 solid black"; + style.outline = save; } // Make sure we're using the right name for getting the float value if ( name.match( /float/i ) ) name = styleFloat; - if ( !force && elem.style && elem.style[ name ] ) - ret = elem.style[ name ]; + if ( !force && style && style[ name ] ) + ret = style[ name ]; else if ( getComputedStyle ) { @@ -914,16 +918,16 @@ jQuery.extend({ // but a number that has a weird ending, we need to convert it to pixels if ( !/^\d+(px)?$/i.test( ret ) && /^\d/.test( ret ) ) { // Remember the original values - var style = elem.style.left, runtimeStyle = elem.runtimeStyle.left; + var left = style.left, rsLeft = elem.runtimeStyle.left; // Put in the new values to get a computed value out elem.runtimeStyle.left = elem.currentStyle.left; - elem.style.left = ret || 0; - ret = elem.style.pixelLeft + "px"; + style.left = ret || 0; + ret = style.pixelLeft + "px"; // Revert the changed values - elem.style.left = style; - elem.runtimeStyle.left = runtimeStyle; + style.left = left; + elem.runtimeStyle.left = rsLeft; } } @@ -1134,16 +1138,16 @@ jQuery.extend({ merge: function( first, second ) { // We have to loop this way because IE & Opera overwrite the length // expando of getElementsByTagName - + var i = 0; // Also, we need to make sure that the correct elements are being returned // (IE returns comment nodes in a '*' query) if ( jQuery.browser.msie ) { - for ( var i = 0; second[ i ]; i++ ) + for ( ; second[ i ]; i++ ) if ( second[ i ].nodeType != 8 ) first.push( second[ i ] ); } else - for ( var i = 0; second[ i ]; i++ ) + for ( ; second[ i ]; i++ ) first.push( second[ i ] ); return first; @@ -1190,15 +1194,11 @@ jQuery.extend({ for ( var i = 0, length = elems.length; i < length; i++ ) { var value = callback( elems[ i ], i ); - if ( value !== null && value != undefined ) { - if ( value.constructor != Array ) - value = [ value ]; - - ret = ret.concat( value ); - } + if ( value != null ) + ret[ ret.length ] = value; } - return ret; + return ret.concat.apply( [], ret ); } });