]> source.dussan.org Git - jquery.git/commitdiff
Added code so an iframe in IE won't count on doScroll to determine if the dom is...
authorDavid Serduke <davidserduke@gmail.com>
Sun, 16 Dec 2007 10:08:53 +0000 (10:08 +0000)
committerDavid Serduke <davidserduke@gmail.com>
Sun, 16 Dec 2007 10:08:53 +0000 (10:08 +0000)
src/event.js

index 1977c8ef68522636680ed83981396595bbd2edce..ccbfd2ad4b6feec643f21992dfe29a2d5525c332 100644 (file)
@@ -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/