From 4534db196bf9475c79f74d6b62ebc866c27d06d9 Mon Sep 17 00:00:00 2001 From: Dave Methvin Date: Tue, 13 Dec 2011 22:29:35 -0500 Subject: [PATCH] Fix #11021. There should be no mangling of the "hover" namespace. --- src/event.js | 2 +- test/unit/event.js | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/event.js b/src/event.js index 8385008b2..98822bdaf 100644 --- a/src/event.js +++ b/src/event.js @@ -2,7 +2,7 @@ var rformElems = /^(?:textarea|input|select)$/i, rtypenamespace = /^([^\.]*)?(?:\.(.+))?$/, - rhoverHack = /\bhover(\.\S+)?\b/, + rhoverHack = /(?:^|\s)hover(\.\S+)?\b/, rkeyEvent = /^key/, rmouseEvent = /^(?:mouse|contextmenu)|click/, rfocusMorph = /^(?:focusinfocus|focusoutblur)$/, diff --git a/test/unit/event.js b/test/unit/event.js index c5481ab0e..81571506b 100644 --- a/test/unit/event.js +++ b/test/unit/event.js @@ -787,7 +787,7 @@ test("unbind(eventObject)", function() { }); test("hover() and hover pseudo-event", function() { - expect(2); + expect(3); var times = 0, handler1 = function( event ) { ++times; }, @@ -810,6 +810,9 @@ test("hover() and hover pseudo-event", function() { .on( "hovercraft", function() { ok( false, "hovercraft is full of ills" ); }) + .on( "click.hover.me.not", function( e ) { + equal( e.handleObj.namespace, "hover.me.not", "hover hack doesn't mangle namespaces" ); + }) .bind("hover", function( e ) { if ( e.type === "mouseenter" ) { balance++; @@ -819,6 +822,7 @@ test("hover() and hover pseudo-event", function() { ok( false, "hover pseudo: unknown event type "+e.type ); } }) + .trigger("click") .trigger("mouseenter") .trigger("mouseleave") .unbind("hover") -- 2.39.5