Fixed problems with removing live events. Fixes #4894.

diff --git a/src/event.js b/src/event.js
index ac45e7e16568fdbaf886559064ad19b463ca1740..e070cb2619e1a6ab2474af5130ab7fc5c13e4f9c 100644 (file)
--- a/src/event.js
+++ b/src/event.js
@@ -872,9 +872,7 @@ function liveHandler( event ) {
 }
 
 function liveConvert( type, selector ) {
-       return ["live", type, selector//.replace(/[^\w\s\.]/g, function(ch){ return "\\"+ch})
-                                                                 .replace(/\./g, "`")
-                                                                 .replace(/ /g, "|")].join(".");
+       return ["live", type, selector.replace(/\./g, "`").replace(/ /g, "&")].join(".");
 }
 
 jQuery.each( ("blur focus load resize scroll unload click dblclick " +

diff --git a/test/unit/event.js b/test/unit/event.js
index 1ad7c3d0ca876b578d68a7746ef8fdfddae8a268..80a2e6a0b32576a8b7ffde47651a5674e58caba8 100644 (file)
--- a/test/unit/event.js
+++ b/test/unit/event.js
@@ -608,7 +608,7 @@ test("toggle(Function, Function, ...)", function() {
 });
 
 test(".live()/.die()", function() {
-       expect(58);
+       expect(61);
 
        var submit = 0, div = 0, livea = 0, liveb = 0;
 
@@ -818,6 +818,43 @@ test(".live()/.die()", function() {
        jQuery('span#liveSpan1 a').click();
        
        jQuery('span#liveSpan1').die('click');
+
+       // Work with deep selectors
+       livee = 0;
+
+       function clickB(){ livee++; }
+
+       jQuery("#nothiddendiv div").live("click", function(){ livee++; });
+       jQuery("#nothiddendiv div").live("click", clickB);
+       jQuery("#nothiddendiv div").live("mouseover", function(){ livee++; });
+
+       equals( livee, 0, "No clicks, deep selector." );
+
+       livee = 0;
+       jQuery("#nothiddendivchild").trigger("click");
+       equals( livee, 2, "Click, deep selector." );
+
+       livee = 0;
+       jQuery("#nothiddendivchild").trigger("mouseover");
+       equals( livee, 1, "Mouseover, deep selector." );
+
+       jQuery("#nothiddendiv div").die("mouseover");
+
+       livee = 0;
+       jQuery("#nothiddendivchild").trigger("click");
+       equals( livee, 2, "Click, deep selector." );
+
+       livee = 0;
+       jQuery("#nothiddendivchild").trigger("mouseover");
+       equals( livee, 0, "Mouseover, deep selector." );
+
+       jQuery("#nothiddendiv div").die("click", clickB);
+
+       livee = 0;
+       jQuery("#nothiddendivchild").trigger("click");
+       equals( livee, 1, "Click, deep selector." );
+
+       jQuery("#nothiddendiv div").die("click");
 });
 
 test("live with change", function(){