X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fevent.js;h=879f049f10da3a38807f6034b14dfad04efb986c;hb=04dbdb7525eab7e845100fd17c48889bdb91dc92;hp=e2087cc13cbdf77f7ff59056aeda292793458ced;hpb=5cb1163469fb2c9cd80712cd5481b29055821022;p=jquery.git

diff --git a/src/event.js b/src/event.js
index e2087cc..879f049 100644
--- a/src/event.js
+++ b/src/event.js
@@ -133,7 +133,7 @@ jQuery.event = {
 					var namespaces = type.split(".");
 					type = namespaces.shift();
 					var all = !namespaces.length,
-						namespace = new RegExp("(^|\\.)" + namespaces.slice(0).sort().join(".*\\.") + "(\\.|$)"),
+						namespace = new RegExp("(^|\\.)" + namespaces.slice().sort().join("\\.(?:.*\\.)?") + "(\\.|$)"),
 						special = this.special[ type ] || {};
 
 					if ( events[ type ] ) {
@@ -291,7 +291,7 @@ jQuery.event = {
 		// Cache this now, all = true means, any handler
 		all = !namespaces.length && !event.exclusive;
 
-		var namespace = new RegExp("(^|\\.)" + namespaces.slice(0).sort().join(".*\\.") + "(\\.|$)");
+		var namespace = new RegExp("(^|\\.)" + namespaces.slice().sort().join("\\.(?:.*\\.)?") + "(\\.|$)");
 
 		handlers = ( jQuery.data(this, "events") || {} )[ event.type ];
 
@@ -849,10 +849,15 @@ function bindReady() {
 			}
 		});
 
-		// If IE and not an iframe
+		// If IE and not a frame
 		// continually check to see if the document is ready
-		// NOTE: DO NOT CHANGE TO ===, FAILS IN IE.
-		if ( document.documentElement.doScroll && window == window.top ) (function() {
+		var toplevel = false;
+
+		try {
+			toplevel = window.frameElement == null;
+		} catch(e){}
+
+		if ( document.documentElement.doScroll && toplevel ) (function() {
 			if ( jQuery.isReady ) {
 				return;
 			}