X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fjquery%2Fjquery.js;h=3693ee373a0623ac8fb379552a472725ee38fbdb;hb=81f138d77e92e4deb6057cead988ebb679370973;hp=f1cc33931e2a3da6f1fdc5923f82c65bbc2afdb7;hpb=866187fff66ef50b9c4b4c47f332f742c7546cc5;p=jquery.git

diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js
index f1cc339..3693ee3 100644
--- a/src/jquery/jquery.js
+++ b/src/jquery/jquery.js
@@ -1,7 +1,7 @@
 /*
  * jQuery @VERSION - New Wave Javascript
  *
- * Copyright (c) 2006 John Resig (jquery.com)
+ * Copyright (c) 2007 John Resig (jquery.com)
  * Dual licensed under the MIT (MIT-LICENSE.txt)
  * and GPL (GPL-LICENSE.txt) licenses.
  *
@@ -32,14 +32,13 @@ var jQuery = function(a,c) {
 	
 	// HANDLE: $(function)
 	// Shortcut for document ready
-	// Safari reports typeof on DOM NodeLists as a function
-	if ( jQuery.isFunction(a) && !a.nodeType && a[0] == undefined )
+	if ( jQuery.isFunction(a) )
 		return new jQuery(document)[ jQuery.fn.ready ? "ready" : "load" ]( a );
 	
 	// Handle HTML strings
 	if ( typeof a  == "string" ) {
 		// HANDLE: $(html) -> $(array)
-		var m = /^[^<]*(<.+>)[^>]*$/.exec(a);
+		var m = /^[^<]*(<(.|\s)+>)[^>]*$/.exec(a);
 		if ( m )
 			a = jQuery.clean( [ m[1] ] );
 		
@@ -122,11 +121,6 @@ var $ = jQuery;
  * This function also accepts XML Documents and Window objects
  * as valid arguments (even though they are not DOM Elements).
  *
- * @example $(document).find("div > p")
- * @before <p>one</p> <div><p>two</p></div> <p>three</p>
- * @result [ <p>two</p> ]
- * @desc Same as $("div > p") because the document
- *
  * @example $(document.body).background( "black" );
  * @desc Sets the background color of the page to black.
  *
@@ -263,9 +257,9 @@ jQuery.fn = jQuery.prototype = {
 	 * @cat Core
 	 */
 	pushStack: function( a ) {
-		var ret = jQuery(this);
+		var ret = jQuery(a);
 		ret.prevObject = this;
-		return ret.setArray( a );
+		return ret;
 	},
 	
 	/**
@@ -416,10 +410,16 @@ jQuery.fn = jQuery.prototype = {
 	 * @result <img src="test.jpg" title="test.jpg" />
 	 * @desc Sets title attribute from src attribute.
 	 *
+	 * @example $("img").attr("title", function(index) { return this.title + (i + 1); });
+	 * @before <img title="pic" /><img title="pic" /><img title="pic" />
+	 * @result <img title="pic1" /><img title="pic2" /><img title="pic3" />
+	 * @desc Enumerate title attribute.
+	 *
 	 * @name attr
 	 * @type jQuery
 	 * @param String key The name of the property to set.
 	 * @param Function value A function returning the value to set.
+	 * 	 	  Scope: Current element, argument: Index of current element
 	 * @cat DOM/Attributes
 	 */
 	attr: function( key, value, type ) {
@@ -428,19 +428,19 @@ jQuery.fn = jQuery.prototype = {
 		// Look for the case where we're accessing a style value
 		if ( key.constructor == String )
 			if ( value == undefined )
-				return jQuery[ type || "attr" ]( this[0], key );
+				return this.length && jQuery[ type || "attr" ]( this[0], key ) || undefined;
 			else {
 				obj = {};
 				obj[ key ] = value;
 			}
 		
 		// Check to see if we're setting style values
-		return this.each(function(){
+		return this.each(function(index){
 			// Set all the styles
 			for ( var prop in obj )
 				jQuery.attr(
 					type ? this.style : this,
-					prop, jQuery.prop(this, obj[prop], type)
+					prop, jQuery.prop(this, obj[prop], type, index, prop)
 				);
 		});
 	},
@@ -546,18 +546,16 @@ jQuery.fn = jQuery.prototype = {
 	text: function(e) {
 		if ( typeof e == "string" )
 			return this.empty().append( document.createTextNode( e ) );
-		else {
-			e = e || this;
-			var t = "";
-			for ( var j = 0, el = e.length; j < el; j++ ) {
-				var r = e[j].childNodes;
-				for ( var i = 0, rl = r.length; i < rl; i++ )
-					if ( r[i].nodeType != 8 )
-						t += r[i].nodeType != 1 ?
-							r[i].nodeValue : jQuery.fn.text([ r[i] ]);
-			}
-			return t;
-		}
+
+		var t = "";
+		jQuery.each( e || this, function(){
+			jQuery.each( this.childNodes, function(){
+				if ( this.nodeType != 8 )
+					t += this.nodeType != 1 ?
+						this.nodeValue : jQuery.fn.text([ this ]);
+			});
+		});
+		return t;
 	},
 
 	/**
@@ -805,7 +803,7 @@ jQuery.fn = jQuery.prototype = {
 	find: function(t) {
 		return this.pushStack( jQuery.map( this, function(a){
 			return jQuery.find(t,a);
-		}) );
+		}), t );
 	},
 
 	/**
@@ -929,14 +927,14 @@ jQuery.fn = jQuery.prototype = {
 	not: function(t) {
 		return this.pushStack(
 			t.constructor == String &&
-			jQuery.multiFilter(t,this,true) ||
-
-			jQuery.grep(this,function(a){
-					if ( t.constructor == Array || t.jquery )
-						return jQuery.inArray( t, a ) < 0;
-					else
-						return a != t;
-			}) );
+			jQuery.multiFilter(t, this, true) ||
+
+			jQuery.grep(this, function(a) {
+				return ( t.constructor == Array || t.jquery )
+					? jQuery.inArray( a, t ) < 0
+					: a != t;
+			})
+		);
 	},
 
 	/**
@@ -986,7 +984,10 @@ jQuery.fn = jQuery.prototype = {
 	add: function(t) {
 		return this.pushStack( jQuery.merge(
 			this.get(),
-			typeof t == "string" ? jQuery(t).get() : t )
+			t.constructor == String ?
+				jQuery(t).get() :
+				t.length != undefined && (!t.nodeName || t.nodeName == "FORM") ?
+					t : [t] )
 		);
 	},
 
@@ -1099,11 +1100,12 @@ jQuery.fn = jQuery.prototype = {
 		return this.each(function(){
 			var obj = this;
 
-			if ( table && this.nodeName.toUpperCase() == "TABLE" && a[0].nodeName.toUpperCase() == "TR" )
+			if ( table && jQuery.nodeName(this, "table") && jQuery.nodeName(a[0], "tr") )
 				obj = this.getElementsByTagName("tbody")[0] || this.appendChild(document.createElement("tbody"));
 
-			for ( var i = 0, al = a.length; i < al; i++ )
-				fn.apply( obj, [ clone ? a[i].cloneNode(true) : a[i] ] );
+			jQuery.each( a, function(){
+				fn.apply( obj, [ clone ? this.cloneNode(true) : this ] );
+			});
 
 		});
 	}
@@ -1217,10 +1219,23 @@ jQuery.extend({
 	noConflict: function() {
 		if ( jQuery._$ )
 			$ = jQuery._$;
+		return jQuery;
 	},
 
+	// This may seem like some crazy code, but trust me when I say that this
+	// is the only cross-browser way to do this. --John
 	isFunction: function( fn ) {
-		return fn && typeof fn == "function";
+		return !!fn && typeof fn != "string" &&
+			typeof fn[0] == "undefined" && /function/i.test( fn + "" );
+	},
+	
+	// check if an element is in a XML document
+	isXMLDoc: function(elem) {
+		return elem.tagName && elem.ownerDocument && !elem.ownerDocument.body;
+	},
+
+	nodeName: function( elem, name ) {
+		return elem.nodeName && elem.nodeName.toUpperCase() == name.toUpperCase();
 	},
 
 	/**
@@ -1262,16 +1277,18 @@ jQuery.extend({
 		return obj;
 	},
 	
-	prop: function(elem, value, type){
+	prop: function(elem, value, type, index, prop){
 			// Handle executable functions
 			if ( jQuery.isFunction( value ) )
-				return value.call( elem );
+				return value.call( elem, [index] );
+				
+			// exclude the following css properties to add px
+			var exclude = /z-?index|font-?weight|opacity|zoom|line-?height/i;
 
 			// Handle passing in a number to a CSS property
-			if ( value.constructor == Number && type == "curCSS" )
-				return value + "px";
-
-			return value;
+			return value && value.constructor == Number && type == "curCSS" && !exclude.test(prop) ?
+				value + "px" :
+				value;
 	},
 
 	className: {
@@ -1316,10 +1333,10 @@ jQuery.extend({
 		if ( p == "height" || p == "width" ) {
 			var old = {}, oHeight, oWidth, d = ["Top","Bottom","Right","Left"];
 
-			for ( var i = 0, dl = d.length; i < dl; i++ ) {
-				old["padding" + d[i]] = 0;
-				old["border" + d[i] + "Width"] = 0;
-			}
+			jQuery.each( d, function(){
+				old["padding" + this] = 0;
+				old["border" + this + "Width"] = 0;
+			});
 
 			jQuery.swap( e, old, function() {
 				if (jQuery.css(e,"display") != "none") {
@@ -1395,10 +1412,8 @@ jQuery.extend({
 	clean: function(a) {
 		var r = [];
 
-		for ( var i = 0, al = a.length; i < al; i++ ) {
-			var arg = a[i];
-
-			if ( !arg ) continue;
+		jQuery.each( a, function(i,arg){
+			if ( !arg ) return;
 
 			if ( arg.constructor == Number )
 				arg = arg.toString();
@@ -1444,7 +1459,7 @@ jQuery.extend({
 						tb = div.childNodes;
 
 					for ( var n = tb.length-1; n >= 0 ; --n )
-						if ( tb[n].nodeName.toUpperCase() == "TBODY" && !tb[n].childNodes.length )
+						if ( jQuery.nodeName(tb[n], "tbody") && !tb[n].childNodes.length )
 							tb[n].parentNode.removeChild(tb[n]);
 					
 				}
@@ -1453,20 +1468,20 @@ jQuery.extend({
 			}
 
 			if ( arg.length === 0 )
-				continue;
+				return;
 			
-			if ( arg[0] == undefined )
+			if ( arg[0] == undefined || (jQuery.browser.msie && jQuery.nodeName(arg,"form")) )
 				r.push( arg );
 			else
 				r = jQuery.merge( r, arg );
 
-		}
+		});
 
 		return r;
 	},
 	
 	attr: function(elem, name, value){
-		var fix = {
+		var fix = jQuery.isXMLDoc(elem) ? {} : {
 			"for": "htmlFor",
 			"class": "className",
 			"float": jQuery.browser.msie ? "styleFloat" : "cssFloat",
@@ -1480,6 +1495,8 @@ jQuery.extend({
 			selected: "selected"
 		};
 		
+		var fixIE = jQuery.isXMLDoc(elem) ? [] : "href,src,background,cite,classid,codebase,data,longdesc,profile,usemap".split(',');
+		
 		// IE actually uses filters for opacity ... elem is actually elem.style
 		if ( name == "opacity" && jQuery.browser.msie && value != undefined ) {
 			// IE has trouble with opacity if it does not have layout
@@ -1497,20 +1514,23 @@ jQuery.extend({
 		// Mozilla doesn't play well with opacity 1
 		if ( name == "opacity" && jQuery.browser.mozilla && value == 1 )
 			value = 0.9999;
+			
 
 		// Certain attributes only work when accessed via the old DOM 0 way
 		if ( fix[name] ) {
 			if ( value != undefined ) elem[fix[name]] = value;
 			return elem[fix[name]];
 
-		} else if ( value == undefined && jQuery.browser.msie && elem.nodeName && elem.nodeName.toUpperCase() == "FORM" && (name == "action" || name == "method") )
+		} else if ( value == undefined && jQuery.browser.msie && jQuery.nodeName(elem, "form") && (name == "action" || name == "method") )
 			return elem.getAttributeNode(name).nodeValue;
 
 		// IE elem.getAttribute passes even for style
 		else if ( elem.tagName ) {
 			if ( value != undefined ) elem.setAttribute( name, value );
+			if ( jQuery.browser.msie && fixIE[name] ) return elem.getAttribute( name, 2 );
 			return elem.getAttribute( name );
 
+		// elem is actually elem.style ... set the style
 		} else {
 			name = name.replace(/-([a-z])/ig,function(z,b){return b.toUpperCase();});
 			if ( value != undefined ) elem[name] = value;
@@ -1555,21 +1575,22 @@ jQuery.extend({
 	/**
 	 * Merge two arrays together, removing all duplicates.
 	 *
-	 * The new array is: All the results from the first array, followed
-	 * by the unique results from the second array.
+	 * The result is the altered first argument with
+	 * the unique elements from the second array added.
 	 *
 	 * @example $.merge( [0,1,2], [2,3,4] )
 	 * @result [0,1,2,3,4]
 	 * @desc Merges two arrays, removing the duplicate 2
 	 *
-	 * @example $.merge( [3,2,1], [4,3,2] )
-	 * @result [3,2,1,4]
+	 * @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
 	 *
 	 * @name $.merge
 	 * @type Array
-	 * @param Array first The first array to merge.
-	 * @param Array second The second array to merge.
+	 * @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.
 	 * @cat JavaScript
 	 */
 	merge: function(first, second) {