aboutsummaryrefslogtreecommitdiffstats
path: root/src/event.js
diff options
context:
space:
mode:
authorjeresig <jeresig@gmail.com>2010-02-27 09:02:18 -0500
committerjeresig <jeresig@gmail.com>2010-02-27 09:02:18 -0500
commit42568db4c414d4435f2f7e89be87d66645c42e1c (patch)
treeecfa608c6676d3e4e10c9302ee43a45414cf7edc /src/event.js
parenta45372a4c5cfd33c4ff12b145bd79fec2fe0d382 (diff)
parent7d5da0ee030b1962ff1ff57b0221a02dfdc2886a (diff)
downloadjquery-42568db4c414d4435f2f7e89be87d66645c42e1c.tar.gz
jquery-42568db4c414d4435f2f7e89be87d66645c42e1c.zip
Merge branch 'master' of github.com:jquery/jquery
Diffstat (limited to 'src/event.js')
-rw-r--r--src/event.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/event.js b/src/event.js
index a7900c98e..42655c9bc 100644
--- 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