#4087 - insertAfter, insertBefore, etc do not work when destination is original element

src/core.js

@@ -497,8 +497,7 @@ jQuery.extend({
 		if ( scripts ) {
 			jQuery( scripts ).remove();
 		}
-		return jQuery.merge( [],
-			( parsed.cacheable ? jQuery.clone( parsed.fragment ) : parsed.fragment ).childNodes );
+		return jQuery.merge( [], parsed.childNodes );
 	},
 
 	parseJSON: function( data ) {

src/manipulation.js

@@ -22,7 +22,6 @@ var nodeNames = "abbr|article|aside|audio|bdi|canvas|data|datalist|details|figca
 	rtbody = /<tbody/i,
 	rhtml = /<|&#?\w+;/,
 	rnoInnerhtml = /<(?:script|style|link)/i,
-	rnocache = /<(?:script|style|object|embed|applet|option)/i,
 	manipulation_rcheckableType = /^(?:checkbox|radio)$/i,
 	// checked="checked" or checked
 	rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i,
@@ -256,35 +255,32 @@ jQuery.fn.extend({
 		// Make sure that the elements are removed from the DOM before they are inserted
 		// this can help fix replacing a parent with child elements
 		if ( !isFunc && typeof value !== "string" ) {
-			value = jQuery( value ).detach();
+			value = jQuery( value ).not( this ).detach();
 		}
 
-		this.each( function( i ) {
-			var next = this.nextSibling,
-				parent = this.parentNode,
-				// HTML argument replaced by "this" element
-				// 1. There were no supporting tests
-				// 2. There was no internal code relying on this
-				// 3. There was no documentation of an html argument
-				val = !isFunc ? value : value.call( this, i, this );
+		return this.domManip( [ value ], true, function( elem, i ) {
+			var next, parent;
 
 			if ( isDisconnected( this ) ) {
-				// for disconnected elements, we replace with the new content in the set. We use
-				// clone here to ensure that each replaced instance is unique
-				self[ i ] = jQuery( val ).clone()[ 0 ];
+				// for disconnected elements, we simply replace
+				// with the new content in the set
+				self[ i ] = elem;
 				return;
 			}
 
-			jQuery( this ).remove();
+			if ( this.nodeType === 1 || this.nodeType === 11 ) {
+				next = this.nextSibling;
+				parent = this.parentNode;
 
-			if ( next ) {
-				jQuery( next ).before( val );
-			} else {
-				jQuery( parent ).append( val );
+				jQuery( this ).remove();
+
+				if ( next ) {
+					next.parentNode.insertBefore( elem, next );
+				} else {
+					parent.appendChild( elem );
+				}
 			}
 		});
-
-		return this;
 	},
 
 	detach: function( selector ) {
@@ -314,8 +310,8 @@ jQuery.fn.extend({
 		}
 
 		if ( this[0] ) {
-			results = jQuery.buildFragment( args, this );
-			fragment = results.fragment;
+			results = jQuery.buildFragment( args, this, undefined, this );
+			fragment = results;
 			first = fragment.firstChild;
 
 			if ( fragment.childNodes.length === 1 ) {
@@ -329,9 +325,9 @@ jQuery.fn.extend({
 
 				// Use the original fragment for the last item instead of the first because it can end up
 				// being emptied incorrectly in certain situations (#8070).
-				// Fragments from the fragment cache must always be cloned and never used in place.
-				for ( iNoClone = results.cacheable || l - 1; i < l; i++ ) {
+				for ( iNoClone = l - 1; i < l; i++ ) {
 					node = fragment;
+
 					if ( i !== iNoClone ) {
 						node = jQuery.clone( node, true, true );
 
@@ -340,11 +336,13 @@ jQuery.fn.extend({
 							jQuery.merge( scripts, getAll( node, "script" ) );
 						}
 					}
+
 					callback.call(
 						table && jQuery.nodeName( this[i], "table" ) ?
 							findOrAppend( this[i], "tbody" ) :
 							this[i],
-						node
+						node,
+						i
 					);
 				}
 
@@ -514,9 +512,8 @@ function cloneFixAttributes( src, dest ) {
 	dest.removeAttribute( jQuery.expando );
 }
 
-jQuery.buildFragment = function( args, context, scripts ) {
-	var fragment, cacheable, cachehit,
-		first = args[ 0 ];
+jQuery.buildFragment = function( args, context, scripts, selection ) {
+	var fragment;
 
 	// Set context from what may come in as undefined or a jQuery collection or a node
 	// Updated to fix #12266 where accessing context[0] could throw an exception in IE9/10 &
@@ -525,38 +522,12 @@ jQuery.buildFragment = function( args, context, scripts ) {
 	context = !context.nodeType && context[0] || context;
 	context = context.ownerDocument || context;
 
-	// Only cache "small" (1/2 KB) HTML strings that are associated with the main document
-	// Cloning options loses the selected state, so don't cache them
-	// IE 6 doesn't like it when you put <object> or <embed> elements in a fragment
-	// Also, WebKit does not clone 'checked' attributes on cloneNode, so don't cache
-	// Lastly, IE6,7,8 will not correctly reuse cached fragments that were created from unknown elems #10501
-	if ( args.length === 1 && typeof first === "string" && first.length < 512 && context === document &&
-		first.charAt(0) === "<" && !rnocache.test( first ) &&
-		(jQuery.support.checkClone || !rchecked.test( first )) &&
-		(jQuery.support.html5Clone || !rnoshimcache.test( first )) ) {
-
-		// Mark cacheable and look for a hit
-		cacheable = true;
-		fragment = jQuery.fragments[ first ];
-		cachehit = fragment !== undefined;
-	}
-
-	if ( !fragment ) {
-		fragment = context.createDocumentFragment();
-		jQuery.clean( args, context, fragment, scripts );
+	fragment = context.createDocumentFragment();
+	jQuery.clean( args, context, fragment, scripts, selection );
 
-		// Update the cache, but only store false
-		// unless this is a second parsing of the same content
-		if ( cacheable ) {
-			jQuery.fragments[ first ] = cachehit && fragment;
-		}
-	}
-
-	return { fragment: fragment, cacheable: cacheable };
+	return fragment;
 };
 
-jQuery.fragments = {};
-
 jQuery.each({
 	appendTo: "append",
 	prependTo: "prepend",
@@ -683,7 +654,7 @@ jQuery.extend({
 		return clone;
 	},
 
-	clean: function( elems, context, fragment, scripts ) {
+	clean: function( elems, context, fragment, scripts, selection ) {
 		var elem, j, tmp, tag, wrap, tbody,
 			ret = [],
 			i = 0,
@@ -778,7 +749,11 @@ jQuery.extend({
 				safe = jQuery.contains( elem.ownerDocument, elem );
 
 				// Append to fragment
-				fragment.appendChild( elem );
+				// #4087 - If origin and destination elements are the same, and this is
+				// that element, do not append to fragment
+				if ( !( selection && jQuery.inArray( elem, selection ) !== -1 ) ) {
+					fragment.appendChild( elem );
+				}
 				tmp = getAll( elem, "script" );
 
 				// Preserve script evaluation history

test/.jshintrc

@@ -41,12 +41,15 @@
     "ajaxTest": true,
     "testIframe": true,
     "testIframeWithCallback": true,
+    "createComplexHTML": true,
     "createDashboardXML": true,
+    "createWithFriesXML": true,
     "createXMLFragment": true,
     "moduleTeardown": true,
+    "testBar": true,
     "testFoo": true,
-    "foobar": true,
     "url": true,
+    "service": true,
     "t": true,
     "q": true,
     "amdDefined": true,

test/data/ajax/echo/index.php

@@ -0,0 +1,43 @@
+<?php
+
+	$requestArray = "REQUEST";
+
+	if ( isset( $_REQUEST["requestArray"] ) ) {
+		$requestArray = $_REQUEST["requestArray"];
+	}
+
+	$requestArray =& ${"_$requestArray"};
+
+	$response = array(
+		"status" => "200",
+		"statusText" => "",
+		"contentType" => "text/plain",
+		"content" => "",
+		"callback" => "",
+		"delay" => 0
+	);
+
+	foreach( $response as $field => &$value ) {
+		if ( isset( $requestArray[ $field ] ) ) {
+			$value = $requestArray[ $field ];
+		}
+	}
+
+	if ( is_array( $response["content"] ) ) {
+		$response["content"] = http_build_query( $response["content"] );
+	}
+
+	if ( !$response["callback"] && preg_match( '/index.php\/([^\/\?&]+)/', $_SERVER["REQUEST_URI"], $match ) ) {
+		$response["callback"] = $match[ 1 ];
+	}
+
+	header("HTTP/1.1 $response[status] $response[statusText]");
+	header("Content-Type: $response[contentType]");
+
+	if ( $response["delay"] ) {
+		sleep( $response["delay"] );
+	}
+
+	echo $response["callback"]
+		? "$response[callback](" . json_encode("$response[content]") . ");"
+		: "$response[content]";

test/data/ajax/headers/cache/index.php

@@ -0,0 +1,30 @@
+<?php
+$headers = array(
+
+	"If-Modified-Since" => array(
+		"request" => "HTTP_IF_MODIFIED_SINCE",
+		"response" => "Last-Modified",
+	),
+	"If-None-Match" => array(
+		"request" => "HTTP_IF_NONE_MATCH",
+		"response" => "Etag",
+	),	
+
+);
+
+$header = $_REQUEST["header"];
+$value = $_REQUEST["value"];
+
+if ( $header === "If-None-Match" ) {
+	$value = md5( $value );
+}
+
+$headers = $headers[ $header ];
+
+$requestHeader = isset( $_SERVER[ $headers["request"] ] ) ? stripslashes($_SERVER[ $headers["request"] ]) : false;
+if ( $requestHeader === $value ) {
+	header("HTTP/1.0 304 Not Modified");
+} else {
+	header("$headers[response]: $value");
+	echo $requestHeader ? "OK: $value": "FAIL";
+}

test/data/ajax/headers/request/index.php

@@ -0,0 +1,12 @@
+<?php
+
+$headers = array();
+
+foreach( $_SERVER as $key => $value ) {
+	$key = str_replace( "_" , "-" , substr($key,0,5) == "HTTP_" ? substr($key,5) : $key );
+	$headers[ $key ] = $value;
+}
+
+foreach( explode( "," , $_GET["headers"] ) as $key ) {
+	echo "$key: " . @$headers[ strtoupper( $key ) ] . "\n";
+}

test/data/ajax/headers/response/index.php

@@ -0,0 +1,5 @@
+<?php
+
+foreach( $_REQUEST as $header => $value ) {
+	@header("$header: $value");
+}