Oops, order of operations.

[jquery.git] / src / event.js

diff --git a/src/event.js b/src/event.js
index f1cdfc9..da03813 100644 (file)
--- a/src/event.js
+++ b/src/event.js
@@ -163,7 +163,8 @@ jQuery.event = {
                }
        },
 
-       trigger: function( event, data, elem, bubbling /* internal */ ) {
+       // bubbling is internal
+       trigger: function( event, data, elem, bubbling ) {
                // Event object or event type
                var type = event.type || event;
 
@@ -199,16 +200,13 @@ jQuery.event = {
                        if ( !elem || elem.nodeType == 3 || elem.nodeType == 8 )
                                return undefined;
                        
-                       // AT_TARGET phase (not bubbling)
-                       if( !bubbling ){
-                               // Clean up in case it is reused
-                               event.result = undefined;
-                               event.target = elem;
-                               
-                               // Clone the incoming data, if any
-                               data = jQuery.makeArray(data);
-                               data.unshift( event );
-                       }
+                       // Clean up in case it is reused
+                       event.result = undefined;
+                       event.target = elem;
+                       
+                       // Clone the incoming data, if any
+                       data = jQuery.makeArray(data);
+                       data.unshift( event );
                }
 
                event.currentTarget = elem;
@@ -231,13 +229,13 @@ jQuery.event = {
                        } catch (e) {}
                }
 
+               this.triggered = false;
+
                if ( !event.isPropagationStopped() ) {
                        var parent = elem.parentNode || elem.ownerDocument;
                        if ( parent )
                                jQuery.event.trigger(event, data, parent, true);
                }
-
-               this.triggered = false;
        },
 
        handle: function(event) {
@@ -573,7 +571,7 @@ function liveHandler( event ){
 }
 
 function liveConvert(type, selector){
-       return ["live", type, selector.replace(/\./g, "_")].join(".");
+       return ["live", type, selector.replace(/\./g, "`").replace(/ /g, "|")].join(".");
 }
 
 jQuery.extend({