Skip to content
Permalink
Browse files

Corrected RegExp to match event namespaces. Fixes #5303.

  • Loading branch information
rkatic authored and jeresig committed Nov 19, 2009
1 parent ac00fe5 commit 04dbdb7525eab7e845100fd17c48889bdb91dc92
Showing with 6 additions and 2 deletions.
  1. +2 −2 src/event.js
  2. +4 −0 test/unit/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 ];

@@ -192,6 +192,10 @@ test("bind(), multi-namespaced events", function() {
jQuery("#firstp").bind("click.test.abc",function(e){
check("click.test.abc", "Namespaced click triggered");
});

// Those would not trigger/unbind (#5303)
jQuery("#firstp").trigger("click.a.test");
jQuery("#firstp").unbind("click.a.test");

// Trigger both bound fn (1)
jQuery("#firstp").trigger("click.test.abc");

0 comments on commit 04dbdb7

Please sign in to comment.
You can’t perform that action at this time.