X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fcore.js;h=271e7c434fb8693ed09a4c8e39c0e3fa982be1ae;hb=e73990a566fcb2dac71e1a25ec83382645adc5b7;hp=56fd0983e33862cda330974947832bde770bcf3d;hpb=58235cc38ea835cde0ae90dd2919b86e47f3dd05;p=jquery.git

diff --git a/src/core.js b/src/core.js
index 56fd098..271e7c4 100644
--- a/src/core.js
+++ b/src/core.js
@@ -71,7 +71,7 @@ jQuery.fn = jQuery.prototype = {
 				return (context || rootjQuery).find( selector );
 
 			// HANDLE: $(expr, context)
-			// (which is just equivalent to: $(content).find(expr)
+			// (which is just equivalent to: $(context).find(expr)
 			} else {
 				return jQuery( context ).find( selector );
 			}
@@ -166,29 +166,42 @@ jQuery.fn = jQuery.prototype = {
 	},
 
 	attr: function( name, value, type ) {
-		var options = name;
+		var options = name, isFunction = jQuery.isFunction( value );
 
 		// Look for the case where we're accessing a style value
-		if ( typeof name === "string" )
-			if ( value === undefined )
-				return this[0] && jQuery[ type || "attr" ]( this[0], name );
+		if ( typeof name === "string" ) {
+			if ( value === undefined ) {
+				return this.length ?
+					jQuery[ type || "attr" ]( this[0], name ) :
+					null;
 
-			else {
+			} else {
 				options = {};
 				options[ name ] = value;
 			}
+		}
 
 		// Check to see if we're setting style values
-		return this.each(function(i){
+		for ( var i = 0, l = this.length; i < l; i++ ) {
+			var elem = this[i];
+
 			// Set all the styles
-			for ( name in options )
-				jQuery.attr(
-					type ?
-						this.style :
-						this,
-					name, jQuery.prop( this, options[ name ], type, i, name )
-				);
-		});
+			for ( var prop in options ) {
+				value = options[prop];
+
+				if ( isFunction ) {
+					value = value.call( elem, i );
+				}
+
+				if ( typeof value === "number" && type === "curCSS" && !exclude.test(prop) ) {
+					value = value + "px";
+				}
+
+				jQuery.attr( type ? elem.style : elem, prop, value );
+			}
+		}
+
+		return this;
 	},
 
 	css: function( key, value ) {
@@ -279,9 +292,14 @@ jQuery.fn = jQuery.prototype = {
 		return this.prevObject || jQuery(null);
 	},
 
+	// For internal use only.
+	// Behaves like an Array's method, not like a jQuery method.
+	push: [].push,
+	sort: [].sort,
+	splice: [].splice,
+
 	find: function( selector ) {
-		var ret = this.pushStack( "", "find", selector ), length = 0,
-			splice = Array.prototype.splice;
+		var ret = this.pushStack( "", "find", selector ), length = 0;
 
 		for ( var i = 0, l = this.length; i < l; i++ ) {
 			length = ret.length;
@@ -292,7 +310,7 @@ jQuery.fn = jQuery.prototype = {
 				for ( var n = length; n < ret.length; n++ ) {
 					for ( var r = 0; r < length; r++ ) {
 						if ( ret[r] === ret[n] ) {
-							splice.call(ret, n--, 1);
+							ret.splice(n--, 1);
 							break;
 						}
 					}
@@ -644,7 +662,7 @@ 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 && jQuery.isXMLDoc( elem.ownerDocument );
+			!!elem.ownerDocument && elem.ownerDocument.documentElement.nodeName !== "HTML";
 	},
 
 	// Evalulates a script in a global context
@@ -700,17 +718,6 @@ jQuery.extend({
 		return object;
 	},
 
-	prop: function( elem, value, type, i, name ) {
-		// Handle executable functions
-		if ( jQuery.isFunction( value ) )
-			value = value.call( elem, i );
-
-		// Handle passing in a number to a CSS property
-		return typeof value === "number" && type == "curCSS" && !exclude.test( name ) ?
-			value + "px" :
-			value;
-	},
-
 	className: {
 		// internal only, use addClass("class")
 		add: function( elem, classNames ) {
@@ -974,7 +981,7 @@ jQuery.extend({
 		if (!elem || elem.nodeType == 3 || elem.nodeType == 8)
 			return undefined;
 
-		var notxml = !jQuery.isXMLDoc( elem ),
+		var notxml = !elem.tagName || !jQuery.isXMLDoc( elem ),
 			// Whether we are setting (or getting)
 			set = value !== undefined;
 
@@ -997,7 +1004,7 @@ jQuery.extend({
 			if ( name in elem && notxml && !special ) {
 				if ( set ){
 					// We can't allow the type property to be changed (since it causes problems in IE)
-					if ( name == "type" && jQuery.nodeName( elem, "input" ) && elem.parentNode )
+					if ( name == "type" && elem.nodeName.match(/(button|input)/i) && elem.parentNode )
 						throw "type property can't be changed";
 
 					elem[ name ] = value;
@@ -1282,8 +1289,3 @@ function cleanData( elems ) {
 		}
 	}
 }
-
-// Helper function used by the dimensions and offset modules
-function num(elem, prop) {
-	return elem[0] && parseInt( jQuery.curCSS(elem[0], prop, true), 10 ) || 0;
-}