Make sure that unbinding on a plain javascript object works correctly. Fixes #6184.

[jquery.git] / test / unit / event.js

diff --git a/test/unit/event.js b/test/unit/event.js
index 21167c7..a220ebf 100644 (file)
--- a/test/unit/event.js
+++ b/test/unit/event.js
@@ -72,7 +72,7 @@ test("bind(), multiple events at once and namespaces", function() {
 });
 
 test("bind(), namespace with special add", function() {
-       expect(19);
+       expect(24);
 
        var div = jQuery("<div/>").bind("test", function(e) {
                ok( true, "Test event fired." );
@@ -97,7 +97,9 @@ test("bind(), namespace with special add", function() {
                                handler.apply( this, arguments );
                        };
                },
-               remove: function() {}
+               remove: function() {
+                       ok(true, "Remove called.");
+               }
        };
 
        div.bind("test.a", {x: 1}, function(e) {
@@ -119,7 +121,17 @@ test("bind(), namespace with special add", function() {
        // Should trigger 2
        div.trigger("test.b");
 
+       // Should trigger 4
        div.unbind("test");
+
+       div = jQuery("<div/>").bind("test", function(e) {
+               ok( true, "Test event fired." );
+       });
+
+       // Should trigger 2
+       div.appendTo("#main").remove();
+
+       delete jQuery.event.special.test;
 });
 
 test("bind(), no data", function() {
@@ -361,6 +373,35 @@ test("bind(), with different this object", function() {
        ok( !jQuery.data(jQuery("#firstp")[0], "events"), "Event handler unbound when using different this object and data." );
 });
 
+test("bind()/trigger()/unbind() on plain object", function() {
+       expect( 2 );
+
+       var obj = {};
+
+       // Make sure it doesn't complain when no events are found
+       jQuery(obj).trigger("test");
+
+       // Make sure it doesn't complain when no events are found
+       jQuery(obj).unbind("test");
+
+       jQuery(obj).bind("test", function(){
+               ok( true, "Custom event run." );
+       });
+
+       ok( jQuery(obj).data("events"), "Object has events bound." );
+
+       // Should trigger 1
+       jQuery(obj).trigger("test");
+
+       jQuery(obj).unbind("test");
+
+       // Should trigger 0
+       jQuery(obj).trigger("test");
+
+       // Make sure it doesn't complain when no events are found
+       jQuery(obj).unbind("test");
+});
+
 test("unbind(type)", function() {
        expect( 0 );
        
@@ -787,7 +828,7 @@ test(".live()/.die()", function() {
        submit = 0, div = 0, livea = 0, liveb = 0;
        jQuery("div#nothiddendivchild").trigger("click");
        equals( submit, 0, "Click on inner div" );
-       equals( div, 1, "Click on inner div" );
+       equals( div, 2, "Click on inner div" );
        equals( livea, 1, "Click on inner div" );
        equals( liveb, 1, "Click on inner div" );
 
@@ -803,7 +844,7 @@ test(".live()/.die()", function() {
        submit = 0, div = 0, livea = 0, liveb = 0;
        jQuery("div#nothiddendivchild").trigger("click");
        equals( submit, 0, "die Click on inner div" );
-       equals( div, 1, "die Click on inner div" );
+       equals( div, 2, "die Click on inner div" );
        equals( livea, 1, "die Click on inner div" );
        equals( liveb, 1, "die Click on inner div" );
 
@@ -812,7 +853,7 @@ test(".live()/.die()", function() {
        jQuery("div#nothiddendivchild").die("click");
        jQuery("div#nothiddendivchild").trigger("click");
        equals( submit, 0, "die Click on inner div" );
-       equals( div, 1, "die Click on inner div" );
+       equals( div, 2, "die Click on inner div" );
        equals( livea, 1, "die Click on inner div" );
        equals( liveb, 0, "die Click on inner div" );
 
@@ -830,7 +871,7 @@ test(".live()/.die()", function() {
        jQuery("div#nothiddendivchild").trigger("click");
        equals( submit, 0, "stopPropagation Click on inner div" );
        equals( div, 1, "stopPropagation Click on inner div" );
-       equals( livea, 1, "stopPropagation Click on inner div" );
+       equals( livea, 0, "stopPropagation Click on inner div" );
        equals( liveb, 1, "stopPropagation Click on inner div" );
 
        // Make sure click events only fire with primary click
@@ -1240,6 +1281,7 @@ test(".delegate()/.undelegate()", function() {
        equals( liveb, 0, "Click on body" );
 
        // This should trigger two events
+       submit = 0, div = 0, livea = 0, liveb = 0;
        jQuery("div#nothiddendiv").trigger("click");
        equals( submit, 0, "Click on div" );
        equals( div, 1, "Click on div" );
@@ -1247,55 +1289,62 @@ test(".delegate()/.undelegate()", function() {
        equals( liveb, 0, "Click on div" );
 
        // This should trigger three events (w/ bubbling)
+       submit = 0, div = 0, livea = 0, liveb = 0;
        jQuery("div#nothiddendivchild").trigger("click");
        equals( submit, 0, "Click on inner div" );
        equals( div, 2, "Click on inner div" );
-       equals( livea, 2, "Click on inner div" );
+       equals( livea, 1, "Click on inner div" );
        equals( liveb, 1, "Click on inner div" );
 
        // This should trigger one submit
+       submit = 0, div = 0, livea = 0, liveb = 0;
        jQuery("div#nothiddendivchild").trigger("submit");
        equals( submit, 1, "Submit on div" );
-       equals( div, 2, "Submit on div" );
-       equals( livea, 2, "Submit on div" );
-       equals( liveb, 1, "Submit on div" );
+       equals( div, 0, "Submit on div" );
+       equals( livea, 0, "Submit on div" );
+       equals( liveb, 0, "Submit on div" );
 
        // Make sure no other events were removed in the process
+       submit = 0, div = 0, livea = 0, liveb = 0;
        jQuery("div#nothiddendivchild").trigger("click");
-       equals( submit, 1, "undelegate Click on inner div" );
-       equals( div, 3, "undelegate Click on inner div" );
-       equals( livea, 3, "undelegate Click on inner div" );
-       equals( liveb, 2, "undelegate Click on inner div" );
+       equals( submit, 0, "undelegate Click on inner div" );
+       equals( div, 2, "undelegate Click on inner div" );
+       equals( livea, 1, "undelegate Click on inner div" );
+       equals( liveb, 1, "undelegate Click on inner div" );
 
        // Now make sure that the removal works
+       submit = 0, div = 0, livea = 0, liveb = 0;
        jQuery("#body").undelegate("div#nothiddendivchild", "click");
        jQuery("div#nothiddendivchild").trigger("click");
-       equals( submit, 1, "undelegate Click on inner div" );
-       equals( div, 4, "undelegate Click on inner div" );
-       equals( livea, 4, "undelegate Click on inner div" );
-       equals( liveb, 2, "undelegate Click on inner div" );
+       equals( submit, 0, "undelegate Click on inner div" );
+       equals( div, 2, "undelegate Click on inner div" );
+       equals( livea, 1, "undelegate Click on inner div" );
+       equals( liveb, 0, "undelegate Click on inner div" );
 
        // Make sure that the click wasn't removed too early
+       submit = 0, div = 0, livea = 0, liveb = 0;
        jQuery("div#nothiddendiv").trigger("click");
-       equals( submit, 1, "undelegate Click on inner div" );
-       equals( div, 5, "undelegate Click on inner div" );
-       equals( livea, 5, "undelegate Click on inner div" );
-       equals( liveb, 2, "undelegate Click on inner div" );
+       equals( submit, 0, "undelegate Click on inner div" );
+       equals( div, 1, "undelegate Click on inner div" );
+       equals( livea, 1, "undelegate Click on inner div" );
+       equals( liveb, 0, "undelegate Click on inner div" );
 
        // Make sure that stopPropgation doesn't stop live events
+       submit = 0, div = 0, livea = 0, liveb = 0;
        jQuery("#body").delegate("div#nothiddendivchild", "click", function(e){ liveb++; e.stopPropagation(); });
        jQuery("div#nothiddendivchild").trigger("click");
-       equals( submit, 1, "stopPropagation Click on inner div" );
-       equals( div, 6, "stopPropagation Click on inner div" );
-       equals( livea, 6, "stopPropagation Click on inner div" );
-       equals( liveb, 3, "stopPropagation Click on inner div" );
+       equals( submit, 0, "stopPropagation Click on inner div" );
+       equals( div, 1, "stopPropagation Click on inner div" );
+       equals( livea, 0, "stopPropagation Click on inner div" );
+       equals( liveb, 1, "stopPropagation Click on inner div" );
 
        // Make sure click events only fire with primary click
+       submit = 0, div = 0, livea = 0, liveb = 0;
        var event = jQuery.Event("click");
        event.button = 1;
        jQuery("div#nothiddendiv").trigger(event);
 
-       equals( livea, 6, "delegate secondary click" );
+       equals( livea, 0, "delegate secondary click" );
 
        jQuery("#body").undelegate("div#nothiddendivchild", "click");
        jQuery("#body").undelegate("div#nothiddendiv", "click");