Fixed typo in logic, also disabled function setters in this case to allow the functi...

[jquery.git] / src / event.js

diff --git a/src/event.js b/src/event.js
index 9abf838..0234998 100644 (file)
--- a/src/event.js
+++ b/src/event.js
@@ -604,6 +604,9 @@ jQuery.event.special.submit = {
                                        return trigger( "submit", this, arguments );
                                }
                        });
+
+               } else {
+                       return false;
                }
        },
 
@@ -752,7 +755,6 @@ jQuery.each(["bind", "one"], function( i, name ) {
                        for ( var key in type ) {
                                this[ name ](key, data, type[key], fn);
                        }
-
                        return this;
                }
                
@@ -767,17 +769,11 @@ jQuery.each(["bind", "one"], function( i, name ) {
                        return fn.apply( this, arguments );
                }) : fn;
 
-               if ( type === "unload" && name !== "one" ) {
-                       this.one( type, data, fn, thisObject );
-
-               } else {
-                       // Deprecated: Please don't expect an empty jQuery set to bind to document
-                       (!this.selector && !this.context ? jQuery(document) : this).each(function() {
+               return type === "unload" && name !== "one" ?
+                       this.one( type, data, fn, thisObject ) :
+                       this.each(function() {
                                jQuery.event.add( this, type, handler, data );
                        });
-               }
-
-               return this;
        };
 });
 
@@ -791,20 +787,14 @@ jQuery.fn.extend({
                        return this;
                }
 
-               // Deprecated: Please don't expect an empty jQuery set to bind to document
-               (!this.selector && !this.context ? jQuery(document) : this).each(function() {
+               return this.each(function() {
                        jQuery.event.remove( this, type, fn );
                });
-
-               return this;
        },
        trigger: function( type, data ) {
-               // Deprecated: Please don't expect an empty jQuery set to bind to document
-               (!this.selector && !this.context ? jQuery(document) : this).each(function() {
+               return this.each(function() {
                        jQuery.event.trigger( type, data, this );
                });
-
-               return this;
        },
 
        triggerHandler: function( type, data ) {
@@ -920,7 +910,7 @@ function liveConvert( type, selector ) {
        return ["live", type, selector.replace(/\./g, "`").replace(/ /g, "&")].join(".");
 }
 
-jQuery.each( ("blur focus load resize scroll unload click dblclick " +
+jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblclick " +
        "mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
        "change select submit keydown keypress keyup error").split(" "), function( i, name ) {
 
@@ -929,8 +919,8 @@ jQuery.each( ("blur focus load resize scroll unload click dblclick " +
                return fn ? this.bind( name, fn ) : this.trigger( name );
        };
 
-       if ( jQuery.fnAttr ) {
-               jQuery.fnAttr[ name ] = true;
+       if ( jQuery.attrFn ) {
+               jQuery.attrFn[ name ] = true;
        }
 });