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.

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

Core: Drop support for older jQuery & browsers, drop shorthands #252

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/workflows/browserstack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ jobs:
fail-fast: false
matrix:
BROWSER:
- 'IE_9'
- 'IE_10'
- 'IE_11'
- 'Safari_latest'
- 'Safari_latest-1'
Expand Down
48 changes: 0 additions & 48 deletions jtr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,55 +20,7 @@ runs:
- 3.6.4.min
- 3.6.4.slim
- 3.6.4.slim.min
- 3.5.1
- 3.5.1.min
- 3.5.1.slim
- 3.5.1.slim.min
- 3.4.1
- 3.4.1.min
- 3.4.1.slim
- 3.4.1.slim.min
- 3.3.1
- 3.3.1.min
- 3.3.1.slim
- 3.3.1.slim.min
- 3.2.1
- 3.2.1.min
- 3.2.1.slim
- 3.2.1.slim.min
- 3.1.1
- 3.1.1.min
- 3.1.1.slim
- 3.1.1.slim.min
- 3.0.0
- 3.0.0.min
- 3.0.0.slim
- 3.0.0.slim.min
- 2.2.4
- 2.2.4.min
- 2.1.4
- 2.1.4.min
- 2.0.3
- 2.0.3.min
- 1.12.4
- 1.12.4.min
- 1.11.3
- 1.11.3.min
- 1.10.2
- 1.10.2.min
- 1.9.1
- 1.9.1.min
- 1.8.3
- 1.8.3.min
- 1.7.2
- 1.7.2.min
- 1.6.4
- 1.6.4.min
- 1.5.2
- 1.5.2.min
- 1.4.4
- 1.4.4.min
- 1.3.2
- 1.3.2.min
- 1.2.6
- 1.2.6.min
15 changes: 9 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,15 @@
"test:unit": "jtr",
"test": "npm run build && npm run lint && npm run test:browser"
},
"dependencies": {
"jquery": ">=1.2.6"
"peerDependencies": {
"jquery": ">=1.12.4 <2 || >=2.2.4 <3 || >=3.6.4"
},
"devDependencies": {
"@swc/core": "1.11.8",
"eslint": "9.22.0",
"eslint-config-jquery": "3.0.2",
"globals": "16.0.0",
"jquery": "3.7.1",
"jquery-test-runner": "0.2.6",
"qunit": "2.24.1",
"requirejs": "2.3.7",
Expand Down
124 changes: 20 additions & 104 deletions src/jquery.mousewheel.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,43 +26,25 @@
"use strict";

var nullLowestDeltaTimeout, lowestDelta,
modernEvents = !!$.fn.on,
toFix = [ "wheel", "mousewheel", "DOMMouseScroll", "MozMousePixelScroll" ],
toBind = ( "onwheel" in window.document || window.document.documentMode >= 9 ) ?
[ "wheel" ] : [ "mousewheel", "DomMouseScroll", "MozMousePixelScroll" ],
slice = Array.prototype.slice;

if ( $.event.fixHooks ) {
for ( var i = toFix.length; i; ) {
$.event.fixHooks[ toFix[ --i ] ] = $.event.mouseHooks;
}
$.event.fixHooks.wheel = $.event.mouseHooks;
}

var special = $.event.special.mousewheel = {
version: "@VERSION",

setup: function() {
if ( this.addEventListener ) {
for ( var i = toBind.length; i; ) {
this.addEventListener( toBind[ --i ], handler, false );
}
} else {
this.onmousewheel = handler;
}
this.addEventListener( "wheel", handler, false );

// Store the line height and page height for this particular element
$.data( this, "mousewheel-line-height", special.getLineHeight( this ) );
$.data( this, "mousewheel-page-height", special.getPageHeight( this ) );
},

teardown: function() {
if ( this.removeEventListener ) {
for ( var i = toBind.length; i; ) {
this.removeEventListener( toBind[ --i ], handler, false );
}
} else {
this.onmousewheel = null;
}
this.removeEventListener( "wheel", handler, false );

// Clean up the data we added to the element
$.removeData( this, "mousewheel-line-height" );
Expand All @@ -71,77 +53,40 @@

getLineHeight: function( elem ) {
var $elem = $( elem ),
$parent = $elem[ "offsetParent" in $.fn ? "offsetParent" : "parent" ]();
$parent = $elem.offsetParent();
if ( !$parent.length ) {
$parent = $( "body" );
}
return parseInt( $parent.css( "fontSize" ), 10 ) ||
parseInt( $elem.css( "fontSize" ), 10 ) || 16;
parseInt( $elem.css( "fontSize" ), 10 ) || 16;
},

getPageHeight: function( elem ) {
return $( elem ).height();
},

settings: {
adjustOldDeltas: true, // see shouldAdjustOldDeltas() below
normalizeOffset: true // calls getBoundingClientRect for each event
}
};

$.fn.extend( {
mousewheel: function( fn ) {
return fn ?
this[ modernEvents ? "on" : "bind" ]( "mousewheel", fn ) :
this.trigger( "mousewheel" );
},

unmousewheel: function( fn ) {
return this[ modernEvents ? "off" : "unbind" ]( "mousewheel", fn );
}
} );

function handler( origEvent ) {
var args = slice.call( arguments, 1 ),
delta = 0,
deltaX = 0,
deltaY = 0,
absDelta = 0,
event = $.event.fix( origEvent );

function handler( event ) {
var orgEvent = event || window.event,
args = slice.call( arguments, 1 ),
delta = 0,
deltaX = 0,
deltaY = 0,
absDelta = 0;
event = $.event.fix( orgEvent );
event.type = "mousewheel";

// Old school scrollwheel delta
if ( "detail" in orgEvent ) {
deltaY = orgEvent.detail * -1;
}
if ( "wheelDelta" in orgEvent ) {
deltaY = orgEvent.wheelDelta;
}
if ( "wheelDeltaY" in orgEvent ) {
deltaY = orgEvent.wheelDeltaY;
}
if ( "wheelDeltaX" in orgEvent ) {
deltaX = orgEvent.wheelDeltaX * -1;
}

// Firefox < 17 horizontal scrolling related to DOMMouseScroll event
if ( "axis" in orgEvent && orgEvent.axis === orgEvent.HORIZONTAL_AXIS ) {
deltaX = deltaY * -1;
deltaY = 0;
}

// Set delta to be deltaY or deltaX if deltaY is 0 for backwards compatability
delta = deltaY === 0 ? deltaX : deltaY;

// New school wheel delta (wheel event)
if ( "deltaY" in orgEvent ) {
deltaY = orgEvent.deltaY * -1;
if ( "deltaY" in origEvent ) {
deltaY = origEvent.deltaY * -1;
delta = deltaY;
}
if ( "deltaX" in orgEvent ) {
deltaX = orgEvent.deltaX;
if ( "deltaX" in origEvent ) {
deltaX = origEvent.deltaX;
if ( deltaY === 0 ) {
delta = deltaX * -1;
}
Expand All @@ -157,12 +102,12 @@
// * deltaMode 0 is by pixels, nothing to do
// * deltaMode 1 is by lines
// * deltaMode 2 is by pages
if ( orgEvent.deltaMode === 1 ) {
if ( origEvent.deltaMode === 1 ) {
var lineHeight = $.data( this, "mousewheel-line-height" );
delta *= lineHeight;
deltaY *= lineHeight;
deltaX *= lineHeight;
} else if ( orgEvent.deltaMode === 2 ) {
} else if ( origEvent.deltaMode === 2 ) {
var pageHeight = $.data( this, "mousewheel-page-height" );
delta *= pageHeight;
deltaY *= pageHeight;
Expand All @@ -174,20 +119,6 @@

if ( !lowestDelta || absDelta < lowestDelta ) {
lowestDelta = absDelta;

// Adjust older deltas if necessary
if ( shouldAdjustOldDeltas( orgEvent, absDelta ) ) {
lowestDelta /= 40;
}
}

// Adjust older deltas if necessary
if ( shouldAdjustOldDeltas( orgEvent, absDelta ) ) {

// Divide all the things by 40!
delta /= 40;
deltaX /= 40;
deltaY /= 40;
}

// Get a whole, normalized value for the deltas
Expand Down Expand Up @@ -219,27 +150,12 @@
// handle multiple device types that give different
// a different lowestDelta
// Ex: trackpad = 3 and mouse wheel = 120
if ( nullLowestDeltaTimeout ) {
window.clearTimeout( nullLowestDeltaTimeout );
}
window.clearTimeout( nullLowestDeltaTimeout );
nullLowestDeltaTimeout = window.setTimeout( function() {
lowestDelta = null;
}, 200 );

return ( $.event.dispatch || $.event.handle ).apply( this, args );
}

function shouldAdjustOldDeltas( orgEvent, absDelta ) {

// If this is an older event and the delta is divisible by 120,
// then we are assuming that the browser is treating this as an
// older mouse wheel event and that we should divide the deltas
// by 40 to try and get a more usable deltaFactor.
// Side note, this actually impacts the reported scroll distance
// in older browsers and can cause scrolling to be slower than native.
// Turn this off by setting $.event.special.mousewheel.settings.adjustOldDeltas to false.
return special.settings.adjustOldDeltas && orgEvent.type === "mousewheel" &&
absDelta % 120 === 0;
return $.event.dispatch.apply( this, args );
}

} );
26 changes: 3 additions & 23 deletions test/unit.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@

QUnit.module( "mousewheel" );

var modernEvents = !!jQuery.fn.on,
on = modernEvents ? "on" : "bind";

function makeWheelEvent( deltaX, deltaY ) {
var event = window.document.createEvent( "Event" );
event.initEvent( "wheel", true, true );
Expand All @@ -19,37 +16,20 @@ QUnit.test( ".on() and .trigger()", function( assert ) {

var markup = jQuery( "<div>wheelme</div>" ).appendTo( "body" );

markup[ on ]( "mousewheel", function( e ) {
markup.on( "mousewheel", function( e ) {
assert.ok( true, "triggered a mousewheel event on " + e.target.innerText );
} );
markup.trigger( "mousewheel" );

markup.remove();
} );

QUnit.test( ".mousewheel() shorthand", function( assert ) {
assert.expect( 1 );

var markup = jQuery( "<p>wheelme</p>" ).appendTo( "body" );

markup.mousewheel( function( e ) {
assert.ok( true, "triggered a mousewheel event on " + e.target.innerText );
} );
markup.mousewheel();

// Should not trigger another event
markup.unmousewheel();
markup.mousewheel();

markup.remove();
} );

QUnit.test( "natively triggered events", function( assert ) {
assert.expect( 6 );

var markup = jQuery( "<p>wheelme</p>" ).appendTo( "body" );

markup[ on ]( "mousewheel", function( e ) {
markup.on( "mousewheel", function( e ) {
assert.ok( true, "triggered a mousewheel event on " + e.target.innerText );
assert.ok( "deltaX" in e, "got a deltaX in the event" );
assert.ok( !isNaN( parseFloat( e.deltaY ) ), "deltaY is a number: " + e.deltaY );
Expand All @@ -70,7 +50,7 @@ QUnit.test( "mouse event properties are passed through", function( assert ) {

var markup = jQuery( "<p>wheelme</p>" ).appendTo( "body" );

markup[ on ]( "mousewheel", function( e ) {
markup.on( "mousewheel", function( e ) {
var org = e.originalEvent;
assert.equal( org.clientX, 342, "original event has clientX: " + org.clientX );
assert.equal( org.clientY, 301, "original event has clientY: " + org.clientY );
Expand Down
Loading