aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/core.js2
-rw-r--r--test/unit/core.js5
2 files changed, 5 insertions, 2 deletions
diff --git a/src/core.js b/src/core.js
index ba796bca9..65960e292 100644
--- a/src/core.js
+++ b/src/core.js
@@ -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);
diff --git a/test/unit/core.js b/test/unit/core.js
index 69a067656..9d91c4f75 100644
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -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();