diff options
| author | Dave Methvin <dave.methvin@gmail.com> | 2011-10-05 21:41:32 -0400 |
|---|---|---|
| committer | Dave Methvin <dave.methvin@gmail.com> | 2011-10-05 21:41:32 -0400 |
| commit | e5b16e3356358a17c54c647b129e44cb09076ec8 (patch) | |
| tree | 637981f7cafaa8b0fe9254942df4ad822d2b254b | |
| parent | 30cc7ae75cb9a65db70168340a7d3717ab8a0e9e (diff) | |
| download | jquery-e5b16e3356358a17c54c647b129e44cb09076ec8.tar.gz jquery-e5b16e3356358a17c54c647b129e44cb09076ec8.zip | |
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.
| -rw-r--r-- | src/event.js | 12 | ||||
| -rw-r--r-- | test/unit/event.js | 18 |
2 files changed, 12 insertions, 18 deletions
diff --git a/src/event.js b/src/event.js index fba8f817a..b7bbe5386 100644 --- a/src/event.js +++ b/src/event.js @@ -469,7 +469,7 @@ jQuery.event = { // *** 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(" "), - propHooks: {}, + fixHooks: {}, keyHooks: { props: "char charCode key keyCode".split(" "), @@ -523,8 +523,8 @@ jQuery.event = { // Create a writable copy of the event object and normalize some properties var originalEvent = event, - propHook = jQuery.event.propHooks[ event.type ] || {}, - copy = propHook.props ? this.props.concat( propHook.props ) : this.props; + fixHook = jQuery.event.fixHooks[ event.type ] || {}, + copy = fixHook.props ? this.props.concat( fixHook.props ) : this.props; event = jQuery.Event( originalEvent ); @@ -548,7 +548,7 @@ jQuery.event = { 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 @@ -1058,11 +1058,11 @@ jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblcl } if ( rkeyEvent.test( name ) ) { - jQuery.event.propHooks[ name ] = jQuery.event.keyHooks; + jQuery.event.fixHooks[ name ] = jQuery.event.keyHooks; } if ( rmouseEvent.test( name ) ) { - jQuery.event.propHooks[ name ] = jQuery.event.mouseHooks; + jQuery.event.fixHooks[ name ] = jQuery.event.mouseHooks; } }); diff --git a/test/unit/event.js b/test/unit/event.js index 632254353..9bf9f788c 100644 --- a/test/unit/event.js +++ b/test/unit/event.js @@ -2386,26 +2386,20 @@ test("delegated events quickIs", function() { markup.remove(); }); -test("propHooks extensions", function() { +test("fixHooks extensions", function() { expect( 2 ); // IE requires focusable elements to be visible, so append to 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 $fixture.bind( "click", function( event ) { ok( !("blurrinessLevel" in event), "event.blurrinessLevel does not exist" ); })[0].click(); + $fixture.unbind( "click" ); - // Must blur the link so click works below - $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 = { + jQuery.event.fixHooks.click = { filter: function( event, originalEvent ) { event.blurrinessLevel = 42; return event; @@ -2417,9 +2411,9 @@ test("propHooks extensions", function() { equals( event.blurrinessLevel, 42, "event.blurrinessLevel was set" ); })[0].click(); - delete jQuery.event.propHooks.click; + delete jQuery.event.fixHooks.click; $fixture.unbind( "click" ).remove(); - jQuery.event.propHooks.click = saved; + jQuery.event.fixHooks.click = saved; }); (function(){ |