From: John Resig <jeresig@gmail.com>
Date: Mon, 11 Oct 2010 22:20:57 +0000 (-0400)
Subject: Handle some edge cases with binding events to the window object (which is also a... 
X-Git-Tag: 1.4.3rc2~7
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=1df5084c9748a8d38516266063344f145bc428c0;p=jquery.git

Handle some edge cases with binding events to the window object (which is also a plain object - causing some confusion). Fixes #7143.
---

diff --git a/src/event.js b/src/event.js
index 7a10a12cb..d949d0f0f 100644
--- a/src/event.js
+++ b/src/event.js
@@ -282,7 +282,7 @@ jQuery.event = {
 			delete elemData.handle;
 
 			if ( typeof elemData === "function" ) {
-				delete elem.events;
+				jQuery.removeData( elem, "events" );
 
 			} else if ( jQuery.isEmptyObject( elemData ) ) {
 				jQuery.removeData( elem );
@@ -346,7 +346,7 @@ jQuery.event = {
 		// Trigger the event, it is assumed that "handle" is a function
 		var handle = elem.nodeType ?
 			jQuery.data( elem, "handle" ) :
-			elem.events && elem.events.handle;
+			(jQuery.data( elem, "events" ) || {}).handle;
 
 		if ( handle ) {
 			handle.apply( elem, data );
diff --git a/test/unit/event.js b/test/unit/event.js
index d9dcc97ec..b093e8e71 100644
--- a/test/unit/event.js
+++ b/test/unit/event.js
@@ -1830,11 +1830,15 @@ test("Non DOM element events", function() {
 });
 
 test("window resize", function() {
-	expect(1);
+	expect(2);
+
+	jQuery(window).unbind();
 
 	jQuery(window).bind("resize", function(){
 		ok( true, "Resize event fired." );
 	}).resize().unbind("resize");
+
+	ok( !jQuery(window).data("events"), "Make sure all the events are gone." );
 });
 
 /*