Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Minor cleanups to code. Futile effort to get IE to pass the unit test.

  • Loading branch information...
commit c7838c3607239b0231128b270762609703ae3893 1 parent b4120a7
@dmethvin dmethvin authored
Showing with 7 additions and 7 deletions.
  1. +5 −4 src/event.js
  2. +2 −3 test/unit/event.js
View
9 src/event.js
@@ -488,7 +488,8 @@ jQuery.event = {
props: "button buttons clientX clientY fromElement layerX layerY offsetX offsetY pageX pageY screenX screenY toElement wheelDelta".split(" "),
filter: function( event, original ) {
var eventDoc, doc, body,
- button = original.button;
+ button = original.button,
+ fromElement = original.fromElement;
// Calculate pageX/Y if missing and clientX/Y available
if ( event.pageX == null && original.clientX != null ) {
@@ -501,8 +502,8 @@ jQuery.event = {
}
// Add relatedTarget, if necessary
- if ( !event.relatedTarget && original.fromElement ) {
- event.relatedTarget = original.fromElement === event.target ? original.toElement : original.fromElement;
+ if ( !event.relatedTarget && fromElement ) {
+ event.relatedTarget = fromElement === event.target ? original.toElement : fromElement;
}
// Add which for click: 1 === left; 2 === middle; 3 === right
@@ -523,7 +524,7 @@ 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;
+ copy = propHook.props ? this.props.concat( propHook.props ) : this.props;
event = jQuery.Event( originalEvent );
View
5 test/unit/event.js
@@ -2386,9 +2386,8 @@ test("delegated events quickIs", function() {
test("propHooks extensions", function() {
expect( 3 );
- jQuery( "<a id='hook-fixture' href=''></a>" ).appendTo( "#qunit-fixture" );
-
- var $fixture = jQuery( "#hook-fixture" );
+ // IE requires focusable elements to be visible, so append to body
+ var $fixture = jQuery( "<input type='text' id='hook-fixture' />" ).appendTo( "body" );
// Ensure the property doesn't exist
$fixture.bind( "focus", function( event ) {
Please sign in to comment.
Something went wrong with that request. Please try again.