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:
7a6978b
)
Added code so an iframe in IE won't count on doScroll to determine if the dom is...
author
David Serduke
<davidserduke@gmail.com>
Sun, 16 Dec 2007 10:08:53 +0000
(10:08 +0000)
committer
David Serduke
<davidserduke@gmail.com>
Sun, 16 Dec 2007 10:08:53 +0000
(10:08 +0000)
src/event.js
patch
|
blob
|
history
diff --git
a/src/event.js
b/src/event.js
index
1977c8e
..
ccbfd2a
100644
(file)
--- a/
src/event.js
+++ b/
src/event.js
@@
-332,7
+332,7
@@
jQuery.event = {
// If Safari or IE is used
// Continually check to see if the document is ready
- if (jQuery.browser.msie || jQuery.browser.safari ) (function(){
+ if ((jQuery.browser.msie && !window.frameElement) || jQuery.browser.safari ) (function(){
try {
// If IE is used, use the trick by Diego Perini
// http://javascript.nwbox.com/IEContentLoaded/