Commit a37ca9e9 authored by John Resig's avatar John Resig

Made sure that .remove now uses multiFilter. Fixes bug #4205.

parent db62240f
......@@ -1224,7 +1224,7 @@ jQuery.each({
},
remove: function( selector ) {
if ( !selector || jQuery.filter( selector, [ this ] ).length ) {
if ( !selector || jQuery.multiFilter( selector, [ this ] ).length ) {
// Prevent memory leaks
jQuery( "*", this ).add([this]).each(function(){
jQuery.event.remove(this);
......
......@@ -1713,7 +1713,7 @@ test("jQuery.className", function() {
});
test("remove()", function() {
expect(6);
expect(7);
jQuery("#ap").children().remove();
ok( jQuery("#ap").text().length > 10, "Check text is not removed" );
equals( jQuery("#ap").children().length, 0, "Check remove" );
......@@ -1723,6 +1723,9 @@ test("remove()", function() {
ok( jQuery("#ap").text().length > 10, "Check text is not removed" );
equals( jQuery("#ap").children().length, 1, "Check filtered remove" );
jQuery("#ap").children().remove("a, code");
equals( jQuery("#ap").children().length, 0, "Check multi-filtered remove" );
// using contents will get comments regular, text, and comment nodes
equals( jQuery("#nonnodes").contents().length, 3, "Check node,textnode,comment remove works" );
jQuery("#nonnodes").contents().remove();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment