X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fjquery%2Fjquery.js;h=8e370f8ed8ca6fd0ecca6bff00327bc836a54d6b;hb=42f30dd1812fc0ee262eaa43f0a354d8e439938c;hp=7466236458ac76f7c0b73bc6b46ca3017211c0d5;hpb=33c097bd1e3caf623cc9a1e4518150c5a2233e93;p=jquery.git

diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js
index 7466236..8e370f8 100644
--- a/src/jquery/jquery.js
+++ b/src/jquery/jquery.js
@@ -24,7 +24,7 @@ window.undefined = window.undefined;
  */
 var jQuery = function(a,c) {
 	// If the context is global, return a new object
-	if ( window == this )
+	if ( window == this || !this.init )
 		return new jQuery(a,c);
 	
 	return this.init(a,c);
@@ -176,7 +176,7 @@ jQuery.fn = jQuery.prototype = {
 
 			// HANDLE: $(arraylike)
 			// Watch for when an array-like object is passed as the selector
-			(a.jquery || a.length && a != window && (!a.nodeType || (jQuery.browser.msie && a.elements)) && a[0] != undefined && a[0].nodeType) && jQuery.makeArray( a ) ||
+			(a.jquery || a.length && a != window && !a.nodeType && a[0] != undefined && a[0].nodeType) && jQuery.makeArray( a ) ||
 
 			// HANDLE: $(*)
 			[ a ] );
@@ -565,7 +565,7 @@ jQuery.fn = jQuery.prototype = {
 	 * @cat DOM/Attributes
 	 */
 	text: function(e) {
-		if ( typeof e == "string" )
+		if ( typeof e != "object" && e != null )
 			return this.empty().append( document.createTextNode( e ) );
 
 		var t = "";
@@ -811,7 +811,7 @@ jQuery.fn = jQuery.prototype = {
 
 	/**
 	 * Searches for all elements that match the specified expression.
-	 
+	 * 
 	 * This method is a good way to find additional descendant
 	 * elements with which to process.
 	 *
@@ -830,9 +830,9 @@ jQuery.fn = jQuery.prototype = {
 	 * @cat DOM/Traversing
 	 */
 	find: function(t) {
-		return this.pushStack( jQuery.unique( jQuery.map( this, function(a){
-			return jQuery.find(t,a);
-		}) ), t );
+		var data = jQuery.map(this, function(a){ return jQuery.find(t,a); });
+		return this.pushStack( /[^+>] [^+>]/.test( t ) || t.indexOf("..") > -1 ?
+			jQuery.unique( data ) : data );
 	},
 
 	/**
@@ -1443,7 +1443,7 @@ jQuery.extend({
 		}
 		
 		if (prop.match(/float/i))
-			prop = jQuery.browser.msie ? "styleFloat" : "cssFloat";
+			prop = jQuery.styleFloat;
 
 		if (!force && elem.style[prop])
 			ret = elem.style[prop];
@@ -1484,13 +1484,13 @@ jQuery.extend({
 			if ( arg.constructor == Number )
 				arg = arg.toString();
 			
-			 // Convert html string into DOM nodes
+			// Convert html string into DOM nodes
 			if ( typeof arg == "string" ) {
 				// Trim whitespace, otherwise indexOf won't work as expected
 				var s = jQuery.trim(arg).toLowerCase(), div = doc.createElement("div"), tb = [];
 
 				var wrap =
-					 // option or optgroup
+					// option or optgroup
 					!s.indexOf("<opt") &&
 					[1, "<select>", "</select>"] ||
 					
@@ -1539,7 +1539,7 @@ jQuery.extend({
 				arg = jQuery.makeArray( div.childNodes );
 			}
 
-			if ( 0 === arg.length && !jQuery(arg).is("form, select") )
+			if ( 0 === arg.length && (!jQuery.nodeName(arg, "form") && !jQuery.nodeName(arg, "select")) )
 				return;
 
 			if ( arg[0] == undefined || jQuery.nodeName(arg, "form") || arg.options )
@@ -1553,37 +1553,7 @@ jQuery.extend({
 	},
 	
 	attr: function(elem, name, value){
-		var fix = jQuery.isXMLDoc(elem) ? {} : {
-			"for": "htmlFor",
-			"class": "className",
-			"float": jQuery.browser.msie ? "styleFloat" : "cssFloat",
-			cssFloat: jQuery.browser.msie ? "styleFloat" : "cssFloat",
-			styleFloat: jQuery.browser.msie ? "styleFloat" : "cssFloat",
-			innerHTML: "innerHTML",
-			className: "className",
-			value: "value",
-			disabled: "disabled",
-			checked: "checked",
-			readonly: "readOnly",
-			selected: "selected",
-			maxlength: "maxLength"
-		};
-		
-		// IE actually uses filters for opacity ... elem is actually elem.style
-		if ( name == "opacity" && jQuery.browser.msie ) {
-			if ( value != undefined ) {
-				// IE has trouble with opacity if it does not have layout
-				// Force it by setting the zoom level
-				elem.zoom = 1; 
-
-				// Set the alpha filter to set the opacity
-				elem.filter = (elem.filter || "").replace(/alpha\([^)]*\)/,"") +
-					(parseFloat(value).toString() == "NaN" ? "" : "alpha(opacity=" + value * 100 + ")");
-			}
-
-			return elem.filter ? 
-				(parseFloat( elem.filter.match(/opacity=([^)]*)/)[1] ) / 100).toString() : "";
-		}
+		var fix = jQuery.isXMLDoc(elem) ? {} : jQuery.props;
 		
 		// Certain attributes only work when accessed via the old DOM 0 way
 		if ( fix[name] ) {
@@ -1595,6 +1565,8 @@ jQuery.extend({
 
 		// IE elem.getAttribute passes even for style
 		else if ( elem.tagName ) {
+			
+
 			if ( value != undefined ) elem.setAttribute( name, value );
 			if ( jQuery.browser.msie && /href|src/.test(name) && !jQuery.isXMLDoc(elem) ) 
 				return elem.getAttribute( name, 2 );
@@ -1602,6 +1574,21 @@ jQuery.extend({
 
 		// elem is actually elem.style ... set the style
 		} else {
+			// IE actually uses filters for opacity
+			if ( name == "opacity" && jQuery.browser.msie ) {
+				if ( value != undefined ) {
+					// IE has trouble with opacity if it does not have layout
+					// Force it by setting the zoom level
+					elem.zoom = 1; 
+	
+					// Set the alpha filter to set the opacity
+					elem.filter = (elem.filter || "").replace(/alpha\([^)]*\)/,"") +
+						(parseFloat(value).toString() == "NaN" ? "" : "alpha(opacity=" + value * 100 + ")");
+				}
+	
+				return elem.filter ? 
+					(parseFloat( elem.filter.match(/opacity=([^)]*)/)[1] ) / 100).toString() : "";
+			}
 			name = name.replace(/-([a-z])/ig,function(z,b){return b.toUpperCase();});
 			if ( value != undefined ) elem[name] = value;
 			return elem[name];
@@ -1644,24 +1631,16 @@ jQuery.extend({
 	},
 
 	/**
-	 * Merge two arrays together, removing all duplicates.
-	 *
-	 * The result is the altered first argument with
-	 * the unique elements from the second array added.
+	 * Merge two arrays together by concatenating them.
 	 *
 	 * @example $.merge( [0,1,2], [2,3,4] )
-	 * @result [0,1,2,3,4]
-	 * @desc Merges two arrays, removing the duplicate 2
-	 *
-	 * @example var array = [3,2,1];
-	 * $.merge( array, [4,3,2] )
-	 * @result array == [3,2,1,4]
-	 * @desc Merges two arrays, removing the duplicates 3 and 2
+	 * @result [0,1,2,2,3,4]
+	 * @desc Merges two arrays.
 	 *
 	 * @name $.merge
 	 * @type Array
-	 * @param Array first The first array to merge, the unique elements of second added.
-	 * @param Array second The second array to merge into the first, unaltered.
+	 * @param Array first The first array to merge, the elements of second are added.
+	 * @param Array second The second array to append to the first, unaltered.
 	 * @cat JavaScript
 	 */
 	merge: function(first, second) {
@@ -1672,14 +1651,30 @@ jQuery.extend({
 		return first;
 	},
 
+	/**
+	 * Reduce an array (of jQuery objects only) to its unique elements.
+	 *
+	 * @example $.unique( [x1, x2, x3, x2, x3] )
+	 * @result [x1, x2, x3]
+	 * @desc Reduces the arrays of jQuery objects to unique elements by removing the duplicates of x2 and x3
+	 *
+	 * @name $.unique
+	 * @type Array
+	 * @param Array array The array to reduce to its unique jQuery objects.
+	 * @cat JavaScript
+	 */
 	unique: function(first) {
 		var r = [], num = jQuery.mergeNum++;
 
-		for ( var i = 0, fl = first.length; i < fl; i++ )
-			if ( num != first[i].mergeNum ) {
-				first[i].mergeNum = num;
-				r.push(first[i]);
-			}
+		try {
+			for ( var i = 0, fl = first.length; i < fl; i++ )
+				if ( num != first[i].mergeNum ) {
+					first[i].mergeNum = num;
+					r.push(first[i]);
+				}
+		} catch(e) {
+			r = first;
+		}
 
 		return r;
 	},
@@ -1766,7 +1761,7 @@ jQuery.extend({
 		if ( typeof fn == "string" )
 			fn = new Function("a","return " + fn);
 
-		var result = [], r = [];
+		var result = [];
 
 		// Go through the array, translating each of the items to their
 		// new value (or values).
@@ -1820,7 +1815,7 @@ new function() {
 
 	// Figure out what browser is being used
 	jQuery.browser = {
-		version: b.match(/.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/)[1],
+		version: (b.match(/.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/) || [])[1],
 		safari: /webkit/.test(b),
 		opera: /opera/.test(b),
 		msie: /msie/.test(b) && !/opera/.test(b),
@@ -1829,6 +1824,24 @@ new function() {
 
 	// Check to see if the W3C box model is being used
 	jQuery.boxModel = !jQuery.browser.msie || document.compatMode == "CSS1Compat";
+
+	jQuery.styleFloat = jQuery.browser.msie ? "styleFloat" : "cssFloat",
+
+	jQuery.props = {
+		"for": "htmlFor",
+		"class": "className",
+		"float": jQuery.styleFloat,
+		cssFloat: jQuery.styleFloat,
+		styleFloat: jQuery.styleFloat,
+		innerHTML: "innerHTML",
+		className: "className",
+		value: "value",
+		disabled: "disabled",
+		checked: "checked",
+		readonly: "readOnly",
+		selected: "selected",
+		maxlength: "maxLength"
+	};
 };
 
 /**