X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fcore.js;h=c5fb865ed4645c3084092e4b2bf5b5c05e9d8e9d;hb=b84b997ea4be31dd1fdcc63136811dcd324dec68;hp=5690df16e6f336d3c66c33e6f350eb9abfff4ae9;hpb=4515aba79c56b28d9cf7bae902c71fb38763f693;p=jquery.git diff --git a/src/core.js b/src/core.js index 5690df1..c5fb865 100644 --- a/src/core.js +++ b/src/core.js @@ -86,17 +86,8 @@ jQuery.fn = jQuery.prototype = { // Shortcut for document ready } else if ( jQuery.isFunction( selector ) ) return new jQuery( document )[ jQuery.fn.ready ? "ready" : "load" ]( selector ); - - return this.setArray( - // HANDLE: $(array) - selector.constructor == Array && selector || - - // HANDLE: $(arraylike) - // Watch for when an array-like object, contains DOM nodes, is passed in as the selector - (selector.jquery || selector.length && selector != window && !selector.nodeType && selector[0] != undefined && selector[0].nodeType) && jQuery.makeArray( selector ) || - - // HANDLE: $(*) - [ selector ] ); + + return this.setArray(jQuery.makeArray(selector)); }, // The current version of jQuery being used @@ -611,6 +602,8 @@ var expando = "jQuery" + (new Date()).getTime(), uuid = 0, windowData = {}; // exclude the following css properties to add px var exclude = /z-?index|font-?weight|opacity|zoom|line-?height/i; +// cache getComputedStyle +var getComputedStyle = document.defaultView && document.defaultView.getComputedStyle; jQuery.extend({ noConflict: function( deep ) { @@ -837,8 +830,9 @@ jQuery.extend({ function color( elem ) { if ( !jQuery.browser.safari ) return false; - - var ret = document.defaultView.getComputedStyle( elem, null ); + + // getComputedStyle is cached + var ret = getComputedStyle( elem, null ); return !ret || ret.getPropertyValue("color") == ""; } @@ -864,7 +858,7 @@ jQuery.extend({ if ( !force && elem.style && elem.style[ name ] ) ret = elem.style[ name ]; - else if ( document.defaultView && document.defaultView.getComputedStyle ) { + else if ( getComputedStyle ) { // Only "float" is needed here if ( name.match( /float/i ) ) @@ -872,10 +866,10 @@ jQuery.extend({ name = name.replace( /([A-Z])/g, "-$1" ).toLowerCase(); - var getComputedStyle = document.defaultView.getComputedStyle( elem, null ); + var computedStyle = getComputedStyle( elem, null ); - if ( getComputedStyle && !color( elem ) ) - ret = getComputedStyle.getPropertyValue( name ); + if ( computedStyle && !color( elem ) ) + ret = computedStyle.getPropertyValue( name ); // If the element isn't reporting its values properly in Safari // then some display: none elements are involved @@ -898,7 +892,7 @@ jQuery.extend({ // one special, otherwise get the value ret = name == "display" && swap[ stack.length - 1 ] != null ? "none" : - ( getComputedStyle && getComputedStyle.getPropertyValue( name ) ) || ""; + ( computedStyle && computedStyle.getPropertyValue( name ) ) || ""; // Finally, revert the display styles back for ( var i = 0; i < swap.length; i++ ) @@ -1120,12 +1114,15 @@ jQuery.extend({ makeArray: function( array ) { var ret = []; - // Need to use typeof to fight Safari childNodes crashes - if ( array.constructor != Array ) - for ( var i = 0, length = array.length; i < length; i++ ) - ret.push( array[ i ] ); - else - ret = array.slice( 0 ); + if( array != undefined ){ + var i = array.length; + //the window, strings and functions also have 'length' + if( i != undefined && typeof array == 'object' && array != window ) + while( i ) + ret[--i] = array[i]; + else + ret[0] = array; + } return ret; },