X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fmanipulation.js;h=d88400d1fd459b9212850d38530f6e886431c8c6;hb=7f5179b65431b77e89fa32623a5000e3630c191c;hp=21ab6afbc3c1f784d7dcdea6d5b30862c5f63390;hpb=1a26e41917300708d817e96ca2141a01c982c096;p=jquery.git

diff --git a/test/unit/manipulation.js b/test/unit/manipulation.js
index 21ab6af..d88400d 100644
--- a/test/unit/manipulation.js
+++ b/test/unit/manipulation.js
@@ -12,8 +12,44 @@ test("text()", function() {
 	equals( jQuery(document.createTextNode("foo")).text(), "foo", "Text node was retreived from .text()." );
 });
 
+var testText = function(valueObj) {
+	expect(4);
+	var val = valueObj("<div><b>Hello</b> cruel world!</div>");
+	equals( jQuery("#foo").text(val)[0].innerHTML.replace(/>/g, "&gt;"), "&lt;div&gt;&lt;b&gt;Hello&lt;/b&gt; cruel world!&lt;/div&gt;", "Check escaped text" );
+
+	// using contents will get comments regular, text, and comment nodes
+	var j = jQuery("#nonnodes").contents();
+	j.text(valueObj("hi!"));
+	equals( jQuery(j[0]).text(), "hi!", "Check node,textnode,comment with text()" );
+	equals( j[1].nodeValue, " there ", "Check node,textnode,comment with text()" );
+	equals( j[2].nodeType, 8, "Check node,textnode,comment with text()" );
+}
+
+test("text(String)", function() {
+	testText(bareObj)
+});
+
+test("text(Function)", function() {
+	testText(functionReturningObj);
+});
+
+test("text(Function) with incoming value", function() {
+	expect(2);
+	
+	var old = "This link has class=\"blog\": Simon Willison's Weblog";
+	
+	jQuery('#sap').text(function(i, val) {
+		equals( val, old, "Make sure the incoming value is correct." );
+		return "foobar";
+	});
+	
+	equals( jQuery("#sap").text(), "foobar", 'Check for merged text of more then one element.' );
+	
+	reset();
+});
+
 var testWrap = function(val) {
-	expect(15);
+	expect(18);
 	var defaultText = 'Try them out:'
 	var result = jQuery('#first').wrap(val( '<div class="red"><span></span></div>' )).text();
 	equals( defaultText, result, 'Check for wrapping of on-the-fly html' );
@@ -54,6 +90,20 @@ var testWrap = function(val) {
 	equals( j[0].parentNode.parentNode.childNodes.length, 1, "There should only be one element wrapping." );
 	equals( j.length, 1, "There should only be one element (no cloning)." );
 	equals( j[0].parentNode.nodeName.toUpperCase(), "P", "The span should be in the paragraph." );
+
+	// Wrap an element with a jQuery set
+	j = jQuery("<span/>").wrap(jQuery("<div></div>"));
+	equals( j[0].parentNode.nodeName.toLowerCase(), "div", "Wrapping works." );
+
+	// Wrap an element with a jQuery set and event
+	result = jQuery("<div></div>").click(function(){
+		ok(true, "Event triggered.");
+	});
+
+	j = jQuery("<span/>").wrap(result);
+	equals( j[0].parentNode.nodeName.toLowerCase(), "div", "Wrapping works." );
+
+	j.parent().trigger("click");
 }
 
 test("wrap(String|Element)", function() {
@@ -89,37 +139,43 @@ test("wrapAll(String|Element)", function() {
 	testWrapAll(bareObj);
 });
 
-// TODO: Figure out why each(wrapAll) is not equivalent to wrapAll
-// test("wrapAll(Function)", function() {
-// 	testWrapAll(functionReturningObj);
-// })
-
 var testWrapInner = function(val) {
-	expect(6);
+	expect(11);
 	var num = jQuery("#first").children().length;
-	var result = jQuery('#first').wrapInner('<div class="red"><div id="tmp"></div></div>');
+	var result = jQuery('#first').wrapInner(val('<div class="red"><div id="tmp"></div></div>'));
+	equals( jQuery("#first").children().length, 1, "Only one child" );
+	ok( jQuery("#first").children().is(".red"), "Verify Right Element" );
+	equals( jQuery("#first").children().children().children().length, num, "Verify Elements Intact" );
+
+	reset();
+	var num = jQuery("#first").html("foo<div>test</div><div>test2</div>").children().length;
+	var result = jQuery('#first').wrapInner(val('<div class="red"><div id="tmp"></div></div>'));
 	equals( jQuery("#first").children().length, 1, "Only one child" );
 	ok( jQuery("#first").children().is(".red"), "Verify Right Element" );
 	equals( jQuery("#first").children().children().children().length, num, "Verify Elements Intact" );
 
 	reset();
 	var num = jQuery("#first").children().length;
-	var result = jQuery('#first').wrapInner(document.getElementById('empty'));
+	var result = jQuery('#first').wrapInner(val(document.getElementById('empty')));
 	equals( jQuery("#first").children().length, 1, "Only one child" );
 	ok( jQuery("#first").children().is("#empty"), "Verify Right Element" );
 	equals( jQuery("#first").children().children().length, num, "Verify Elements Intact" );
+
+	var div = jQuery("<div/>");
+	div.wrapInner(val("<span></span>"));
+	equals(div.children().length, 1, "The contents were wrapped.");
+	equals(div.children()[0].nodeName.toLowerCase(), "span", "A span was inserted.");
 }
 
 test("wrapInner(String|Element)", function() {
 	testWrapInner(bareObj);
 });
 
-// TODO: wrapInner uses wrapAll -- get wrapAll working with Function
-// test("wrapInner(Function)", function() {
-// 	testWrapInner(functionReturningObj)
-// })
+test("wrapInner(Function)", function() {
+	testWrapInner(functionReturningObj)
+});
 
-var testUnwrap = function() {
+test("unwrap()", function() {
 	expect(9);
 
 	jQuery("body").append('  <div id="unwrap" style="display: none;"> <div id="unwrap1"> <span class="unwrap">a</span> <span class="unwrap">b</span> </div> <div id="unwrap2"> <span class="unwrap">c</span> <span class="unwrap">d</span> </div> <div id="unwrap3"> <b><span class="unwrap unwrap3">e</span></b> <b><span class="unwrap unwrap3">f</span></b> </div> </div>');
@@ -144,14 +200,10 @@ var testUnwrap = function() {
 	same( jQuery('body > span.unwrap').get(), abcdef, 'body contains 6 .unwrap child spans' );
 
 	jQuery('body > span.unwrap').remove();
-}
-
-test("unwrap()", function() {
-	testUnwrap();
 });
 
 var testAppend = function(valueObj) {
-	expect(21);
+	expect(37);
 	var defaultText = 'Try them out:'
 	var result = jQuery('#first').append(valueObj('<b>buga</b>'));
 	equals( result.text(), defaultText + 'buga', 'Check if text appending works' );
@@ -184,6 +236,24 @@ var testAppend = function(valueObj) {
 	ok( jQuery("#sap").append(valueObj( [] )), "Check for appending an empty array." );
 	ok( jQuery("#sap").append(valueObj( "" )), "Check for appending an empty string." );
 	ok( jQuery("#sap").append(valueObj( document.getElementsByTagName("foo") )), "Check for appending an empty nodelist." );
+	
+	reset();
+	jQuery("form").append(valueObj('<input name="radiotest" type="radio" checked="checked" />'));
+	jQuery("form input[name=radiotest]").each(function(){
+		ok( jQuery(this).is(':checked'), "Append checked radio");
+	}).remove();
+
+	reset();
+	jQuery("form").append(valueObj('<input name="radiotest" type="radio" checked    =   \'checked\' />'));
+	jQuery("form input[name=radiotest]").each(function(){
+		ok( jQuery(this).is(':checked'), "Append alternately formated checked radio");
+	}).remove();
+
+	reset();
+	jQuery("form").append(valueObj('<input name="radiotest" type="radio" checked />'));
+	jQuery("form input[name=radiotest]").each(function(){
+		ok( jQuery(this).is(':checked'), "Append HTML5-formated checked radio");
+	}).remove();
 
 	reset();
 	jQuery("#sap").append(valueObj( document.getElementById('form') ));
@@ -224,6 +294,8 @@ var testAppend = function(valueObj) {
 
 	t( "Append Select", "#appendSelect1, #appendSelect2", ["appendSelect1", "appendSelect2"] );
 
+	equals( "Two nodes", jQuery('<div />').append("Two", " nodes").text(), "Appending two text nodes (#4011)" );
+
 	// using contents will get comments regular, text, and comment nodes
 	var j = jQuery("#nonnodes").contents();
 	var d = jQuery("<div/>").appendTo("#nonnodes").append(j);
@@ -235,15 +307,77 @@ var testAppend = function(valueObj) {
 }
 
 test("append(String|Element|Array&lt;Element&gt;|jQuery)", function() {
-  testAppend(bareObj);
+	testAppend(bareObj);
 });
 
 test("append(Function)", function() {
 	testAppend(functionReturningObj);
-})
+});
 
-test("appendTo(String|Element|Array&lt;Element&gt;|jQuery)", function() {
+test("append(Function) with incoming value", function() {
 	expect(12);
+	
+	var defaultText = 'Try them out:', old = jQuery("#first").html();
+	
+	var result = jQuery('#first').append(function(i, val){
+		equals( val, old, "Make sure the incoming value is correct." );
+		return '<b>buga</b>';
+	});
+	equals( result.text(), defaultText + 'buga', 'Check if text appending works' );
+	
+	var select = jQuery('#select3');
+	old = select.html();
+	
+	equals( select.append(function(i, val){
+		equals( val, old, "Make sure the incoming value is correct." );
+		return '<option value="appendTest">Append Test</option>';
+	}).find('option:last-child').attr('value'), 'appendTest', 'Appending html options to select element');
+
+	reset();
+	var expected = "This link has class=\"blog\": Simon Willison's WeblogTry them out:";
+	old = jQuery("#sap").html();
+	
+	jQuery('#sap').append(function(i, val){
+		equals( val, old, "Make sure the incoming value is correct." );
+		return document.getElementById('first');
+	});
+	equals( expected, jQuery('#sap').text(), "Check for appending of element" );
+
+	reset();
+	expected = "This link has class=\"blog\": Simon Willison's WeblogTry them out:Yahoo";
+	old = jQuery("#sap").html();
+	
+	jQuery('#sap').append(function(i, val){
+		equals( val, old, "Make sure the incoming value is correct." );
+		return [document.getElementById('first'), document.getElementById('yahoo')];
+	});
+	equals( expected, jQuery('#sap').text(), "Check for appending of array of elements" );
+
+	reset();
+	expected = "This link has class=\"blog\": Simon Willison's WeblogYahooTry them out:";
+	old = jQuery("#sap").html();
+	
+	jQuery('#sap').append(function(i, val){
+		equals( val, old, "Make sure the incoming value is correct." );
+		return jQuery("#first, #yahoo");
+	});
+	equals( expected, jQuery('#sap').text(), "Check for appending of jQuery object" );
+
+	reset();
+	old = jQuery("#sap").html();
+	
+	jQuery("#sap").append(function(i, val){
+		equals( val, old, "Make sure the incoming value is correct." );
+		return 5;
+	});
+	ok( jQuery("#sap")[0].innerHTML.match( /5$/ ), "Check for appending a number" );	
+	
+	reset();
+});
+
+test("appendTo(String|Element|Array&lt;Element&gt;|jQuery)", function() {
+	expect(14);
+
 	var defaultText = 'Try them out:'
 	jQuery('<b>buga</b>').appendTo('#first');
 	equals( jQuery("#first").text(), defaultText + 'buga', 'Check if text appending works' );
@@ -291,6 +425,20 @@ test("appendTo(String|Element|Array&lt;Element&gt;|jQuery)", function() {
 	ok( jQuery("#moretests div:last").hasClass("test"), "appendTo element was modified after the insertion" );
 
 	reset();
+
+	div = jQuery("<div/>");
+	jQuery("<span>a</span><b>b</b>").filter("span").appendTo( div );
+
+	equals( div.children().length, 1, "Make sure the right number of children were inserted." );
+
+	div = jQuery("#moretests div");
+
+	var num = jQuery("#main div").length;
+	div.remove().appendTo("#main");
+
+	equals( jQuery("#main div").length, num, "Make sure all the removed divs were inserted." );
+
+	reset();
 });
 
 var testPrepend = function(val) {
@@ -314,7 +462,7 @@ var testPrepend = function(val) {
 	expected = "YahooTry them out:This link has class=\"blog\": Simon Willison's Weblog";
 	jQuery('#sap').prepend(val( jQuery("#first, #yahoo") ));
 	equals( expected, jQuery('#sap').text(), "Check for prepending of jQuery object" );
-}
+};
 
 test("prepend(String|Element|Array&lt;Element&gt;|jQuery)", function() {
 	testPrepend(bareObj);
@@ -322,7 +470,58 @@ test("prepend(String|Element|Array&lt;Element&gt;|jQuery)", function() {
 
 test("prepend(Function)", function() {
 	testPrepend(functionReturningObj);
-})
+});
+
+test("prepend(Function) with incoming value", function() {
+	expect(10);
+	
+	var defaultText = 'Try them out:', old = jQuery('#first').html();
+	var result = jQuery('#first').prepend(function(i, val) {
+		equals( val, old, "Make sure the incoming value is correct." );
+		return '<b>buga</b>';
+	});
+	equals( result.text(), 'buga' + defaultText, 'Check if text prepending works' );
+	
+	old = jQuery("#select3").html();
+	
+	equals( jQuery('#select3').prepend(function(i, val) {
+		equals( val, old, "Make sure the incoming value is correct." );
+		return '<option value="prependTest">Prepend Test</option>';
+	}).find('option:first-child').attr('value'), 'prependTest', 'Prepending html options to select element');
+
+	reset();
+	var expected = "Try them out:This link has class=\"blog\": Simon Willison's Weblog";
+	old = jQuery('#sap').html();
+	
+	jQuery('#sap').prepend(function(i, val) {
+		equals( val, old, "Make sure the incoming value is correct." );
+		return document.getElementById('first');
+	});
+	
+	equals( expected, jQuery('#sap').text(), "Check for prepending of element" );
+
+	reset();
+	expected = "Try them out:YahooThis link has class=\"blog\": Simon Willison's Weblog";
+	old = jQuery('#sap').html();
+	
+	jQuery('#sap').prepend(function(i, val) {
+		equals( val, old, "Make sure the incoming value is correct." );
+		return [document.getElementById('first'), document.getElementById('yahoo')];
+	});
+	
+	equals( expected, jQuery('#sap').text(), "Check for prepending of array of elements" );
+
+	reset();
+	expected = "YahooTry them out:This link has class=\"blog\": Simon Willison's Weblog";
+	old = jQuery('#sap').html();
+	
+	jQuery('#sap').prepend(function(i, val) {
+		equals( val, old, "Make sure the incoming value is correct." );
+		return jQuery("#first, #yahoo");
+	});
+	
+	equals( expected, jQuery('#sap').text(), "Check for prepending of jQuery object" );	
+});
 
 test("prependTo(String|Element|Array&lt;Element&gt;|jQuery)", function() {
 	expect(6);
@@ -466,7 +665,7 @@ test("insertAfter(String|Element|Array&lt;Element&gt;|jQuery)", function() {
 });
 
 var testReplaceWith = function(val) {
-	expect(12);
+	expect(17);
 	jQuery('#yahoo').replaceWith(val( '<b id="replace">buga</b>' ));
 	ok( jQuery("#replace")[0], 'Replace element with string' );
 	ok( !jQuery("#yahoo")[0], 'Verify that original element is gone, after string' );
@@ -477,6 +676,12 @@ var testReplaceWith = function(val) {
 	ok( !jQuery("#yahoo")[0], 'Verify that original element is gone, after element' );
 
 	reset();
+	jQuery("#main").append('<div id="bar"><div id="baz">Foo</div></div>');
+	jQuery('#baz').replaceWith("Baz");
+	equals( jQuery("#bar").text(),"Baz", 'Replace element with text' );
+	ok( !jQuery("#baz")[0], 'Verify that original element is gone, after element' );
+
+	reset();
 	jQuery('#yahoo').replaceWith(val( [document.getElementById('first'), document.getElementById('mark')] ));
 	ok( jQuery("#first")[0], 'Replace element with array of elements' );
 	ok( jQuery("#mark")[0], 'Replace element with array of elements' );
@@ -488,9 +693,46 @@ var testReplaceWith = function(val) {
 	ok( jQuery("#mark")[0], 'Replace element with set of elements' );
 	ok( !jQuery("#yahoo")[0], 'Verify that original element is gone, after set of elements' );
 
+	reset();
+	var tmp = jQuery("<div/>").appendTo("body").click(function(){ ok(true, "Newly bound click run." ); });
+	var y = jQuery('<div/>').appendTo("body").click(function(){ ok(true, "Previously bound click run." ); });
+	var child = y.append("<b>test</b>").find("b").click(function(){ ok(true, "Child bound click run." ); return false; });
+
+	y.replaceWith( tmp );
+
+	tmp.click();
+	y.click(); // Shouldn't be run
+	child.click(); // Shouldn't be run
+
+	tmp.remove();
+	y.remove();
+	child.remove();
+
+	reset();
+
+	y = jQuery('<div/>').appendTo("body").click(function(){ ok(true, "Previously bound click run." ); });
+	var child2 = y.append("<u>test</u>").find("u").click(function(){ ok(true, "Child 2 bound click run." ); return false; });
+
+	y.replaceWith( child2 );
+
+	child2.click();
+
+	y.remove();
+	child2.remove();
+
+	reset();
+
 	var set = jQuery("<div/>").replaceWith(val("<span>test</span>"));
 	equals( set[0].nodeName.toLowerCase(), "span", "Replace the disconnected node." );
 	equals( set.length, 1, "Replace the disconnected node." );
+
+	var $div = jQuery("<div class='replacewith'></div>").appendTo("body");
+	// TODO: Work on jQuery(...) inline script execution
+	//$div.replaceWith("<div class='replacewith'></div><script>" +
+		//"equals(jQuery('.replacewith').length, 1, 'Check number of elements in page.');" +
+		//"</script>");
+	equals(jQuery('.replacewith').length, 1, 'Check number of elements in page.');
+	jQuery('.replacewith').remove();
 }
 
 test("replaceWith(String|Element|Array&lt;Element&gt;|jQuery)", function() {
@@ -499,7 +741,27 @@ test("replaceWith(String|Element|Array&lt;Element&gt;|jQuery)", function() {
 
 test("replaceWith(Function)", function() {
 	testReplaceWith(functionReturningObj);
-})
+
+	expect(18);
+
+	var y = jQuery("#yahoo")[0];
+
+	jQuery(y).replaceWith(function(){
+		equals( this, y, "Make sure the context is coming in correctly." );
+	});
+
+	reset();
+});
+
+test("replaceWith(string) for more than one element", function(){
+	expect(3);
+
+	equals(jQuery('#foo p').length, 3, 'ensuring that test data has not changed');
+
+	jQuery('#foo p').replaceWith('<span>bar</span>');
+	equals(jQuery('#foo span').length, 3, 'verify that all the three original element have been replaced');
+	equals(jQuery('#foo p').length, 0, 'verify that all the three original element have been replaced');
+});
 
 test("replaceAll(String|Element|Array&lt;Element&gt;|jQuery)", function() {
 	expect(10);
@@ -526,7 +788,7 @@ test("replaceAll(String|Element|Array&lt;Element&gt;|jQuery)", function() {
 });
 
 test("clone()", function() {
-	expect(28);
+	expect(31);
 	equals( 'This is a normal link: Yahoo', jQuery('#en').text(), 'Assert text for #en' );
 	var clone = jQuery('#yahoo').clone();
 	equals( 'Try them out:Yahoo', jQuery('#first').append(clone).text(), 'Check for clone' );
@@ -571,6 +833,19 @@ test("clone()", function() {
 	div = div.clone(true);
 	equals( div.length, 1, "One element cloned" );
 	equals( div[0].nodeName.toUpperCase(), "DIV", "DIV element cloned" );
+
+	div = jQuery("<div/>").data({ a: true, b: true });
+	div = div.clone(true);
+	equals( div.data("a"), true, "Data cloned." );
+	equals( div.data("b"), true, "Data cloned." );
+
+	var form = document.createElement("form");
+	form.action = "/test/";
+	var div = document.createElement("div");
+	div.appendChild( document.createTextNode("test") );
+	form.appendChild( div );
+
+	equals( jQuery(form).clone().children().length, 1, "Make sure we just get the form back." );
 });
 
 if (!isLocal) {
@@ -590,65 +865,8 @@ test("clone() on XML nodes", function() {
 });
 }
 
-test("val()", function() {
-	expect(9);
-
-	document.getElementById('text1').value = "bla";
-	equals( jQuery("#text1").val(), "bla", "Check for modified value of input element" );
-
-	reset();
-
-	equals( jQuery("#text1").val(), "Test", "Check for value of input element" );
-	// ticket #1714 this caused a JS error in IE
-	equals( jQuery("#first").val(), "", "Check a paragraph element to see if it has a value" );
-	ok( jQuery([]).val() === undefined, "Check an empty jQuery object will return undefined from val" );
-
-	equals( jQuery('#select2').val(), '3', 'Call val() on a single="single" select' );
-
-	same( jQuery('#select3').val(), ['1', '2'], 'Call val() on a multiple="multiple" select' );
-
-	equals( jQuery('#option3c').val(), '2', 'Call val() on a option element with value' );
-
-	equals( jQuery('#option3a').val(), '', 'Call val() on a option element with empty value' );
-
-	equals( jQuery('#option3e').val(), 'no value', 'Call val() on a option element with no value attribute' );
-
-});
-
-var testVal = function(valueObj) {
-	expect(5);
-
-	jQuery("#text1").val(valueObj( 'test' ));
-	equals( document.getElementById('text1').value, "test", "Check for modified (via val(String)) value of input element" );
-
-	jQuery("#text1").val(valueObj( 67 ));
-	equals( document.getElementById('text1').value, "67", "Check for modified (via val(Number)) value of input element" );
-
-	jQuery("#select1").val(valueObj( "3" ));
-	equals( jQuery("#select1").val(), "3", "Check for modified (via val(String)) value of select element" );
-
-	jQuery("#select1").val(valueObj( 2 ));
-	equals( jQuery("#select1").val(), "2", "Check for modified (via val(Number)) value of select element" );
-
-	// using contents will get comments regular, text, and comment nodes
-	var j = jQuery("#nonnodes").contents();
-	j.val(valueObj( "asdf" ));
-	equals( j.val(), "asdf", "Check node,textnode,comment with val()" );
-	j.removeAttr("value");
-}
-
-test("val(String/Number)", function() {
-	testVal(bareObj);
-});
-
-test("val(Function)", function() {
-	testVal(functionReturningObj);
-})
-
 var testHtml = function(valueObj) {
-	expect(20);
-
-	window.debug = true;
+	expect(31);
 
 	jQuery.scriptorder = 0;
 
@@ -660,7 +878,19 @@ var testHtml = function(valueObj) {
 	}
 	ok( pass, "Set HTML" );
 
-	delete window.debug;
+	div = jQuery("<div/>").html( valueObj('<div id="parent_1"><div id="child_1"/></div><div id="parent_2"/>') );
+
+	equals( div.children().length, 2, "Make sure two child nodes exist." );
+	equals( div.children().children().length, 1, "Make sure that a grandchild exists." );
+
+	var space = jQuery("<div/>").html(valueObj("&#160;"))[0].innerHTML;
+	ok( /^\s$|^&nbsp;$/.test( space ), "Make sure entities are passed through correctly." );
+	equals( jQuery("<div/>").html(valueObj("&amp;"))[0].innerHTML, "&amp;", "Make sure entities are passed through correctly." );
+
+	jQuery("#main").html(valueObj("<style>.foobar{color:green;}</style>"));
+
+	equals( jQuery("#main").children().length, 1, "Make sure there is a child element." );
+	equals( jQuery("#main").children()[0].nodeName.toUpperCase(), "STYLE", "And that a style element was inserted." );
 
 	reset();
 	// using contents will get comments regular, text, and comment nodes
@@ -680,25 +910,28 @@ var testHtml = function(valueObj) {
 	equals( $div.html(valueObj( 0 )).html(), '0', 'Setting a zero as html' );
 
 	var $div2 = jQuery('<div/>'), insert = "&lt;div&gt;hello1&lt;/div&gt;";
-	equals( $div2.html(insert).html(), insert, "Verify escaped insertion." );
-	equals( $div2.html("x" + insert).html(), "x" + insert, "Verify escaped insertion." );
-	equals( $div2.html(" " + insert).html(), " " + insert, "Verify escaped insertion." );
+	equals( $div2.html(insert).html().replace(/>/g, "&gt;"), insert, "Verify escaped insertion." );
+	equals( $div2.html("x" + insert).html().replace(/>/g, "&gt;"), "x" + insert, "Verify escaped insertion." );
+	equals( $div2.html(" " + insert).html().replace(/>/g, "&gt;"), " " + insert, "Verify escaped insertion." );
 
+	var map = jQuery("<map/>").html(valueObj("<area id='map01' shape='rect' coords='50,50,150,150' href='http://www.jquery.com/' alt='jQuery'>"));
+
+	equals( map[0].childNodes.length, 1, "The area was inserted." );
+	equals( map[0].firstChild.nodeName.toLowerCase(), "area", "The area was inserted." );
 
 	reset();
 
 	jQuery("#main").html(valueObj('<script type="something/else">ok( false, "Non-script evaluated." );</script><script type="text/javascript">ok( true, "text/javascript is evaluated." );</script><script>ok( true, "No type is evaluated." );</script><div><script type="text/javascript">ok( true, "Inner text/javascript is evaluated." );</script><script>ok( true, "Inner No type is evaluated." );</script><script type="something/else">ok( false, "Non-script evaluated." );</script></div>'));
 
-	stop();
+	jQuery("#main").html(valueObj("<script>ok( true, 'Test repeated injection of script.' );</script>"));
+	jQuery("#main").html(valueObj("<script>ok( true, 'Test repeated injection of script.' );</script>"));
+	jQuery("#main").html(valueObj("<script>ok( true, 'Test repeated injection of script.' );</script>"));
 
 	jQuery("#main").html(valueObj('<script type="text/javascript">ok( true, "jQuery().html().evalScripts() Evals Scripts Twice in Firefox, see #975 (1)" );</script>'));
 
 	jQuery("#main").html(valueObj('foo <form><script type="text/javascript">ok( true, "jQuery().html().evalScripts() Evals Scripts Twice in Firefox, see #975 (2)" );</script></form>'));
 
-	// it was decided that waiting to execute ALL scripts makes sense since nested ones have to wait anyway so this test case is changed, see #1959
 	jQuery("#main").html(valueObj("<script>equals(jQuery.scriptorder++, 0, 'Script is executed in order');equals(jQuery('#scriptorder').length, 1,'Execute after html (even though appears before)')<\/script><span id='scriptorder'><script>equals(jQuery.scriptorder++, 1, 'Script (nested) is executed in order');equals(jQuery('#scriptorder').length, 1,'Execute after html')<\/script></span><script>equals(jQuery.scriptorder++, 2, 'Script (unnested) is executed in order');equals(jQuery('#scriptorder').length, 1,'Execute after html')<\/script>"));
-
-	setTimeout( start, 100 );
 }
 
 test("html(String)", function() {
@@ -707,28 +940,68 @@ test("html(String)", function() {
 
 test("html(Function)", function() {
 	testHtml(functionReturningObj);
-})
+});
 
-var testText = function(valueObj) {
-	expect(4);
-	equals( jQuery("#foo").text("<div><b>Hello</b> cruel world!</div>")[0].innerHTML.replace(/>/g, "&gt;"), "&lt;div&gt;&lt;b&gt;Hello&lt;/b&gt; cruel world!&lt;/div&gt;", "Check escaped text" );
+test("html(Function) with incoming value", function() {
+	expect(20);
+	
+	var div = jQuery("#main > div"), old = div.map(function(){ return jQuery(this).html() });
+	
+	div.html(function(i, val) {
+		equals( val, old[i], "Make sure the incoming value is correct." );
+		return "<b>test</b>";
+	});
+	
+	var pass = true;
+	div.each(function(){
+		if ( this.childNodes.length !== 1 ) {
+			pass = false;
+		}
+	})
+	ok( pass, "Set HTML" );
 
+	reset();
 	// using contents will get comments regular, text, and comment nodes
 	var j = jQuery("#nonnodes").contents();
-	j.text("hi!");
-	equals( jQuery(j[0]).text(), "hi!", "Check node,textnode,comment with text()" );
-	equals( j[1].nodeValue, " there ", "Check node,textnode,comment with text()" );
-	equals( j[2].nodeType, 8, "Check node,textnode,comment with text()" );
-}
+	old = j.map(function(){ return jQuery(this).html(); });
+	
+	j.html(function(i, val) {
+		equals( val, old[i], "Make sure the incoming value is correct." );
+		return "<b>bold</b>";
+	});
+	
+	j.find('b').removeData();
+	equals( j.html().replace(/ xmlns="[^"]+"/g, "").toLowerCase(), "<b>bold</b>", "Check node,textnode,comment with html()" );
+	
+	var $div = jQuery('<div />');
+	
+	equals( $div.html(function(i, val) {
+		equals( val, "", "Make sure the incoming value is correct." );
+		return 5;
+	}).html(), '5', 'Setting a number as html' );
+	
+	equals( $div.html(function(i, val) {
+		equals( val, "5", "Make sure the incoming value is correct." );
+		return 0;
+	}).html(), '0', 'Setting a zero as html' );
 
-test("text(String)", function() {
-	testText(bareObj)
+	var $div2 = jQuery('<div/>'), insert = "&lt;div&gt;hello1&lt;/div&gt;";
+	equals( $div2.html(function(i, val) {
+		equals( val, "", "Make sure the incoming value is correct." );
+		return insert;
+	}).html().replace(/>/g, "&gt;"), insert, "Verify escaped insertion." );
+	
+	equals( $div2.html(function(i, val) {
+		equals( val.replace(/>/g, "&gt;"), insert, "Make sure the incoming value is correct." );
+		return "x" + insert;
+	}).html().replace(/>/g, "&gt;"), "x" + insert, "Verify escaped insertion." );
+	
+	equals( $div2.html(function(i, val) {
+		equals( val.replace(/>/g, "&gt;"), "x" + insert, "Make sure the incoming value is correct." );
+		return " " + insert;
+	}).html().replace(/>/g, "&gt;"), " " + insert, "Verify escaped insertion." );	
 });
 
-test("text(Function)", function() {
-	testText(functionReturningObj);
-})
-
 var testRemove = function(method) {
 	expect(9);
 
@@ -784,3 +1057,79 @@ test("empty()", function() {
 	equals( j.html(), "", "Check node,textnode,comment empty works" );
 });
 
+test("jQuery.cleanData", function() {
+	expect(14);
+	
+	var type, pos, div, child;
+	
+	type = "remove";
+	
+	// Should trigger 4 remove event
+	div = getDiv().remove();
+	
+	// Should both do nothing
+	pos = "Outer";
+	div.trigger("click");
+	
+	pos = "Inner";
+	div.children().trigger("click");
+	
+	type = "empty";
+	div = getDiv();
+	child = div.children();
+	
+	// Should trigger 2 remove event
+	div.empty();
+	
+	// Should trigger 1
+	pos = "Outer";
+	div.trigger("click");
+	
+	// Should do nothing
+	pos = "Inner";
+	child.trigger("click");
+
+	// Should trigger 2
+	div.remove();
+	
+	type = "html";
+	
+	div = getDiv();
+	child = div.children();
+	
+	// Should trigger 2 remove event
+	div.html("<div></div>");
+	
+	// Should trigger 1
+	pos = "Outer";
+	div.trigger("click");
+	
+	// Should do nothing
+	pos = "Inner";
+	child.trigger("click");
+
+	// Should trigger 2
+	div.remove();
+	
+	function getDiv() {
+		var div = jQuery("<div class='outer'><div class='inner'></div></div>").click(function(){
+			ok( true, type + " " + pos + " Click event fired." );
+		}).focus(function(){
+			ok( true, type + " " + pos + " Focus event fired." );
+		}).find("div").click(function(){
+			ok( false, type + " " + pos + " Click event fired." );
+		}).focus(function(){
+			ok( false, type + " " + pos + " Focus event fired." );
+		}).end().appendTo("body");
+		
+		div[0].detachEvent = div[0].removeEventListener = function(t){
+			ok( true, type + " Outer " + t + " event unbound" );
+		};
+		
+		div[0].firstChild.detachEvent = div[0].firstChild.removeEventListener = function(t){
+			ok( true, type + " Inner " + t + " event unbound" );
+		};
+		
+		return div;
+	}
+});