Merge branch 'master' of github.com:jquery/jquery

jquery · Feb 27, 2010 · 42568db · 42568db
2 parents a45372a + 7d5da0e
commit 42568db
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/event.js b/src/event.js
@@ -382,7 +382,8 @@ jQuery.event = {
 			namespace = new RegExp("(^|\\.)" + namespaces.slice(0).sort().join("\\.(?:.*\\.)?") + "(\\.|$)");
 		}
 
-		var events = jQuery.data(this, "events"), handlers = events[ event.type ];
+		events = jQuery.data(this, "events");
+		handlers = (events || {})[ event.type ];
 
 		if ( events && handlers ) {
 			// Clone the handlers to prevent manipulation