X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fcore.js;h=e2d3b60f75820f0a61cb6118625f0801e3314db8;hb=ad4f28631ac888e7ac8384b4b713012fd1ca2dca;hp=d2f82a6db5318e53382088d4c0aa5d7b7afbac12;hpb=aadc268abf555f0f1cc7c5bc05d0dc73b35cb705;p=jquery.git

diff --git a/src/core.js b/src/core.js
index d2f82a6..e2d3b60 100644
--- a/src/core.js
+++ b/src/core.js
@@ -29,16 +29,17 @@ var jQuery = function( selector, context ) {
 	rnotwhite = /\S/,
 
 	// Used for trimming whitespace
-	rtrim = /^\s+|\s+$/g,
+	rtrim = /(\s|\u00A0)+|(\s|\u00A0)+$/g,
 
 	// Match a standalone tag
-	rsingleTag = /^<(\w+)\s*\/?>$/,
+	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,
 	indexOf = Array.prototype.indexOf;
@@ -52,15 +53,10 @@ jQuery.fn = jQuery.prototype = {
 			return this;
 		}
 
-		// $("body"): Shortcut for quickly finding the body element
-		if ( selector === "body" && !context && document.body ) {
-			selector = document.body;
-		}
-
 		// Handle $(DOMElement)
 		if ( selector.nodeType ) {
 			this.context = this[0] = selector;
-			this.length++;
+			this.length = 1;
 			return this;
 		}
 
@@ -100,7 +96,7 @@ jQuery.fn = jQuery.prototype = {
 						}
 
 						// Otherwise, we inject the element directly into the jQuery object
-						this.length++;
+						this.length = 1;
 						this[0] = elem;
 					}
 
@@ -136,9 +132,9 @@ jQuery.fn = jQuery.prototype = {
 			this.context = selector.context;
 		}
 
-		return this.setArray(jQuery.isArray( selector ) ?
-			selector :
-			jQuery.makeArray(selector));
+		return jQuery.isArray( selector ) ?
+			this.setArray( selector ) :
+			jQuery.makeArray( selector, this );
 	},
 
 	// Start with an empty selector
@@ -227,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.
@@ -276,19 +272,10 @@ jQuery.extend = jQuery.fn.extend = function() {
 					continue;
 				}
 
-				// Recurse if we're merging object values
-				if ( deep && copy && typeof copy === "object" && !copy.nodeType ) {
-					var clone;
-
-					if ( src ) {
-						clone = src;
-					} else if ( jQuery.isArray(copy) ) {
-						clone = [];
-					} else if ( jQuery.isObject(copy) ) {
-						clone = {};
-					} else {
-						clone = copy;
-					}
+				// Recurse if we're merging object literal values
+				if ( deep && copy && jQuery.isObjectLiteral(copy) ) {
+					// Don't extend not object literals
+					var clone = src && jQuery.isObjectLiteral(src) ? src : {};
 
 					// Never move original objects, clone them
 					target[ name ] = jQuery.extend( deep, clone, copy );
@@ -327,8 +314,25 @@ 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]" || typeof obj.nodeType === "number" ) {
+			return false;
+		}
+		
+		// not own constructor property must be Object
+		if ( obj.constructor
+		  && !hasOwnProperty.call(obj, "constructor")
+		  && !hasOwnProperty.call(obj.constructor.prototype, "isPrototypeOf") ) {
+			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 === undefined || hasOwnProperty.call( obj, key );
 	},
 
 	isEmptyObject: function( obj ) {
@@ -415,19 +419,16 @@ jQuery.extend({
 		return (text || "").replace( rtrim, "" );
 	},
 
-	makeArray: function( array ) {
-		var ret = [], i;
+	// results is for internal usage only
+	makeArray: function( array, results ) {
+		var ret = results || [];
 
 		if ( array != null ) {
-			i = array.length;
-
 			// The window, strings (and functions) also have 'length'
-			if ( i == null || typeof array === "string" || jQuery.isFunction(array) || array.setInterval ) {
-				ret[0] = array;
+			if ( array.length == null || typeof array === "string" || jQuery.isFunction(array) || array.setInterval ) {
+				push.call( ret, array );
 			} else {
-				while ( i ) {
-					ret[--i] = array[i];
-				}
+				jQuery.merge( ret, array );
 			}
 		}
 
@@ -435,6 +436,10 @@ jQuery.extend({
 	},
 
 	inArray: function( elem, array ) {
+		if ( array.indexOf ) {
+			return array.indexOf( elem );
+		}
+
 		for ( var i = 0, length = array.length; i < length; i++ ) {
 			if ( array[ i ] === elem ) {
 				return i;
@@ -445,45 +450,24 @@ jQuery.extend({
 	},
 
 	merge: function( first, second ) {
-		// We have to loop this way because IE & Opera overwrite the length
-		// 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;
-				}
-			}
+		var pos, i = second.length;
 
-		} else {
-			while ( (elem = second[ i++ ]) != null ) {
-				first[ pos++ ] = elem;
-			}
+		// We have to get length this way when IE & Opera overwrite the length
+		// expando of getElementsByTagName
+		if ( i && i.nodeType ) {
+			for ( i = 0; second[i]; ++i ) {}
 		}
-
-		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;
+		
+		pos = i + first.length;
+		
+		// Correct length for non Arrays
+		first.length = pos;
+		
+		while ( i ) {
+			first[ --pos ] = second[ --i ];
 		}
 
-		return ret;
+		return first;
 	},
 
 	grep: function( elems, callback, inv ) {
@@ -553,6 +537,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();
 }