aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAriel Flesler <aflesler@gmail.com>2009-01-02 23:44:06 +0000
committerAriel Flesler <aflesler@gmail.com>2009-01-02 23:44:06 +0000
commit303ad32c749ba92d2ce31dfe46942c92093677cb (patch)
tree00334f9b92cdc33db56cd635c62d179e5822e7f7 /src
parentb2583a7526c0051f7c5f11a25e0cbaeb13930fc6 (diff)
downloadjquery-303ad32c749ba92d2ce31dfe46942c92093677cb.tar.gz
jquery-303ad32c749ba92d2ce31dfe46942c92093677cb.zip
jquery event: Misc, removed a commented line from last commit.
Diffstat (limited to 'src')
-rw-r--r--src/event.js8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/event.js b/src/event.js
index c7e2f4f43..e90ef0760 100644
--- a/src/event.js
+++ b/src/event.js
@@ -213,21 +213,17 @@ jQuery.event = {
event.currentTarget = elem;
- var fn = jQuery.isFunction( elem[ type ] );
-
// Trigger the event, it is assumed that "handle" is a function
var handle = jQuery.data(elem, "handle");
if ( handle )
handle.apply( elem, data );
// Handle triggering native .onfoo handlers (and on links since we don't call .click() for links)
- if ( (!fn || (jQuery.nodeName(elem, 'a') && type == "click")) && elem["on"+type] && elem["on"+type].apply( elem, data ) === false )
+ if ( (!elem[type] || (jQuery.nodeName(elem, 'a') && type == "click")) && elem["on"+type] && elem["on"+type].apply( elem, data ) === false )
event.result = false;
- // data.shift();
-
// Trigger the native events (except for clicks on links)
- if ( !bubbling && fn && !event.isDefaultPrevented() && !(jQuery.nodeName(elem, 'a') && type == "click") ) {
+ if ( !bubbling && elem[type] && !event.isDefaultPrevented() && !(jQuery.nodeName(elem, 'a') && type == "click") ) {
this.triggered = true;
try {
elem[ type ]();