X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fmanipulation.js;h=16992aeb748336805f8f1681d3098c5167328dc1;hb=d24443fb55ddc6a309c08a9a248128fef269d2a3;hp=52becfefb37a5a7281da1147df2362ab06476d4b;hpb=36a98b95c2f3f7617ddf51beec7515acf67d98ba;p=jquery.git diff --git a/test/unit/manipulation.js b/test/unit/manipulation.js index 52becfe..16992ae 100644 --- a/test/unit/manipulation.js +++ b/test/unit/manipulation.js @@ -139,13 +139,8 @@ 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(8); var num = jQuery("#first").children().length; var result = jQuery('#first').wrapInner('
'); equals( jQuery("#first").children().length, 1, "Only one child" ); @@ -158,6 +153,11 @@ var testWrapInner = function(val) { 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.wrapInner(""); + 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() { @@ -626,7 +626,7 @@ test("insertAfter(String|Element|Array<Element>|jQuery)", function() { }); var testReplaceWith = function(val) { - expect(16); + expect(15); jQuery('#yahoo').replaceWith(val( 'buga' )); ok( jQuery("#replace")[0], 'Replace element with string' ); ok( !jQuery("#yahoo")[0], 'Verify that original element is gone, after string' ); @@ -650,10 +650,30 @@ var testReplaceWith = function(val) { reset(); var tmp = jQuery("
").appendTo("body").click(function(){ ok(true, "Newly bound click run." ); }); - var y = jQuery('#yahoo').click(function(){ ok(true, "Previously bound click run." ); }); + var y = jQuery('
').appendTo("body").click(function(){ ok(true, "Previously bound click run." ); }); + var child = y.append("test").find("b").click(function(){ ok(true, "Child bound click run." ); return false; }); + y.replaceWith( tmp ); + tmp.click(); - y.click(); + y.click(); // Shouldn't be run + child.click(); // Shouldn't be run + + tmp.remove(); + y.remove(); + child.remove(); + + reset(); + + y = jQuery('
').appendTo("body").click(function(){ ok(true, "Previously bound click run." ); }); + var child2 = y.append("test").find("u").click(function(){ ok(true, "Child 2 bound click run." ); return false; }); + + y.replaceWith( child2 ); + + child2.click(); + + y.remove(); + child2.remove(); reset(); @@ -662,9 +682,10 @@ var testReplaceWith = function(val) { equals( set.length, 1, "Replace the disconnected node." ); var $div = jQuery("
").appendTo("body"); - $div.replaceWith("
"); + // TODO: Work on jQuery(...) inline script execution + //$div.replaceWith("
"); equals(jQuery('.replacewith').length, 1, 'Check number of elements in page.'); jQuery('.replacewith').remove(); } @@ -772,7 +793,7 @@ test("clone() on XML nodes", function() { } var testHtml = function(valueObj) { - expect(22); + expect(24); jQuery.scriptorder = 0; @@ -784,6 +805,11 @@ var testHtml = function(valueObj) { } ok( pass, "Set HTML" ); + div = jQuery("
").html( valueObj('
') ); + + equals( div.children().length, 2, "Make sure two child nodes exist." ); + equals( div.children().children().length, 1, "Make sure that a grandchild exists." ); + reset(); // using contents will get comments regular, text, and comment nodes var j = jQuery("#nonnodes").contents(); @@ -802,9 +828,9 @@ var testHtml = function(valueObj) { equals( $div.html(valueObj( 0 )).html(), '0', 'Setting a zero as html' ); var $div2 = jQuery('
'), insert = "<div>hello1</div>"; - 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, ">"), insert, "Verify escaped insertion." ); + equals( $div2.html("x" + insert).html().replace(/>/g, ">"), "x" + insert, "Verify escaped insertion." ); + equals( $div2.html(" " + insert).html().replace(/>/g, ">"), " " + insert, "Verify escaped insertion." ); var map = jQuery("").html(valueObj("jQuery")); @@ -882,17 +908,17 @@ test("html(Function) with incoming value", function() { equals( $div2.html(function(i, val) { equals( val, "", "Make sure the incoming value is correct." ); return insert; - }).html(), insert, "Verify escaped insertion." ); + }).html().replace(/>/g, ">"), insert, "Verify escaped insertion." ); equals( $div2.html(function(i, val) { - equals( val, insert, "Make sure the incoming value is correct." ); + equals( val.replace(/>/g, ">"), insert, "Make sure the incoming value is correct." ); return "x" + insert; - }).html(), "x" + insert, "Verify escaped insertion." ); + }).html().replace(/>/g, ">"), "x" + insert, "Verify escaped insertion." ); equals( $div2.html(function(i, val) { - equals( val, "x" + insert, "Make sure the incoming value is correct." ); + equals( val.replace(/>/g, ">"), "x" + insert, "Make sure the incoming value is correct." ); return " " + insert; - }).html(), " " + insert, "Verify escaped insertion." ); + }).html().replace(/>/g, ">"), " " + insert, "Verify escaped insertion." ); }); var testRemove = function(method) { @@ -950,3 +976,73 @@ test("empty()", function() { equals( j.html(), "", "Check node,textnode,comment empty works" ); }); +test("jQuery.cleanData", function() { + expect(10); + + 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"); + + type = "html"; + + div = getDiv(); + child = div.children(); + + // Should trigger 2 remove event + div.html("
"); + + // Should trigger 1 + pos = "Outer"; + div.trigger("click"); + + // Should do nothing + pos = "Inner"; + child.trigger("click"); + + function getDiv() { + var div = jQuery("
").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; + } +});