Commit e5b16e33 authored by Dave Methvin's avatar Dave Methvin

Rename jQuery.event.propHooks to .fixHooks.

We already have jQuery.propHooks for the .prop() method, so using the same name for unrelated functionality on a sub-namespace is crazy talk. Since the method involved is jQuery.event.fix(), this will hopefully tie them together. Oh, and it's shorter.
parent 30cc7ae7
...@@ -469,7 +469,7 @@ jQuery.event = { ...@@ -469,7 +469,7 @@ jQuery.event = {
// *** attrChange attrName relatedNode srcElement are not normalized, non-W3C, deprecated, will be removed in 1.8 *** // *** attrChange attrName relatedNode srcElement are not normalized, non-W3C, deprecated, will be removed in 1.8 ***
props: "attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "), props: "attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),
propHooks: {}, fixHooks: {},
keyHooks: { keyHooks: {
props: "char charCode key keyCode".split(" "), props: "char charCode key keyCode".split(" "),
...@@ -523,8 +523,8 @@ jQuery.event = { ...@@ -523,8 +523,8 @@ jQuery.event = {
// Create a writable copy of the event object and normalize some properties // Create a writable copy of the event object and normalize some properties
var originalEvent = event, var originalEvent = event,
propHook = jQuery.event.propHooks[ event.type ] || {}, fixHook = jQuery.event.fixHooks[ event.type ] || {},
copy = propHook.props ? this.props.concat( propHook.props ) : this.props; copy = fixHook.props ? this.props.concat( fixHook.props ) : this.props;
event = jQuery.Event( originalEvent ); event = jQuery.Event( originalEvent );
...@@ -548,7 +548,7 @@ jQuery.event = { ...@@ -548,7 +548,7 @@ jQuery.event = {
event.metaKey = event.ctrlKey; event.metaKey = event.ctrlKey;
} }
return propHook.filter? propHook.filter( event, originalEvent ) : event; return fixHook.filter? fixHook.filter( event, originalEvent ) : event;
}, },
// Deprecated, use jQuery.guid instead // Deprecated, use jQuery.guid instead
...@@ -1058,11 +1058,11 @@ jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblcl ...@@ -1058,11 +1058,11 @@ jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblcl
} }
if ( rkeyEvent.test( name ) ) { if ( rkeyEvent.test( name ) ) {
jQuery.event.propHooks[ name ] = jQuery.event.keyHooks; jQuery.event.fixHooks[ name ] = jQuery.event.keyHooks;
} }
if ( rmouseEvent.test( name ) ) { if ( rmouseEvent.test( name ) ) {
jQuery.event.propHooks[ name ] = jQuery.event.mouseHooks; jQuery.event.fixHooks[ name ] = jQuery.event.mouseHooks;
} }
}); });
......
...@@ -2386,26 +2386,20 @@ test("delegated events quickIs", function() { ...@@ -2386,26 +2386,20 @@ test("delegated events quickIs", function() {
markup.remove(); markup.remove();
}); });
test("propHooks extensions", function() { test("fixHooks extensions", function() {
expect( 2 ); expect( 2 );
// IE requires focusable elements to be visible, so append to body // IE requires focusable elements to be visible, so append to body
var $fixture = jQuery( "<input type='text' id='hook-fixture' />" ).appendTo( "body" ), var $fixture = jQuery( "<input type='text' id='hook-fixture' />" ).appendTo( "body" ),
saved = jQuery.event.propHooks.click; saved = jQuery.event.fixHooks.click;
// Ensure the property doesn't exist // Ensure the property doesn't exist
$fixture.bind( "click", function( event ) { $fixture.bind( "click", function( event ) {
ok( !("blurrinessLevel" in event), "event.blurrinessLevel does not exist" ); ok( !("blurrinessLevel" in event), "event.blurrinessLevel does not exist" );
})[0].click(); })[0].click();
$fixture.unbind( "click" );
// Must blur the link so click works below jQuery.event.fixHooks.click = {
$fixture.unbind( "click" )[0].blur();
// Define a custom property for "click" events via the filter function
//ok( !jQuery.event.propHooks.click, "We aren't clobbering an existing click hook" );
jQuery.event.propHooks.click = {
filter: function( event, originalEvent ) { filter: function( event, originalEvent ) {
event.blurrinessLevel = 42; event.blurrinessLevel = 42;
return event; return event;
...@@ -2417,9 +2411,9 @@ test("propHooks extensions", function() { ...@@ -2417,9 +2411,9 @@ test("propHooks extensions", function() {
equals( event.blurrinessLevel, 42, "event.blurrinessLevel was set" ); equals( event.blurrinessLevel, 42, "event.blurrinessLevel was set" );
})[0].click(); })[0].click();
delete jQuery.event.propHooks.click; delete jQuery.event.fixHooks.click;
$fixture.unbind( "click" ).remove(); $fixture.unbind( "click" ).remove();
jQuery.event.propHooks.click = saved; jQuery.event.fixHooks.click = saved;
}); });
(function(){ (function(){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment