Fixing #2081

[jquery.git] / src / event.js

diff --git a/src/event.js b/src/event.js
index b27b418..cb68c38 100644 (file)
--- a/src/event.js
+++ b/src/event.js
@@ -102,7 +102,7 @@ jQuery.event = {
 
                if ( events ) {
                        // Unbind all events for the element
-                       if ( !types )
+                       if ( types == undefined )
                                for ( var type in events )
                                        this.remove( elem, type );
                        else {
@@ -196,7 +196,7 @@ jQuery.event = {
                                data.shift();
 
                        // Handle triggering of extra function
-                       if ( extra ) {
+                       if ( extra && jQuery.isFunction( extra ) ) {
                                // call the extra function and tack the current return value on the end for possible inspection
                                var ret = extra.apply( elem, data.concat( val ) );
                                // if anything is returned, give it precedence and have it overwrite the previous value
@@ -263,11 +263,18 @@ jQuery.event = {
        },
 
        fix: function(event) {
+               // Short-circuit if the event has already been fixed by jQuery.event.fix
+               if ( event[ expando ] )
+                       return event;
+                       
                // store a copy of the original event object 
                // and clone to set read-only properties
                var originalEvent = event;
                event = jQuery.extend({}, originalEvent);
                
+               // Mark the event as fixed by jQuery.event.fix
+               event[ expando ] = true;
+               
                // add preventDefault and stopPropagation since 
                // they will not work on the clone
                event.preventDefault = function() {
@@ -471,7 +478,7 @@ jQuery.extend({
                        }
                
                        // Trigger any bound ready events
-                       $(document).triggerHandler("ready");
+                       jQuery(document).triggerHandler("ready");
                }
        }
 });
@@ -482,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 );
 }