git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More missing semicolons.
[jquery.git]
/
src
/
event
/
event.js
diff --git
a/src/event/event.js
b/src/event/event.js
index
f7cc993
..
1b24a31
100644
(file)
--- a/
src/event/event.js
+++ b/
src/event/event.js
@@
-148,11
+148,15
@@
jQuery.event = {
data.unshift( this.fix({ type: type, target: element }) );
// Trigger the event
data.unshift( this.fix({ type: type, target: element }) );
// Trigger the event
- if ( jQuery.isFunction(element.$handle) && (val = element.$handle.apply( element, data )) !== false )
- this.triggered = true;
+ if ( jQuery.isFunction( element.$handle ) )
+ val = element.$handle.apply( element, data );
+ if ( !fn && element["on"+type] && element["on"+type].apply( element, data ) === false )
+ val = false;
- if ( fn && val !== false && !jQuery.nodeName(element, 'a') )
+ if ( fn && val !== false && !(jQuery.nodeName(element, 'a') && type == "click") ) {
+ this.triggered = true;
element[ type ]();
element[ type ]();
+ }
this.triggered = false;
}
this.triggered = false;
}
@@
-227,8
+231,8
@@
jQuery.event = {
// Calculate pageX/Y if missing and clientX/Y available
if ( event.pageX == null && event.clientX != null ) {
var e = document.documentElement, b = document.body;
// Calculate pageX/Y if missing and clientX/Y available
if ( event.pageX == null && event.clientX != null ) {
var e = document.documentElement, b = document.body;
- event.pageX = event.clientX + (e && e.scrollLeft || b.scrollLeft);
- event.pageY = event.clientY + (e && e.scrollTop || b.scrollTop);
+ event.pageX = event.clientX + (e && e.scrollLeft || b.scrollLeft || 0);
+ event.pageY = event.clientY + (e && e.scrollTop || b.scrollTop || 0);
}
// Add which for key events
}
// Add which for key events
@@
-482,7
+486,7
@@
jQuery.fn.extend({
var p = e.relatedTarget;
// Traverse up the tree
var p = e.relatedTarget;
// Traverse up the tree
- while ( p && p != this ) try { p = p.parentNode } catch(e) { p = this; };
+ while ( p && p != this ) try { p = p.parentNode; } catch(e) { p = this; };
// If we actually just moused on to a sub-element, ignore it
if ( p == this ) return false;
// If we actually just moused on to a sub-element, ignore it
if ( p == this ) return false;
@@
-541,7
+545,7
@@
jQuery.fn.extend({
// Otherwise, remember the function for later
else
// Add the function to the wait list
// Otherwise, remember the function for later
else
// Add the function to the wait list
- jQuery.readyList.push( function() { return f.apply(this, [jQuery]) } );
+ jQuery.readyList.push( function() { return f.apply(this, [jQuery]); } );
return this;
}
return this;
}