X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fjquery%2Fjquery.js;h=f942bf4f6fceb3d6f6d3d8a59c2407e50349d6dd;hb=fd30d7746d1b98b362f796f235805061d63d514f;hp=cc0af5212b8d6a443496008a24d1b18b109dfef5;hpb=f2ff0db0320cfab0d856ff68d012cb843c97b600;p=jquery.git

diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js
index cc0af52..f942bf4 100644
--- a/src/jquery/jquery.js
+++ b/src/jquery/jquery.js
@@ -154,10 +154,18 @@ var $ = jQuery;
  * });
  * @desc Executes the function when the DOM is ready to be used.
  *
+ * @example jQuery(function($) {
+ *   // Your code using failsafe $ alias here...
+ * });
+ * @desc Uses both the shortcut for $(document).ready() and the argument
+ * to write failsafe jQuery code using the $ alias, without relying on the
+ * global alias.
+ *
  * @name $
  * @param Function fn The function to execute when the DOM is ready.
  * @cat Core
  * @type jQuery
+ * @see ready(Function)
  */
 
 jQuery.fn = jQuery.prototype = {
@@ -432,7 +440,7 @@ jQuery.fn = jQuery.prototype = {
 			for ( var prop in obj )
 				jQuery.attr(
 					type ? this.style : this,
-					prop, jQuery.prop(this, obj[prop])
+					prop, jQuery.prop(this, obj[prop], type)
 				);
 		});
 	},
@@ -477,16 +485,22 @@ jQuery.fn = jQuery.prototype = {
 
 	/**
 	 * Set a single style property to a value, on all matched elements.
+	 * If a number is provided, it is automatically converted into a pixel value.
 	 *
 	 * @example $("p").css("color","red");
 	 * @before <p>Test Paragraph.</p>
 	 * @result <p style="color:red;">Test Paragraph.</p>
 	 * @desc Changes the color of all paragraphs to red
 	 *
+	 * @example $("p").css("left",30);
+	 * @before <p>Test Paragraph.</p>
+	 * @result <p style="left:30px;">Test Paragraph.</p>
+	 * @desc Changes the left of all paragraphs to "30px"
+	 *
 	 * @name css
 	 * @type jQuery
 	 * @param String key The name of the property to set.
-	 * @param Object value The value to set the property to.
+	 * @param String|Number value The value to set the property to.
 	 * @cat CSS
 	 */
 	css: function( key, value ) {
@@ -534,7 +548,7 @@ jQuery.fn = jQuery.prototype = {
 			"textContent" : "innerText";
 			
 		return e == undefined ?
-			this.length && this[0][ type ] :
+			jQuery.map(this, function(a){ return a[ type ]; }).join('') :
 			this.each(function(){ this[ type ] = e; });
 	},
 
@@ -799,6 +813,7 @@ jQuery.fn = jQuery.prototype = {
 	 *
 	 * @name clone
 	 * @type jQuery
+	 * @param Boolean deep (Optional) Set to false if you don't want to clone all descendant nodes, in addition to the element itself.
 	 * @cat DOM/Manipulation
 	 */
 	clone: function(deep) {
@@ -1236,10 +1251,16 @@ jQuery.extend({
 		return obj;
 	},
 	
-	prop: function(elem, value){
-		// Handle executable functions
-		return value.constructor == Function &&
-			value.call( elem ) || value;
+	prop: function(elem, value, type){
+			// Handle executable functions
+			if ( value.constructor == Function )
+				return value.call( elem );
+
+			// Handle passing in a number to a CSS property
+			if ( value.constructor == Number && type == "css" )
+				return value + "px";
+
+			return value;
 	},
 
 	className: {
@@ -1362,7 +1383,7 @@ jQuery.extend({
 	
 	clean: function(a) {
 		var r = [];
-		
+
 		for ( var i = 0, al = a.length; i < al; i++ ) {
 			var arg = a[i];
 			
@@ -1415,7 +1436,7 @@ jQuery.extend({
 				arg = div.childNodes;
 			}
 			
-			if ( arg.nodeType )
+			if ( arg[0] == undefined )
 				r.push( arg );
 			else
 				r = jQuery.merge( r, arg );