X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fmanipulation.js;h=cfb9c9d61c4d0dbc2ff2a4b8fd2561a827e6a1c2;hb=5dc6b7ce3469eaadb37a151d449e8d36571d1894;hp=eea377b7eb6c5f20e5fa05883c30220d42ecd45f;hpb=bbffc99f7c60d42d4286786dfd6a43aa31d62ae2;p=jquery.git

diff --git a/src/manipulation.js b/src/manipulation.js
index eea377b..cfb9c9d 100644
--- a/src/manipulation.js
+++ b/src/manipulation.js
@@ -1,10 +1,10 @@
 var rinlinejQuery = / jQuery\d+="(?:\d+|null)"/g,
 	rleadingWhitespace = /^\s+/,
 	rxhtmlTag = /(<([\w:]+)[^>]*?)\/>/g,
-	rselfClosing = /^(?:abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i,
+	rselfClosing = /^(?:area|br|col|embed|hr|img|input|link|meta|param)$/i,
 	rtagName = /<([\w:]+)/,
 	rtbody = /<tbody/i,
-	rhtml = /</,
+	rhtml = /<|&\w+;/,
 	fcloseTag = function(all, front, tag){
 		return rselfClosing.test(tag) ?
 			all :
@@ -17,6 +17,7 @@ var rinlinejQuery = / jQuery\d+="(?:\d+|null)"/g,
 		tr: [ 2, "<table><tbody>", "</tbody></table>" ],
 		td: [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ],
 		col: [ 2, "<table><tbody></tbody><colgroup>", "</colgroup></table>" ],
+		area: [ 1, "<map>", "</map>" ],
 		_default: [ 0, "", "" ]
 	};
 
@@ -31,22 +32,17 @@ if ( !jQuery.support.htmlSerialize ) {
 
 jQuery.fn.extend({
 	text: function( text ) {
-		if ( typeof text !== "object" && text !== undefined )
-			return this.empty().append( (this[0] && this[0].ownerDocument || document).createTextNode( text ) );
-
-		var ret = "";
-
-		jQuery.each( text || this, function(){
-			jQuery.each( this.childNodes, function(){
-				if ( this.nodeType !== 8 ) {
-					ret += this.nodeType !== 1 ?
-						this.nodeValue :
-						jQuery.fn.text( [ this ] );
-				}
+		if(jQuery.isFunction(text)) {
+			return this.each(function() {
+				return jQuery(this).text( text.call(this) );
 			});
-		});
+		}
 
-		return ret;
+		if ( typeof text !== "object" && text !== undefined ) {
+			return this.empty().append( (this[0] && this[0].ownerDocument || document).createTextNode( text ) );
+		}
+
+		return jQuery.getText( this );
 	},
 
 	wrapAll: function( html ) {
@@ -58,7 +54,7 @@ jQuery.fn.extend({
 
 		if ( this[0] ) {
 			// The elements to wrap the target around
-			var wrap = jQuery( html, this[0].ownerDocument ).eq(0).clone();
+			var wrap = jQuery( html, this[0].ownerDocument ).eq(0).clone(true);
 
 			if ( this[0].parentNode ) {
 				wrap.insertBefore( this[0] );
@@ -97,7 +93,7 @@ jQuery.fn.extend({
 			}
 		}).end();
 	},
-	
+
 	append: function() {
 		return this.domManip(arguments, true, function(elem){
 			if ( this.nodeType === 1 ) {
@@ -166,21 +162,8 @@ jQuery.fn.extend({
 
 		// Copy the events from the original to the clone
 		if ( events === true ) {
-			var orig = this.find("*").andSelf(), i = 0;
-
-			ret.find("*").andSelf().each(function(){
-				if ( this.nodeName !== orig[i].nodeName ) { return; }
-
-				var events = jQuery.data( orig[i], "events" );
-
-				for ( var type in events ) {
-					for ( var handler in events[ type ] ) {
-						jQuery.event.add( this, type, events[ type ][ handler ], events[ type ][ handler ].data );
-					}
-				}
-
-				i++;
-			});
+			cloneCopyEvent( this, ret );
+			cloneCopyEvent( this.find("*"), ret.find("*") );
 		}
 
 		// Return the cloned set
@@ -195,7 +178,7 @@ jQuery.fn.extend({
 
 		// See if we can take a shortcut and just use innerHTML
 		} else if ( typeof value === "string" && !/<script/i.test( value ) &&
-			(!jQuery.support.leadingWhitespace || !rleadingWhitespace.test( value )) &&
+			(jQuery.support.leadingWhitespace || !rleadingWhitespace.test( value )) &&
 			!wrapMap[ (rtagName.exec( value ) || ["", ""])[1].toLowerCase() ] ) {
 
 			try {
@@ -221,7 +204,17 @@ jQuery.fn.extend({
 
 	replaceWith: function( value ) {
 		if ( this[0] && this[0].parentNode ) {
-			return this.after( value ).remove();
+			return this.each(function(){
+				var next = this.nextSibling, parent = this.parentNode;
+
+				jQuery(this).remove();
+
+				if ( next ) {
+					jQuery(next).before( value );
+				} else {
+					jQuery(parent).append( value );
+				}
+			});
 		} else {
 			return this.pushStack( jQuery(jQuery.isFunction(value) ? value() : value), "replaceWith", value );
 		}
@@ -282,6 +275,18 @@ jQuery.fn.extend({
 	}
 });
 
+function cloneCopyEvent(orig, ret) {
+	var i = 0;
+
+	ret.each(function(){
+		if ( this.nodeName !== (orig[i] && orig[i].nodeName) ) {
+			return;
+		}
+
+		jQuery.data( this, jQuery.data( orig[i++] ) );
+	});
+}
+
 function buildFragment(args, nodes, scripts){
 	var fragment, cacheable, cached, cacheresults, doc;
 
@@ -371,7 +376,7 @@ jQuery.extend({
 			context = context.ownerDocument || context[0] && context[0].ownerDocument || document;
 		}
 
-		var ret = [], div = context.createElement("div");
+		var ret = [];
 
 		jQuery.each(elems, function(i, elem){
 			if ( typeof elem === "number" ) {
@@ -391,7 +396,8 @@ jQuery.extend({
 				// Trim whitespace, otherwise indexOf won't work as expected
 				var tag = (rtagName.exec( elem ) || ["", ""])[1].toLowerCase(),
 					wrap = wrapMap[ tag ] || wrapMap._default,
-					depth = wrap[0];
+					depth = wrap[0],
+					div = context.createElement("div");
 
 				// Go to html and back, then peel off extra wrappers
 				div.innerHTML = wrap[1] + elem + wrap[2];
@@ -457,7 +463,7 @@ jQuery.extend({
 
 function cleanData( elems ) {
 	for ( var i = 0, elem, id; (elem = elems[i]) != null; i++ ) {
-		if ( (id = elem[expando]) ) {
+		if ( !jQuery.noData[elem.nodeName.toLowerCase()] && (id = elem[expando]) ) {
 			delete jQuery.cache[ id ];
 		}
 	}