X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fjquery%2Fjquery.js;h=09005a19160c1777c0b85e089cc298642fa837e2;hb=3d3237c1c0f3ec60b7b25442fc64c3705043fcd4;hp=4fb7f8e75b86a147be99c51b9833206eec61705c;hpb=76d6d445bb68009c010e0b91dbf21747bc2d35ba;p=jquery.git

diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js
index 4fb7f8e..09005a1 100644
--- a/src/jquery/jquery.js
+++ b/src/jquery/jquery.js
@@ -160,21 +160,6 @@ var $ = jQuery;
  * @type jQuery
  */
 
-/**
- * A means of creating a cloned copy of a jQuery object. This function
- * copies the set of matched elements from one jQuery object and creates
- * another, new, jQuery object containing the same elements.
- *
- * @example var div = $("div");
- * $( div ).find("p");
- * @desc Locates all p elements with all div elements, without disrupting the original jQuery object contained in 'div' (as would normally be the case if a simple div.find("p") was done).
- *
- * @name $
- * @param jQuery obj The jQuery object to be cloned.
- * @cat Core
- * @type jQuery
- */
-
 jQuery.fn = jQuery.prototype = {
 	/**
 	 * The current version of jQuery.
@@ -260,16 +245,16 @@ jQuery.fn = jQuery.prototype = {
 	 * Set the jQuery object to an array of elements, while maintaining
 	 * the stack.
 	 *
-	 * @example $("img").set([ document.body ]);
-	 * @result $("img").set() == [ document.body ]
+	 * @example $("img").pushStack([ document.body ]);
+	 * @result $("img").pushStack() == [ document.body ]
 	 *
 	 * @private
-	 * @name set
+	 * @name pushStack
 	 * @type jQuery
 	 * @param Elements elems An array of elements
 	 * @cat Core
 	 */
-	set: function( a ) {
+	pushStack: function( a ) {
 		var ret = jQuery(this);
 		ret.prevObject = this;
 		return ret.setArray( a );
@@ -277,7 +262,7 @@ jQuery.fn = jQuery.prototype = {
 	
 	/**
 	 * Set the jQuery object to an array of elements. This operation is
-	 * completely destructive - be sure to use .set() if you wish to maintain
+	 * completely destructive - be sure to use .pushStack() if you wish to maintain
 	 * the jQuery stack.
 	 *
 	 * @example $("img").setArray([ document.body ]);
@@ -447,7 +432,7 @@ jQuery.fn = jQuery.prototype = {
 			for ( var prop in obj )
 				jQuery.attr(
 					type ? this.style : this,
-					prop, jQuery.prop(this, prop, obj[prop], type)
+					prop, jQuery.prop(this, obj[prop])
 				);
 		});
 	},
@@ -796,7 +781,7 @@ jQuery.fn = jQuery.prototype = {
 	 * @cat DOM/Traversing
 	 */
 	find: function(t) {
-		return this.set( jQuery.map( this, function(a){
+		return this.pushStack( jQuery.map( this, function(a){
 			return jQuery.find(t,a);
 		}) );
 	},
@@ -817,7 +802,7 @@ jQuery.fn = jQuery.prototype = {
 	 * @cat DOM/Manipulation
 	 */
 	clone: function(deep) {
-		return this.set( jQuery.map( this, function(a){
+		return this.pushStack( jQuery.map( this, function(a){
 			return a.cloneNode( deep != undefined ? deep : true );
 		}) );
 	},
@@ -863,7 +848,7 @@ jQuery.fn = jQuery.prototype = {
 	 * @cat DOM/Traversing
 	 */
 	filter: function(t) {
-		return this.set(
+		return this.pushStack(
 			t.constructor == Array &&
 			jQuery.map(this,function(a){
 				for ( var i = 0, tl = t.length; i < tl; i++ )
@@ -912,7 +897,7 @@ jQuery.fn = jQuery.prototype = {
 	 * @cat DOM/Traversing
 	 */
 	not: function(t) {
-		return this.set( typeof t == "string" ?
+		return this.pushStack( typeof t == "string" ?
 			jQuery.filter(t,this,true).r :
 			jQuery.grep(this,function(a){ return a != t; }) );
 	},
@@ -930,6 +915,19 @@ jQuery.fn = jQuery.prototype = {
 	 * @param String expr An expression whose matched elements are added
 	 * @cat DOM/Traversing
 	 */
+	 
+	/**
+	 * Adds the on the fly created elements to the jQuery object.
+	 *
+	 * @example $("p").add("<span>Again</span>")
+	 * @before <p>Hello</p>
+	 * @result [ <p>Hello</p>, <span>Again</span> ]
+	 *
+	 * @name add
+	 * @type jQuery
+	 * @param String html A string of HTML to create on the fly.
+	 * @cat DOM/Traversing
+	 */
 
 	/**
 	 * Adds one or more Elements to the set of matched elements.
@@ -950,10 +948,10 @@ jQuery.fn = jQuery.prototype = {
 	 * @cat DOM/Traversing
 	 */
 	add: function(t) {
-		return this.set( jQuery.merge(
-			this.get(), typeof t == "string" ?
-				jQuery.find(t) :
-				t.constructor == Array ? t : [t] ) );
+		return this.pushStack( jQuery.merge(
+			this.get(),
+			typeof t == "string" ? jQuery(t).get() : t )
+		);
 	},
 
 	/**
@@ -1220,7 +1218,7 @@ jQuery.extend({
 		return obj;
 	},
 	
-	prop: function(elem, key, value){
+	prop: function(elem, value){
 		// Handle executable functions
 		return value.constructor == Function &&
 			value.call( elem ) || value;
@@ -1355,16 +1353,17 @@ jQuery.extend({
 
 				var wrap =
 					 // option or optgroup
-					!s.indexOf("<opt") && [1, "<select>", "</select>"] ||
+					!s.indexOf("<opt") &&
+					[1, "<select>", "</select>"] ||
 					
-					!s.indexOf("<thead") || !s.indexOf("<tbody") || !s.indexOf("<tfoot") &&
+					(!s.indexOf("<thead") || !s.indexOf("<tbody") || !s.indexOf("<tfoot")) &&
 					[1, "<table>", "</table>"] ||
 					
 					!s.indexOf("<tr") &&
 					[2, "<table><tbody>", "</tbody></table>"] ||
 					
 				 	// <thead> matched above
-					!s.indexOf("<td") || !s.indexOf("<th") &&
+					(!s.indexOf("<td") || !s.indexOf("<th")) &&
 					[3, "<table><tbody><tr>", "</tr></tbody></table>"] ||
 					
 					[0,"",""];
@@ -1400,6 +1399,7 @@ jQuery.extend({
 				r.push( arg );
 			else
 				r = jQuery.merge( r, arg );
+
 		}
 
 		return r;
@@ -1817,9 +1817,9 @@ new function() {
  */
 jQuery.each({
 	parent: "a.parentNode",
-	parents: jQuery.parents,
-	next: "jQuery.nth(a,1,'nextSibling')",
-	prev: "jQuery.nth(a,1,'previousSibling')",
+	parents: "jQuery.parents(a)",
+	next: "jQuery.nth(a,2,'nextSibling')",
+	prev: "jQuery.nth(a,2,'previousSibling')",
 	siblings: "jQuery.sibling(a.parentNode.firstChild,a)",
 	children: "jQuery.sibling(a.firstChild)"
 }, function(i,n){
@@ -1827,7 +1827,7 @@ jQuery.each({
 		var ret = jQuery.map(this,n);
 		if ( a && typeof a == "string" )
 			ret = jQuery.filter(a,ret).r;
-		return this.set( ret );
+		return this.pushStack( ret );
 	};
 });
 
@@ -1844,8 +1844,9 @@ jQuery.each({
  *
  * @name appendTo
  * @type jQuery
- * @param String expr A jQuery expression of elements to match.
+ * @param <Content> content Content to append to the selected element to.
  * @cat DOM/Manipulation
+ * @see append(<Content>)
  */
 
 /**
@@ -1861,8 +1862,9 @@ jQuery.each({
  *
  * @name prependTo
  * @type jQuery
- * @param String expr A jQuery expression of elements to match.
+ * @param <Content> content Content to prepend to the selected element to.
  * @cat DOM/Manipulation
+ * @see prepend(<Content>)
  */
 
 /**
@@ -1878,8 +1880,9 @@ jQuery.each({
  *
  * @name insertBefore
  * @type jQuery
- * @param String expr A jQuery expression of elements to match.
+ * @param <Content> content Content to insert the selected element before.
  * @cat DOM/Manipulation
+ * @see before(<Content>)
  */
 
 /**
@@ -1895,8 +1898,9 @@ jQuery.each({
  *
  * @name insertAfter
  * @type jQuery
- * @param String expr A jQuery expression of elements to match.
+ * @param <Content> content Content to insert the selected element after.
  * @cat DOM/Manipulation
+ * @see after(<Content>)
  */
 
 jQuery.each({
@@ -1928,65 +1932,25 @@ jQuery.each({
  */
 
 /**
- * Displays each of the set of matched elements if they are hidden.
- *
- * @example $("p").show()
- * @before <p style="display: none">Hello</p>
- * @result [ <p style="display: block">Hello</p> ]
- *
- * @name show
- * @type jQuery
- * @cat Effects
- */
-
-/**
- * Hides each of the set of matched elements if they are shown.
- *
- * @example $("p").hide()
- * @before <p>Hello</p>
- * @result [ <p style="display: none">Hello</p> ]
- *
- * var pass = true, div = $("div");
- * div.hide().each(function(){
- *   if ( this.style.display != "none" ) pass = false;
- * });
- * ok( pass, "Hide" );
- *
- * @name hide
- * @type jQuery
- * @cat Effects
- */
-
-/**
- * Toggles each of the set of matched elements. If they are shown,
- * toggle makes them hidden. If they are hidden, toggle
- * makes them shown.
- *
- * @example $("p").toggle()
- * @before <p>Hello</p><p style="display: none">Hello Again</p>
- * @result [ <p style="display: none">Hello</p>, <p style="display: block">Hello Again</p> ]
- *
- * @name toggle
- * @type jQuery
- * @cat Effects
- */
-
-/**
- * Adds the specified class to each of the set of matched elements.
+ * Adds the specified class(es) to each of the set of matched elements.
  *
  * @example $("p").addClass("selected")
  * @before <p>Hello</p>
  * @result [ <p class="selected">Hello</p> ]
  *
+ * @example $("p").addClass("selected highlight")
+ * @before <p>Hello</p>
+ * @result [ <p class="selected highlight">Hello</p> ]
+ *
  * @name addClass
  * @type jQuery
- * @param String class A CSS class to add to the elements
+ * @param String class One or more CSS classes to add to the elements
  * @cat DOM/Attributes
  * @see removeClass(String)
  */
 
 /**
- * Removes all or the specified class from the set of matched elements.
+ * Removes all or the specified class(es) from the set of matched elements.
  *
  * @example $("p").removeClass()
  * @before <p class="selected">Hello</p>
@@ -1996,9 +1960,13 @@ jQuery.each({
  * @before <p class="selected first">Hello</p>
  * @result [ <p class="first">Hello</p> ]
  *
+ * @example $("p").removeClass("selected highlight")
+ * @before <p class="highlight selected first">Hello</p>
+ * @result [ <p class="first">Hello</p> ]
+ *
  * @name removeClass
  * @type jQuery
- * @param String class (optional) A CSS class to remove from the elements
+ * @param String class (optional) One or more CSS classes to remove from the elements
  * @cat DOM/Attributes
  * @see addClass(String)
  */
@@ -2054,20 +2022,6 @@ jQuery.each( {
 		jQuery.attr( this, key, "" );
 		this.removeAttribute( key );
 	},
-	show: function(){
-		this.style.display = this.oldblock ? this.oldblock : "";
-		if ( jQuery.css(this,"display") == "none" )
-			this.style.display = "block";
-	},
-	hide: function(){
-		this.oldblock = this.oldblock || jQuery.css(this,"display");
-		if ( this.oldblock == "none" )
-			this.oldblock = "block";
-		this.style.display = "none";
-	},
-	toggle: function(){
-		jQuery(this)[ jQuery(this).is(":hidden") ? "show" : "hide" ].apply( jQuery(this), arguments );
-	},
 	addClass: function(c){
 		jQuery.className.add(this,c);
 	},