X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fevent.js;h=a50fe89fc59be80a5826acbe4c672ff0d197b5c0;hb=b1a40c9bfdbbfce5416e4dfa52577379bdcc0a74;hp=1ba0357d2252760091d6310bcade548de394a9d9;hpb=ec7baf230d3c246dadf00c94115e6668425b9354;p=jquery.git

diff --git a/src/event.js b/src/event.js
index 1ba0357..a50fe89 100644
--- a/src/event.js
+++ b/src/event.js
@@ -240,7 +240,8 @@ jQuery.event = {
 		var all, handlers;
 
 		event = arguments[0] = jQuery.event.fix( event || window.event );
-
+		event.currentTarget = this;
+		
 		// Namespaced event handlers
 		var namespaces = event.type.split(".");
 		event.type = namespaces.shift();
@@ -377,13 +378,13 @@ jQuery.Event = function( src ){
 	if( src && src.type ){
 		this.originalEvent = src;
 		this.type = src.type;
-		this.timeStamp = src.timeStamp;
 	// Event type
 	}else
 		this.type = src;
 
-	if( !this.timeStamp )
-		this.timeStamp = now();
+	// timeStamp is buggy for some events on Firefox(#3843)
+	// So we won't rely on the native value
+	this.timeStamp = now();
 	
 	// Mark it as fixed
 	this[expando] = true;
@@ -560,15 +561,26 @@ jQuery.fn.extend({
 
 function liveHandler( event ){
 	var check = RegExp("(^|\\.)" + event.type + "(\\.|$)"),
-		stop = true;
+		stop = true,
+		elems = [];
 
 	jQuery.each(jQuery.data(this, "events").live || [], function(i, fn){
-		if ( !event.isImmediatePropagationStopped() && check.test(fn.type) ) {
+		if ( check.test(fn.type) ) {
 			var elem = jQuery(event.target).closest(fn.data)[0];
-			if ( elem && fn.call(elem, event, fn.data) === false )
-				stop = false;
+			if ( elem )
+				elems.push({ elem: elem, fn: fn });
 		}
 	});
+
+	elems.sort(function(a,b) {
+		return jQuery.data(a.elem, "closest") - jQuery.data(b.elem, "closest");
+	});
+	
+	jQuery.each(elems, function(){
+		if ( this.fn.call(this.elem, event, this.fn.data) === false )
+			return (stop = false);
+	});
+
 	return stop;
 }
 
@@ -630,7 +642,7 @@ function bindReady(){
 
 		// If IE and not an iframe
 		// continually check to see if the document is ready
-		if ( document.documentElement.doScroll && !window.frameElement ) (function(){
+		if ( document.documentElement.doScroll && window == window.top ) (function(){
 			if ( jQuery.isReady ) return;
 
 			try {