git.asbjorn.biz
/
jquery.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2322032
)
Refactored the trigger code a little bit.
author
John Resig
<jeresig@gmail.com>
Mon, 22 Jan 2007 05:14:45 +0000
(
05:14
+0000)
committer
John Resig
<jeresig@gmail.com>
Mon, 22 Jan 2007 05:14:45 +0000
(
05:14
+0000)
src/event/event.js
patch
|
blob
|
history
diff --git
a/src/event/event.js
b/src/event/event.js
index
565b915
..
812d6f2
100644
(file)
--- a/
src/event/event.js
+++ b/
src/event/event.js
@@
-80,29
+80,30
@@
jQuery.event = {
});
// Handle triggering a single element
});
// Handle triggering a single element
- else if ( element["on" + type] ) {
- // Pass along a fake event
- data.unshift( this.fix({ type: type, target: element }) );
+ else {
+ var handler = element["on" + type ], val,
+ fn = jQuery.isFunction( element[ type ] );
+
+ if ( handler ) {
+ // Pass along a fake event
+ data.unshift( this.fix({ type: type, target: element }) );
- // Trigger the event
- var val = element["on" + type].apply( element, data );
+ // Trigger the event
+ if ( (val = handler.apply( element, data )) !== false )
+ this.triggered = true;
+ }
- if ( val !== false && jQuery.isFunction( element[ type ] ) ) {
- this.triggered = true;
+ if ( fn && val !== false )
element[ type ]();
element[ type ]();
- }
- } else if ( jQuery.isFunction( element[ type ] ) )
- element[ type ]();
+
+ this.triggered = false;
+ }
},
handle: function(event) {
},
handle: function(event) {
- if ( typeof jQuery == "undefined" ) return;
-
- // Handle the second event of a trigger
- if ( jQuery.event.triggered ) {
- jQuery.event.triggered = false;
- return;
- }
+ // 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;
// Empty object is for triggered events with no data
event = jQuery.event.fix( event || window.event || {} );
// Empty object is for triggered events with no data
event = jQuery.event.fix( event || window.event || {} );