Changed the $(document).ready() code to try and solve some problems in Safari, Opera...

diff --git a/src/event.js b/src/event.js
index fa8be8d2f576de60d9f35ac049c5a550e0fcc69c..39ec527ce08284b0409f0b86b9ff61534a11b09a 100644 (file)
--- a/src/event.js
+++ b/src/event.js
@@ -489,27 +489,58 @@ function bindReady(){
        if ( readyBound ) return;
        readyBound = true;
 
-       // Mozilla, Opera and webkit nightlies currently support this event
-       if ( document.addEventListener )
+       // Mozilla, Opera (see further below for it) and webkit nightlies currently support this event
+       if ( document.addEventListener && !jQuery.browser.opera)
                // Use the handy event callback
                document.addEventListener( "DOMContentLoaded", jQuery.ready, false );
        
-       // If Safari or IE is used
+       // If IE is used and is not in a frame
        // Continually check to see if the document is ready
-       if (jQuery.browser.msie || jQuery.browser.safari ) (function(){
+       if ( jQuery.browser.msie && window == top ) (function(){
+               if (jQuery.isReady) return;
                try {
                        // If IE is used, use the trick by Diego Perini
                        // http://javascript.nwbox.com/IEContentLoaded/
-                       if ( jQuery.browser.msie || document.readyState != "loaded" && document.readyState != "complete" )
-                               document.documentElement.doScroll("left");
+                       document.documentElement.doScroll("left");
                } catch( error ) {
-                       return setTimeout( arguments.callee, 0 );
+                       setTimeout( arguments.callee, 0 );
+                       return;
                }
-
                // and execute any waiting functions
                jQuery.ready();
        })();
 
+       if ( jQuery.browser.opera )
+               document.addEventListener( "DOMContentLoaded", function () {
+                       if (jQuery.isReady) return;
+                       for (var i = 0; i < document.styleSheets.length; i++)
+                               if (document.styleSheets[i].disabled) {
+                                       setTimeout( arguments.callee, 0 );
+                                       return;
+                               }
+                       // and execute any waiting functions
+                       jQuery.ready();
+               }, false);
+
+       if ( jQuery.browser.safari ) {
+               var numStyles;
+               (function(){
+                       if (jQuery.isReady) return;
+                       if ( document.readyState != "loaded" && document.readyState != "complete" ) {
+                               setTimeout( arguments.callee, 0 );
+                               return;
+                       }
+                       if ( numStyles === undefined )
+                               numStyles = jQuery("style, link[rel=stylesheet]").length;
+                       if ( document.styleSheets.length != numStyles ) {
+                               setTimeout( arguments.callee, 0 );
+                               return;
+                       }
+                       // and execute any waiting functions
+                       jQuery.ready();
+               })();
+       }
+
        // A fallback to window.onload, that will always work
        jQuery.event.add( window, "load", jQuery.ready );
 }