git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added a fix, suggested by Diego, for IE firing the ready event too late. Fixes bug...
[jquery.git]
/
src
/
event.js
diff --git
a/src/event.js
b/src/event.js
index
08deb8b
..
a621eb9
100644
(file)
--- a/
src/event.js
+++ b/
src/event.js
@@
-377,13
+377,13
@@
jQuery.Event = function( src ){
if( src && src.type ){
this.originalEvent = src;
this.type = src.type;
if( src && src.type ){
this.originalEvent = src;
this.type = src.type;
- this.timeStamp = src.timeStamp;
// Event type
}else
this.type = src;
// Event type
}else
this.type = src;
- if( !this.timeStamp )
- this.timeStamp = now();
+ // timeStamp is buggy for some events on Firefox(#3843)
+ // So we won't rely on the native value
+ this.timeStamp = now();
// Mark it as fixed
this[expando] = true;
// Mark it as fixed
this[expando] = true;
@@
-572,9
+572,8
@@
function liveHandler( event ){
});
jQuery.each(elems, function(){
});
jQuery.each(elems, function(){
- if ( !event.isImmediatePropagationStopped() &&
- this.fn.call(this.elem, event, this.fn.data) === false )
- stop = false;
+ if ( this.fn.call(this.elem, event, this.fn.data) === false )
+ stop = false;
});
return stop;
});
return stop;
@@
-638,7
+637,7
@@
function bindReady(){
// If IE and not an iframe
// continually check to see if the document is ready
// If IE and not an iframe
// continually check to see if the document is ready
- if ( document.documentElement.doScroll && !window.frameElement ) (function(){
+ if ( document.documentElement.doScroll && window == window.top ) (function(){
if ( jQuery.isReady ) return;
try {
if ( jQuery.isReady ) return;
try {