X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fcore.js;h=cdd78517f453a8d142f2dc07af814c9dc3539c34;hb=c4c820efff4fa7bcce0d5bf0a448625278ea6379;hp=460a1dad205586ef3ca237470f3cbf6ffd00f60f;hpb=29ff710c9b02dee2c407b408ea88489b3cef688e;p=jquery.git diff --git a/src/core.js b/src/core.js index 460a1da..cdd7851 100644 --- a/src/core.js +++ b/src/core.js @@ -20,7 +20,7 @@ var jQuery = function( selector, context ) { // A simple way to check for HTML strings or ID strings // (both of which we optimize for) - quickExpr = /^[^<]*(<(.|\s)+>)[^>]*$|^#([\w-]+)$/, + quickExpr = /^[^<]*(<[\w\W]+>)[^>]*$|^#([\w-]+)$/, // Is it a simple selector isSimple = /^.[^:#\[\.,]*$/, @@ -31,28 +31,32 @@ var jQuery = function( selector, context ) { // Used for trimming whitespace rtrim = /^\s+|\s+$/g, + // Match a standalone tag + rsingleTag = /<(\w+)\s*\/?>(?:<\/\1>)?$/, + // Keep a UserAgent string for use with jQuery.browser userAgent = navigator.userAgent.toLowerCase(), // Save a reference to some core methods toString = Object.prototype.toString, + hasOwnProperty = Object.prototype.hasOwnProperty, push = Array.prototype.push, - slice = Array.prototype.slice; - -// Expose jQuery to the global object -window.jQuery = window.$ = jQuery; + slice = Array.prototype.slice, + indexOf = Array.prototype.indexOf; jQuery.fn = jQuery.prototype = { init: function( selector, context ) { - var match, elem, ret; + var match, elem, ret, doc; // Handle $(""), $(null), or $(undefined) - if ( !selector ) return this; + if ( !selector ) { + return this; + } // Handle $(DOMElement) if ( selector.nodeType ) { this.context = this[0] = selector; - this.length++; + this.length = 1; return this; } @@ -66,19 +70,33 @@ jQuery.fn = jQuery.prototype = { // HANDLE: $(html) -> $(array) if ( match[1] ) { - selector = jQuery.clean( [ match[1] ], context ); + doc = (context ? context.ownerDocument || context : document); + + // If a single string is passed in and it's a single tag + // just do a createElement and skip the rest + ret = rsingleTag.exec( selector ); + + if ( ret ) { + selector = [ doc.createElement( ret[1] ) ]; + + } else { + ret = buildFragment( [ match[1] ], [ doc ] ); + selector = (ret.cacheable ? ret.fragment.cloneNode(true) : ret.fragment).childNodes; + } // HANDLE: $("#id") } else { - elem = document.getElementById( match[3] ); + elem = document.getElementById( match[2] ); if ( elem ) { // Handle the case where IE and Opera return items // by name instead of ID - if ( elem.id !== match[3] ) return rootjQuery.find( selector ); + if ( elem.id !== match[2] ) { + return rootjQuery.find( selector ); + } // Otherwise, we inject the element directly into the jQuery object - this.length++; + this.length = 1; this[0] = elem; } @@ -87,6 +105,12 @@ jQuery.fn = jQuery.prototype = { return this; } + // HANDLE: $("TAG") + } else if ( !context && /^\w+$/.test( selector ) ) { + this.selector = selector; + this.context = document; + selector = document.getElementsByTagName( selector ); + // HANDLE: $(expr, $(...)) } else if ( !context || context.jquery ) { return (context || rootjQuery).find( selector ); @@ -103,8 +127,7 @@ jQuery.fn = jQuery.prototype = { return rootjQuery.ready( selector ); } - // Make sure that old selector state is passed along - if ( selector.selector && selector.context ) { + if (selector.selector !== undefined) { this.selector = selector.selector; this.context = selector.context; } @@ -128,7 +151,9 @@ jQuery.fn = jQuery.prototype = { return this.length; }, - toArray: slice, + toArray: function(){ + return slice.call( this, 0 ); + }, // Get the Nth element in the matched element set OR // Get the whole matched element set as a clean array @@ -139,7 +164,7 @@ jQuery.fn = jQuery.prototype = { this.toArray() : // Return just the object - ( num < 0 ? this.toArray(num)[ 0 ] : this[ num ] ); + ( num < 0 ? this.slice(num)[ 0 ] : this[ num ] ); }, // Take an array of elements and push it onto the stack @@ -198,7 +223,7 @@ jQuery.fn = jQuery.prototype = { }, is: function( selector ) { - return !!selector && jQuery.multiFilter( selector, this ).length > 0; + return !!selector && jQuery.filter( selector, this ).length > 0; }, // For internal use only. @@ -255,7 +280,7 @@ jQuery.extend = jQuery.fn.extend = function() { clone = src; } else if ( jQuery.isArray(copy) ) { clone = []; - } else if ( jQuery.isObject(copy) ) { + } else if ( jQuery.isObjectLiteral(copy) ) { clone = {}; } else { clone = copy; @@ -298,8 +323,18 @@ jQuery.extend({ return toString.call(obj) === "[object Array]"; }, - isObject: function( obj ) { - return this.constructor.call(obj) === Object; + isObjectLiteral: function( obj ) { + if ( toString.call(obj) !== "[object Object]" ) { + return false; + } + + //own properties are iterated firstly, + //so to speed up, we can test last one if it is own or not + + var key; + for ( key in obj ) {} + + return !key || hasOwnProperty.call( obj, key ); }, isEmptyObject: function( obj ) { @@ -311,8 +346,10 @@ jQuery.extend({ // check if an element is in a (or is an) XML document isXMLDoc: function( elem ) { - return elem.nodeType === 9 && elem.documentElement.nodeName !== "HTML" || - !!elem.ownerDocument && elem.ownerDocument.documentElement.nodeName !== "HTML"; + // documentElement is verified for cases where it doesn't yet exist + // (such as loading iframes in IE - #4833) + var documentElement = (elem ? elem.ownerDocument || elem : 0).documentElement; + return documentElement ? documentElement.nodeName !== "HTML" : false; }, // Evalulates a script in a global context @@ -418,43 +455,13 @@ jQuery.extend({ // expando of getElementsByTagName var i = 0, elem, pos = first.length; - // Also, we need to make sure that the correct elements are being returned - // (IE returns comment nodes in a '*' query) - if ( !jQuery.support.getAll ) { - while ( (elem = second[ i++ ]) != null ) { - if ( elem.nodeType !== 8 ) { - first[ pos++ ] = elem; - } - } - - } else { - while ( (elem = second[ i++ ]) != null ) { - first[ pos++ ] = elem; - } + while ( (elem = second[ i++ ]) != null ) { + first[ pos++ ] = elem; } return first; }, - unique: function( array ) { - var ret = [], done = {}, id; - - try { - for ( var i = 0, length = array.length; i < length; i++ ) { - id = jQuery.data( array[ i ] ); - - if ( !done[ id ] ) { - done[ id ] = true; - ret.push( array[ i ] ); - } - } - } catch( e ) { - ret = array; - } - - return ret; - }, - grep: function( elems, callback, inv ) { var ret = []; @@ -497,6 +504,12 @@ jQuery.extend({ } }); +if ( indexOf ) { + jQuery.inArray = function( elem, array ) { + return indexOf.call( array, elem ); + }; +} + // All jQuery objects should point back to these rootjQuery = jQuery(document); @@ -516,6 +529,36 @@ function evalScript( i, elem ) { } } +// Mutifunctional method to get and set values to a collection +// The value/s can be optionally by executed if its a function +function access( elems, key, value, exec, fn ) { + var l = elems.length; + + // Setting many attributes + if ( typeof key === "object" ) { + for (var k in key) { + access(elems, k, key[k], exec, fn); + } + return elems; + } + + // Setting one attribute + if (value !== undefined) { + // Optionally, function values get executed if exec is true + exec = exec && jQuery.isFunction(value); + + for (var i = 0; i < l; i++) { + var elem = elems[i], + val = exec ? value.call(elem, i) : value; + fn(elem, key, val); + } + return elems; + } + + // Getting an attribute + return l ? fn(elems[0], key) : null; +} + function now() { return (new Date).getTime(); }