git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Corrected RegExp to match event namespaces. Fixes #5303.
[jquery.git]
/
src
/
event.js
diff --git
a/src/event.js
b/src/event.js
index
e2087cc
..
879f049
100644
(file)
--- 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,
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 ] ) {
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;
// 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 ];
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
// 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;
}
if ( jQuery.isReady ) {
return;
}