X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fmanipulation.js;h=547acc184f3901442d538f244e3ea38de24ab0b7;hb=70b9aed422c34047299fe6e8934902fae61f2a3e;hp=4746dc83b1e70228a7d830c32b5781901399a538;hpb=173c1477ae6efc4c2eeb7131ba0646c4e1323975;p=jquery.git

diff --git a/src/manipulation.js b/src/manipulation.js
index 4746dc8..547acc1 100644
--- a/src/manipulation.js
+++ b/src/manipulation.js
@@ -4,6 +4,7 @@ var rinlinejQuery = / jQuery\d+="(?:\d+|null)"/g,
 	rselfClosing = /^(?:abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i,
 	rtagName = /<(\w+)/,
 	rtbody = /<tbody/i,
+	rhtml = /</,
 	fcloseTag = function(all, front, tag){
 		return rselfClosing.test(tag) ?
 			all :
@@ -110,12 +111,10 @@ jQuery.fn.extend({
 			return this.domManip(arguments, false, function(elem){
 				this.parentNode.insertBefore( elem, this );
 			});
-		} else {
-			var set = jQuery.isFunction(arguments[0]) ?
-				jQuery( arguments[0]() ) :
-				jQuery.apply(jQuery, arguments);
-
-			return this.pushStack( set.add( this ), "before", arguments );
+		} else if ( arguments.length ) {
+			var set = jQuery(arguments[0]);
+			set.push.apply( set, this.toArray() );
+			return this.pushStack( set, "before", arguments );
 		}
 	},
 
@@ -124,10 +123,10 @@ jQuery.fn.extend({
 			return this.domManip(arguments, false, function(elem){
 				this.parentNode.insertBefore( elem, this.nextSibling );
 			});
-		} else {
-			return jQuery.isFunction(arguments[0]) ?
-				this.add( arguments[0]() ) :
-				this.add.apply( this, arguments );
+		} else if ( arguments.length ) {
+			var set = this.pushStack( this, "after", arguments );
+			set.push.apply( set, jQuery(arguments[0]).toArray() );
+			return set;
 		}
 	},
 
@@ -188,15 +187,21 @@ 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 )) &&
 			!wrapMap[ (rtagName.exec( value ) || ["", ""])[1].toLowerCase() ] ) {
 
-			for ( var i = 0, l = this.length; i < l; i++ ) {
-				// Remove element nodes and prevent memory leaks
-				if ( this[i].nodeType === 1 ) {
-					cleanData( this[i].getElementsByTagName("*") );
+			try {
+				for ( var i = 0, l = this.length; i < l; i++ ) {
+					// Remove element nodes and prevent memory leaks
+					if ( this[i].nodeType === 1 ) {
+						cleanData( this[i].getElementsByTagName("*") );
+						this[i].innerHTML = value;
+					}
 				}
 
-				this[i].innerHTML = value;
+			// If using innerHTML throws an exception, use the fallback method
+			} catch(e) {
+				this.empty().append( value );
 			}
 
 		} else {
@@ -233,7 +238,7 @@ jQuery.fn.extend({
 			if ( args[0] && args[0].parentNode && args[0].parentNode.nodeType === 11 ) {
 				results = { fragment: args[0].parentNode };
 			} else {
-				results = buildFragment( args, this[0], scripts );
+				results = buildFragment( args, this, scripts );
 			}
 
 			first = results.fragment.firstChild;
@@ -368,7 +373,10 @@ jQuery.extend({
 			if ( !elem ) { return; }
 
 			// Convert html string into DOM nodes
-			if ( typeof elem === "string" ) {
+			if ( typeof elem === "string" && !rhtml.test( elem ) ) {
+				elem = context.createTextNode( elem );
+
+			} else if ( typeof elem === "string" ) {
 				// Fix "XHTML"-style tags in all browsers
 				elem = elem.replace(rxhtmlTag, fcloseTag);
 
@@ -440,9 +448,8 @@ jQuery.extend({
 });
 
 function cleanData( elems ) {
-	for ( var i = 0, l = elems.length; i < l; i++ ) {
-		var id = elems[i][expando];
-		if ( id ) {
+	for ( var i = 0, elem, id; (elem = elems[i]) != null; i++ ) {
+		if ( (id = elem[expando]) ) {
 			delete jQuery.cache[ id ];
 		}
 	}