diff options
| author | David Serduke <davidserduke@gmail.com> | 2007-12-16 10:08:53 +0000 |
|---|---|---|
| committer | David Serduke <davidserduke@gmail.com> | 2007-12-16 10:08:53 +0000 |
| commit | 97e98591aaf929bef42bf6047f68e08d8aafc1a4 (patch) | |
| tree | 6b9464f38f1ce4405cd73bfddfdac52f76b43687 | |
| parent | 7a6978b3244023831057c1fde2a9daaab2d705e7 (diff) | |
| download | jquery-97e98591aaf929bef42bf6047f68e08d8aafc1a4.tar.gz jquery-97e98591aaf929bef42bf6047f68e08d8aafc1a4.zip | |
Added code so an iframe in IE won't count on doScroll to determine if the dom is ready. We will probably have to do more investigation on a better (and consistant) method for inside an iframe in IE.
| -rw-r--r-- | src/event.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/event.js b/src/event.js index 1977c8ef6..ccbfd2ad4 100644 --- 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/ |