Skip to content
Permalink
Browse files

Merge branch 'bug7150' of http://github.com/csnover/jquery

  • Loading branch information...
jeresig committed Oct 13, 2010
2 parents 783bb2a + 1518ae1 commit 2ef8da0924623a9bdede9eeed17ec848859844b7
Showing with 5 additions and 2 deletions.
  1. +1 −1 src/event.js
  2. +4 −1 test/unit/event.js
@@ -282,7 +282,7 @@ jQuery.event = {
handle.elem = null;
}

delete elemData[ eventKey ];
delete elemData.events;
delete elemData.handle;

if ( typeof elemData === "function" ) {
@@ -443,7 +443,7 @@ test("bind(name, false), unbind(name, false)", function() {
});

test("bind()/trigger()/unbind() on plain object", function() {
expect( 5 );
expect( 7 );

var obj = {};

@@ -459,6 +459,7 @@ test("bind()/trigger()/unbind() on plain object", function() {

var events = jQuery(obj).data("__events__");
ok( events, "Object has events bound." );
equals( obj.events, undefined, "Events object on plain objects is not events" );
equals( typeof events, "function", "'events' expando is a function on plain objects." );
equals( obj.test, undefined, "Make sure that test event is not on the plain object." );
equals( obj.handle, undefined, "Make sure that the event handler is not on the plain object." );
@@ -473,6 +474,8 @@ test("bind()/trigger()/unbind() on plain object", function() {

// Make sure it doesn't complain when no events are found
jQuery(obj).unbind("test");

equals( obj.__events__, undefined, "Make sure events object is removed" );
});

test("unbind(type)", function() {

0 comments on commit 2ef8da0

Please sign in to comment.
You can’t perform that action at this time.