From: John Resig <jeresig@gmail.com>
Date: Wed, 13 Oct 2010 01:51:44 +0000 (-0400)
Subject: Merge branch 'bug7150' of http://github.com/csnover/jquery
X-Git-Url: http://git.asbjorn.it/?a=commitdiff_plain;h=2ef8da0924623a9bdede9eeed17ec848859844b7;hp=-c;p=jquery.git

Merge branch 'bug7150' of github.com/csnover/jquery
---

2ef8da0924623a9bdede9eeed17ec848859844b7
diff --combined test/unit/event.js
index 6f75322,f2e981e..a51659c
--- a/test/unit/event.js
+++ b/test/unit/event.js
@@@ -443,7 -443,7 +443,7 @@@ test("bind(name, false), unbind(name, f
  });
  
  test("bind()/trigger()/unbind() on plain object", function() {
- 	expect( 5 );
+ 	expect( 7 );
  
  	var obj = {};
  
@@@ -459,6 -459,7 +459,7 @@@
  
  	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 +474,8 @@@
  
  	// 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() {
@@@ -1838,7 -1841,7 +1841,7 @@@ test("window resize", function() 
  		ok( true, "Resize event fired." );
  	}).resize().unbind("resize");
  
 -	ok( !jQuery(window).data("events"), "Make sure all the events are gone." );
 +	ok( !jQuery(window).data("__events__"), "Make sure all the events are gone." );
  });
  
  /*