Clean up in jQuery.event.add for assigning a handler.guid

[jquery.git] / src / event / event.js

diff --git a/src/event/event.js b/src/event/event.js
index b49e175..c1dbec6 100644 (file)
--- a/src/event/event.js
+++ b/src/event/event.js
@@ -13,6 +13,10 @@ jQuery.event = {
                if ( jQuery.browser.msie && element.setInterval != undefined )
                        element = window;
                
+               // Make sure that the function being executed has a unique ID
+               if ( !handler.guid )
+                       handler.guid = this.guid++;
+                       
                // if data is passed, bind to handler 
                if( data != undefined ) { 
                // Create temporary function pointer to original handler 
@@ -31,13 +35,6 @@ jQuery.event = {
                        handler.guid = fn.guid;
                }
 
-               // Make sure that the function being executed has a unique ID
-               if ( !handler.guid ) {
-                       handler.guid = this.guid++;
-                       // Don't forget to set guid for the original handler function
-                       if (fn) fn.guid = handler.guid;
-               }
-
                // Init the element's event structure
                if (!element.$events)
                        element.$events = {};