No need to set returnValue if preventDefault exists. Thanks kangax for the catch.

[jquery.git] / src / event.js

diff --git a/src/event.js b/src/event.js
index 45f2202..1fec18c 100644 (file)
--- a/src/event.js
+++ b/src/event.js
@@ -1,3 +1,5 @@
+(function( jQuery ) {
+
 var rnamespaces = /\.(.*)$/,
        fcleanup = function( nm ) {
                return nm.replace(/[^\w\s\.\|`]/g, function( ch ) {
@@ -237,7 +239,7 @@ jQuery.event = {
                        // remove generic event handler if no more handlers exist
                        if ( eventType.length === 0 || pos != null && eventType.length === 1 ) {
                                if ( !special.teardown || special.teardown.call( elem, namespaces ) === false ) {
-                                       removeEvent( elem, type, elemData.handle );
+                                       jQuery.removeEvent( elem, type, elemData.handle );
                                }
 
                                ret = null;
@@ -525,7 +527,7 @@ jQuery.event = {
        }
 };
 
-var removeEvent = document.removeEventListener ?
+jQuery.removeEvent = document.removeEventListener ?
        function( elem, type, handle ) {
                if ( elem.removeEventListener ) {
                        elem.removeEventListener( type, handle, false );
@@ -581,9 +583,11 @@ jQuery.Event.prototype = {
                // if preventDefault exists run it on the original event
                if ( e.preventDefault ) {
                        e.preventDefault();
-               }
+
                // otherwise set the returnValue property of the original event to false (IE)
-               e.returnValue = false;
+               } else {
+                       e.returnValue = false;
+               }
        },
        stopPropagation: function() {
                this.isPropagationStopped = returnTrue;
@@ -1109,3 +1113,5 @@ if ( window.attachEvent && !window.addEventListener ) {
                }
        });
 }
+
+})( jQuery );