added curly braces around all if/else statements

[jquery.git] / src / event.js

diff --git a/src/event.js b/src/event.js
index 055de72..2bb8a0e 100644 (file)
--- a/src/event.js
+++ b/src/event.js
@@ -133,7 +133,7 @@ jQuery.event = {
                                        var namespaces = type.split(".");
                                        type = namespaces.shift();
                                        var all = !namespaces.length,
-                                               namespace = new RegExp("(^|\\.)" + namespaces.slice(0).sort().join(".*\\.") + "(\\.|$)"),
+                                               namespace = new RegExp("(^|\\.)" + namespaces.slice(0).sort().join("\\.(?:.*\\.)?") + "(\\.|$)"),
                                                special = this.special[ type ] || {};
 
                                        if ( events[ type ] ) {
@@ -291,7 +291,7 @@ jQuery.event = {
                // Cache this now, all = true means, any handler
                all = !namespaces.length && !event.exclusive;
 
-               var namespace = new RegExp("(^|\\.)" + namespaces.slice(0).sort().join(".*\\.") + "(\\.|$)");
+               var namespace = new RegExp("(^|\\.)" + namespaces.slice(0).sort().join("\\.(?:.*\\.)?") + "(\\.|$)");
 
                handlers = ( jQuery.data(this, "events") || {} )[ event.type ];
 
@@ -592,16 +592,18 @@ jQuery.each({
 
        event.special[orig] = {
                setup:function() {
-                       if ( this.addEventListener )
+                       if ( this.addEventListener ) {
                                this.addEventListener( orig, handle, true );
-                       else
+                       } else {
                                event.add( this, fix, ieHandler );
+                       }
                }, 
                teardown:function() { 
-                       if ( this.removeEventListener )
+                       if ( this.removeEventListener ) {
                                this.removeEventListener( orig, handle, true );
-                       else
+                       } else {
                                event.remove( this, fix, ieHandler );
+                       }
                }
        };
 });
@@ -693,13 +695,14 @@ jQuery.fn.extend({
 
                return this.click( jQuery.event.proxy( fn, function( event ) {
                        // Figure out which function to execute
-                       this.lastToggle = ( this.lastToggle || 0 ) % i;
+                       var lastToggle = ( jQuery.data( this, 'lastToggle' + fn.guid ) || 0 ) % i;
+                       jQuery.data( this, 'lastToggle' + fn.guid, lastToggle + 1 );
 
                        // Make sure that clicks stop
                        event.preventDefault();
 
                        // and execute the function
-                       return args[ this.lastToggle++ ].apply( this, arguments ) || false;
+                       return args[ lastToggle ].apply( this, arguments ) || false;
                }));
        },
 
@@ -791,6 +794,10 @@ jQuery.extend({
        ready: function() {
                // Make sure that the DOM is not already loaded
                if ( !jQuery.isReady ) {
+                       if ( !document.body ) {
+                               return setTimeout( jQuery.ready, 13 );
+                       }
+
                        // Remember that the DOM is ready
                        jQuery.isReady = true;
 
@@ -815,7 +822,7 @@ jQuery.extend({
 var readyBound = false;
 
 function bindReady() {
-       if ( readyBound ) return;
+       if ( readyBound ) { return; }
        readyBound = true;
 
        // Catch cases where $(document).ready() is called after the
@@ -838,32 +845,39 @@ function bindReady() {
                // maybe late but safe also for iframes
                document.attachEvent("onreadystatechange", function() {
                        // Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
-                       if ( document.readyState === "complete" && document.body ) {
+                       if ( document.readyState === "complete" ) {
                                document.detachEvent( "onreadystatechange", arguments.callee );
                                jQuery.ready();
                        }
                });
 
-               // If IE and not an iframe
+               // If IE and not a frame
                // continually check to see if the document is ready
-               // NOTE: DO NOT CHANGE TO ===, FAILS IN IE.
-               if ( document.documentElement.doScroll && window == window.top ) (function() {
-                       if ( jQuery.isReady ) {
-                               return;
-                       }
+               var toplevel = false;
 
-                       try {
-                               // If IE is used, use the trick by Diego Perini
-                               // http://javascript.nwbox.com/IEContentLoaded/
-                               document.documentElement.doScroll("left");
-                       } catch( error ) {
-                               setTimeout( arguments.callee, 0 );
-                               return;
-                       }
+               try {
+                       toplevel = window.frameElement == null;
+               } catch(e){}
 
-                       // and execute any waiting functions
-                       jQuery.ready();
-               })();
+               if ( document.documentElement.doScroll && toplevel ) {
+                       (function() {
+                               if ( jQuery.isReady ) {
+                                       return;
+                               }
+
+                               try {
+                                       // If IE is used, use the trick by Diego Perini
+                                       // http://javascript.nwbox.com/IEContentLoaded/
+                                       document.documentElement.doScroll("left");
+                               } catch( error ) {
+                                       setTimeout( arguments.callee, 0 );
+                                       return;
+                               }
+
+                               // and execute any waiting functions
+                               jQuery.ready();
+                       })();
+               }
        }
 
        // A fallback to window.onload, that will always work