Changeset 1773

Timestamp:

04/24/07 21:48:52 (2 years ago)

Author:

brandon

Message:

Don't pass handler function as data for events + test (#1140)

Location:

trunk/jquery/src/event

Files:

• event.js (modified) (5 diffs)
• eventTest.js (modified) (4 diffs)

trunk/jquery/src/event/event.js

@@ -15 +15 @@
         
         // if data is passed, bind to handler 
-        if( data != undefined ) { 
+        if( data != handler ) { 
             // Create temporary function pointer to original handler 
             var fn = handler; 
@@ -56 +56 @@
                 element.addEventListener(type, element.$handle, false);
             else if (element.attachEvent)
-                element.attachEvent("on" + type, element.$handle, false);
+                element.attachEvent("on" + type, element.$handle);
         }
 
@@ -102 +102 @@
                         element.removeEventListener(type, element.$handle, false);
                     else if (element.detachEvent)
-                        element.detachEvent("on" + type, element.$handle, false);
+                        element.detachEvent("on" + type, element.$handle);
                     ret = null;
                     delete events[type];
@@ -275 +275 @@
     bind: function( type, data, fn ) {
         return this.each(function(){
-            jQuery.event.add( this, type, fn || data, data );
+            jQuery.event.add( this, type, fn || data, fn && data );
         });
     },
@@ -310 +310 @@
                 jQuery(this).unbind(event);
                 return (fn || data).apply( this, arguments);
-            }, data);
+            }, fn && data);
         });
     },

trunk/jquery/src/event/eventTest.js

@@ -2 +2 @@
 
 test("bind()", function() {
-    expect(10);
+    expect(11);
 
     var handler = function(event) {
         ok( event.data, "bind() with data, check passed data exists" );
         ok( event.data.foo == "bar", "bind() with data, Check value of passed data" );
-    }
+    };
     $("#firstp").bind("click", {foo: "bar"}, handler).click();
     
@@ -16 +16 @@
         ok( data, "Check trigger data" );
         ok( data.bar == "foo", "Check value of trigger data" );
-    }
+    };
     $("#firstp").bind("click", {foo: "bar"}, handler).trigger("click", [{bar: "foo"}]);
+    
+    var handler = function(event) {
+        ok ( !event.data, "Check that no data is added to the event object" );
+    };
+    $("#firstp").unbind().bind("click", handler).trigger("click");
     
     // events don't work with iframes, see #939
@@ -40 +45 @@
     function selectOnChange(event) {
         equals( event.data, counter++, "Event.data is not a global event object" );
-    }
+    };
     $("select").each(function(i){
         $(this).bind('change', i, selectOnChange);
@@ -91 +96 @@
         ok( b == "2", "check passed data" );
         ok( c == "abc", "check passed data" );
-    }
+    };
     $("#firstp").bind("click", handler).trigger("click", [1, "2", "abc"]);
 });