git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed the === undefined ready event check to == null since frameElement is usually...
[jquery.git]
/
src
/
event.js
diff --git
a/src/event.js
b/src/event.js
index
7cfb535
..
014fb73
100644
(file)
--- a/
src/event.js
+++ b/
src/event.js
@@
-693,13
+693,14
@@
jQuery.fn.extend({
return this.click( jQuery.event.proxy( fn, function( event ) {
// Figure out which function to execute
return this.click( jQuery.event.proxy( fn, function( event ) {
// Figure out which function to execute
- this.lastToggle = ( this.lastToggle || 0 ) % i;
+ var lastToggle = ( jQuery.data( this, 'lastToggle' + fn.guid ) || 0 ) % i;
+ jQuery.data( this, 'lastToggle' + fn.guid, lastToggle + 1 );
// Make sure that clicks stop
event.preventDefault();
// and execute the function
// Make sure that clicks stop
event.preventDefault();
// and execute the function
- return args[ this.lastToggle++ ].apply( this, arguments ) || false;
+ return args[ lastToggle ].apply( this, arguments ) || false;
}));
},
}));
},
@@
-848,10
+849,15
@@
function bindReady() {
}
});
}
});
- // If IE and not an iframe
+ // If IE and not a frame
// continually check to see if the document is ready
// continually check to see if the document is ready
- // NOTE: DO NOT CHANGE TO ===, FAILS IN IE.
- if ( document.documentElement.doScroll && window == window.top ) (function() {
+ var toplevel = false;
+
+ try {
+ toplevel = window.frameElement == null;
+ } catch(e){}
+
+ if ( document.documentElement.doScroll && toplevel ) (function() {
if ( jQuery.isReady ) {
return;
}
if ( jQuery.isReady ) {
return;
}