deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

unbind handlers with data + test (#935)

Browse source
This commit is contained in:
Brandon Aaron 2007-04-24 22:35:04 +00:00
parent 14aafdf319
commit 2897b1bd23
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/event/event.js
View file

@ -32,8 +32,11 @@ jQuery.event = {
} }
// Make sure that the function being executed has a unique ID // Make sure that the function being executed has a unique ID
if ( !handler.guid ) if ( !handler.guid ) {
handler.guid = this.guid++; handler.guid = this.guid++;
// Don't forget to set guid for the original handler function
if (fn) fn.guid = handler.guid;
}
// Init the element's event structure // Init the element's event structure
if (!element.$events) if (!element.$events)

12
src/event/eventTest.js
View file

@ -1,13 +1,15 @@
module("event"); module("event");
test("bind()", function() { test("bind()", function() {
expect(11); expect(12);
var handler = function(event) { var handler = function(event) {
ok( event.data, "bind() with data, check passed data exists" ); ok( event.data, "bind() with data, check passed data exists" );
ok( event.data.foo == "bar", "bind() with data, Check value of passed data" ); ok( event.data.foo == "bar", "bind() with data, Check value of passed data" );
}; };
$("#firstp").bind("click", {foo: "bar"}, handler).click(); $("#firstp").bind("click", {foo: "bar"}, handler).click().unbind("click", handler);
ok( !$("#firstp").get(0).$events, "Event handler unbound when using data." );
reset(); reset();
var handler = function(event, data) { var handler = function(event, data) {
@ -16,12 +18,14 @@ test("bind()", function() {
ok( data, "Check trigger data" ); ok( data, "Check trigger data" );
ok( data.bar == "foo", "Check value of trigger data" ); ok( data.bar == "foo", "Check value of trigger data" );
}; };
$("#firstp").bind("click", {foo: "bar"}, handler).trigger("click", [{bar: "foo"}]); $("#firstp").bind("click", {foo: "bar"}, handler).trigger("click", [{bar: "foo"}]).unbind(handler);
reset();
var handler = function(event) { var handler = function(event) {
ok ( !event.data, "Check that no data is added to the event object" ); ok ( !event.data, "Check that no data is added to the event object" );
}; };
$("#firstp").unbind().bind("click", handler).trigger("click"); $("#firstp").bind("click", handler).trigger("click");
// events don't work with iframes, see #939 // events don't work with iframes, see #939
var tmp = document.createElement('iframe'); var tmp = document.createElement('iframe');