Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix WheelEvent incorrectly flipping sign of deltaY #778

Merged
merged 1 commit into from
Jan 10, 2014
Merged

Fix WheelEvent incorrectly flipping sign of deltaY #778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 10 additions & 7 deletions src/event/synthetic/SyntheticWheelEvent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ var SyntheticMouseEvent = require('SyntheticMouseEvent');
*/
var WheelEventInterface = {
deltaX: function(event) {
// NOTE: IE<9 does not support x-axis delta.
return (
'deltaX' in event ? event.deltaX :
// Fallback to `wheelDeltaX` for Webkit and normalize (right is positive).
Expand All @@ -36,15 +35,19 @@ var WheelEventInterface = {
},
deltaY: function(event) {
return (
// Normalize (up is positive).
'deltaY' in event ? -event.deltaY :
// Fallback to `wheelDeltaY` for Webkit.
'wheelDeltaY' in event ? event.wheelDeltaY :
// Fallback to `wheelDelta` for IE<9.
'wheelDelta' in event ? event.wheelDelta : 0
'deltaY' in event ? event.deltaY :
// Fallback to `wheelDeltaY` for Webkit and normalize (down is positive).
'wheelDeltaY' in event ? -event.wheelDeltaY :
// Fallback to `wheelDelta` for IE<9 and normalize (down is positive).
'wheelDelta' in event ? -event.wheelDelta : 0
);
},
deltaZ: null,

// Browsers without "deltaMode" is reporting in raw wheel delta where one
// notch on the scroll is always +/- 120, roughly equivalent to pixels.
// A good approximation of DOM_DELTA_LINE (1) is 5% of viewport size or
// ~40 pixels, for DOM_DELTA_SCREEN (2) it is 87.5% of viewport size.
deltaMode: null
};

Expand Down
4 changes: 2 additions & 2 deletions src/event/synthetic/__tests__/SyntheticWheelEvent-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@ describe('SyntheticWheelEvent', function() {
it('should normalize properties from the WheelEvent interface', function() {
var standardEvent = createEvent({deltaX: 10, deltaY: -50});
expect(standardEvent.deltaX).toBe(10);
expect(standardEvent.deltaY).toBe(50);
expect(standardEvent.deltaY).toBe(-50);

var webkitEvent = createEvent({wheelDeltaX: -10, wheelDeltaY: 50});
expect(webkitEvent.deltaX).toBe(10);
expect(webkitEvent.deltaY).toBe(50);
expect(webkitEvent.deltaY).toBe(-50);
});

it('should be able to `preventDefault` and `stopPropagation`', function() {
Expand Down