Permalink
Browse files

Fix for #1185

  • Loading branch information...
brandonaaron committed May 31, 2007
1 parent 2c33101 commit 3c5340d146100dab8c69d2c2c1925adca827342a
Showing with 12 additions and 7 deletions.
  1. +12 −7 src/event/event.js
View
@@ -41,7 +41,17 @@ jQuery.event = {
if (!element.$handle)
element.$handle = function() {
- jQuery.event.handle.apply(element, arguments);
+ // returned undefined or false
+ var val;
+
+ // Handle the second event of a trigger and when
+ // an event is called after a page has unloaded
+ if ( typeof jQuery == "undefined" || jQuery.event.triggered )
+ return val;
+
+ val = jQuery.event.handle.apply(element, arguments);
+
+ return val;
};
// Get the current list of functions bound to this event
@@ -138,7 +148,7 @@ jQuery.event = {
data.unshift( this.fix({ type: type, target: element }) );
// Trigger the event
- if ( (val = this.handle.apply( element, data )) !== false )
+ if ( (val = element.$handle.apply( element, data )) !== false )
this.triggered = true;
if ( fn && val !== false && !jQuery.nodeName(element, 'a') )
@@ -151,11 +161,6 @@ jQuery.event = {
handle: function(event) {
// returned undefined or false
var val;
-
- // Handle the second event of a trigger and when
- // an event is called after a page has unloaded
- if ( typeof jQuery == "undefined" || jQuery.event.triggered )
- return val;
// Empty object is for triggered events with no data
event = jQuery.event.fix( event || window.event || {} );

0 comments on commit 3c5340d

Please sign in to comment.