Commit c7838c36 authored by Dave Methvin's avatar Dave Methvin

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

parent b4120a74
...@@ -488,7 +488,8 @@ jQuery.event = { ...@@ -488,7 +488,8 @@ jQuery.event = {
props: "button buttons clientX clientY fromElement layerX layerY offsetX offsetY pageX pageY screenX screenY toElement wheelDelta".split(" "), props: "button buttons clientX clientY fromElement layerX layerY offsetX offsetY pageX pageY screenX screenY toElement wheelDelta".split(" "),
filter: function( event, original ) { filter: function( event, original ) {
var eventDoc, doc, body, var eventDoc, doc, body,
button = original.button; button = original.button,
fromElement = original.fromElement;
// Calculate pageX/Y if missing and clientX/Y available // Calculate pageX/Y if missing and clientX/Y available
if ( event.pageX == null && original.clientX != null ) { if ( event.pageX == null && original.clientX != null ) {
...@@ -501,8 +502,8 @@ jQuery.event = { ...@@ -501,8 +502,8 @@ jQuery.event = {
} }
// Add relatedTarget, if necessary // Add relatedTarget, if necessary
if ( !event.relatedTarget && original.fromElement ) { if ( !event.relatedTarget && fromElement ) {
event.relatedTarget = original.fromElement === event.target ? original.toElement : original.fromElement; event.relatedTarget = fromElement === event.target ? original.toElement : fromElement;
} }
// Add which for click: 1 === left; 2 === middle; 3 === right // Add which for click: 1 === left; 2 === middle; 3 === right
...@@ -523,7 +524,7 @@ jQuery.event = { ...@@ -523,7 +524,7 @@ 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 ] || {}, 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 ); event = jQuery.Event( originalEvent );
......
...@@ -2386,9 +2386,8 @@ test("delegated events quickIs", function() { ...@@ -2386,9 +2386,8 @@ test("delegated events quickIs", function() {
test("propHooks extensions", function() { test("propHooks extensions", function() {
expect( 3 ); expect( 3 );
jQuery( "<a id='hook-fixture' href=''></a>" ).appendTo( "#qunit-fixture" ); // 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( "#hook-fixture" );
// Ensure the property doesn't exist // Ensure the property doesn't exist
$fixture.bind( "focus", function( event ) { $fixture.bind( "focus", function( event ) {
......
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