From 2371f6d54ee69356d898af0f2696a42a62950b50 Mon Sep 17 00:00:00 2001 From: Ayumi Date: Wed, 23 Dec 2020 16:36:23 +0000 Subject: [PATCH 1/2] Fix non-passive event listeners issue --- jquery.mousewheel.js | 8 ++++---- jquery.mousewheel.min.js | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/jquery.mousewheel.js b/jquery.mousewheel.js index 85debe53..8cd0264d 100644 --- a/jquery.mousewheel.js +++ b/jquery.mousewheel.js @@ -1,5 +1,5 @@ /*! - * jQuery Mousewheel 3.1.13 + * jQuery Mousewheel 3.2.0 * Copyright OpenJS Foundation and other contributors */ @@ -32,12 +32,12 @@ } var special = $.event.special.mousewheel = { - version: "3.1.12", + version: "3.2.0", setup: function() { if ( this.addEventListener ) { for ( var i = toBind.length; i; ) { - this.addEventListener( toBind[ --i ], handler, false ); + this.addEventListener( toBind[ --i ], handler, { passive: false } ); } } else { this.onmousewheel = handler; @@ -51,7 +51,7 @@ teardown: function() { if ( this.removeEventListener ) { for ( var i = toBind.length; i; ) { - this.removeEventListener( toBind[ --i ], handler, false ); + this.addEventListener( toBind[ --i ], handler, { passive: false } ); } } else { this.onmousewheel = null; diff --git a/jquery.mousewheel.min.js b/jquery.mousewheel.min.js index 71bbb440..bb1d1366 100644 --- a/jquery.mousewheel.min.js +++ b/jquery.mousewheel.min.js @@ -1,5 +1,5 @@ /*! - * jQuery Mousewheel 3.1.13 + * jQuery Mousewheel 3.2.0 * Copyright OpenJS Foundation and other contributors */ -!function(e){"function"==typeof define&&define.amd?define(["jquery"],e):"object"==typeof exports?module.exports=e:e(jQuery)}(function(u){var f,d,e=["wheel","mousewheel","DOMMouseScroll","MozMousePixelScroll"],t="onwheel"in window.document||9<=window.document.documentMode?["wheel"]:["mousewheel","DomMouseScroll","MozMousePixelScroll"],w=Array.prototype.slice;if(u.event.fixHooks)for(var i=e.length;i;)u.event.fixHooks[e[--i]]=u.event.mouseHooks;var c=u.event.special.mousewheel={version:"3.1.12",setup:function(){if(this.addEventListener)for(var e=t.length;e;)this.addEventListener(t[--e],n,!1);else this.onmousewheel=n;u.data(this,"mousewheel-line-height",c.getLineHeight(this)),u.data(this,"mousewheel-page-height",c.getPageHeight(this))},teardown:function(){if(this.removeEventListener)for(var e=t.length;e;)this.removeEventListener(t[--e],n,!1);else this.onmousewheel=null;u.removeData(this,"mousewheel-line-height"),u.removeData(this,"mousewheel-page-height")},getLineHeight:function(e){var t=u(e),i=t["offsetParent"in u.fn?"offsetParent":"parent"]();return i.length||(i=u("body")),parseInt(i.css("fontSize"),10)||parseInt(t.css("fontSize"),10)||16},getPageHeight:function(e){return u(e).height()},settings:{adjustOldDeltas:!0,normalizeOffset:!0}};function n(e){var t,i=e||window.event,n=w.call(arguments,1),o=0,l=0,s=0;if((e=u.event.fix(i)).type="mousewheel","detail"in i&&(s=-1*i.detail),"wheelDelta"in i&&(s=i.wheelDelta),"wheelDeltaY"in i&&(s=i.wheelDeltaY),"wheelDeltaX"in i&&(l=-1*i.wheelDeltaX),"axis"in i&&i.axis===i.HORIZONTAL_AXIS&&(l=-1*s,s=0),o=0===s?l:s,"deltaY"in i&&(o=s=-1*i.deltaY),"deltaX"in i&&(l=i.deltaX,0===s&&(o=-1*l)),0!==s||0!==l){if(1===i.deltaMode){var a=u.data(this,"mousewheel-line-height");o*=a,s*=a,l*=a}else if(2===i.deltaMode){var h=u.data(this,"mousewheel-page-height");o*=h,s*=h,l*=h}if(t=Math.max(Math.abs(s),Math.abs(l)),(!d||t Date: Wed, 23 Dec 2020 16:38:42 +0000 Subject: [PATCH 2/2] correction --- jquery.mousewheel.js | 2 +- jquery.mousewheel.min.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jquery.mousewheel.js b/jquery.mousewheel.js index 8cd0264d..ad55ca72 100644 --- a/jquery.mousewheel.js +++ b/jquery.mousewheel.js @@ -51,7 +51,7 @@ teardown: function() { if ( this.removeEventListener ) { for ( var i = toBind.length; i; ) { - this.addEventListener( toBind[ --i ], handler, { passive: false } ); + this.removeEventListener( toBind[ --i ], handler, false ); } } else { this.onmousewheel = null; diff --git a/jquery.mousewheel.min.js b/jquery.mousewheel.min.js index bb1d1366..64c93176 100644 --- a/jquery.mousewheel.min.js +++ b/jquery.mousewheel.min.js @@ -2,4 +2,4 @@ * jQuery Mousewheel 3.2.0 * Copyright OpenJS Foundation and other contributors */ -!function(e){"function"==typeof define&&define.amd?define(["jquery"],e):"object"==typeof exports?module.exports=e:e(jQuery)}(function(r){var d,f,e=["wheel","mousewheel","DOMMouseScroll","MozMousePixelScroll"],t="onwheel"in window.document||9<=window.document.documentMode?["wheel"]:["mousewheel","DomMouseScroll","MozMousePixelScroll"],w=Array.prototype.slice;if(r.event.fixHooks)for(var n=e.length;n;)r.event.fixHooks[e[--n]]=r.event.mouseHooks;var c=r.event.special.mousewheel={version:"3.2.0",setup:function(){if(this.addEventListener)for(var e=t.length;e;)this.addEventListener(t[--e],i,{passive:!1});else this.onmousewheel=i;r.data(this,"mousewheel-line-height",c.getLineHeight(this)),r.data(this,"mousewheel-page-height",c.getPageHeight(this))},teardown:function(){if(this.removeEventListener)for(var e=t.length;e;)this.addEventListener(t[--e],i,{passive:!1});else this.onmousewheel=null;r.removeData(this,"mousewheel-line-height"),r.removeData(this,"mousewheel-page-height")},getLineHeight:function(e){var t=r(e),n=t["offsetParent"in r.fn?"offsetParent":"parent"]();return n.length||(n=r("body")),parseInt(n.css("fontSize"),10)||parseInt(t.css("fontSize"),10)||16},getPageHeight:function(e){return r(e).height()},settings:{adjustOldDeltas:!0,normalizeOffset:!0}};function i(e){var t,n,i,o,l=e||window.event,s=w.call(arguments,1),a=0,h=0,u=0;if((e=r.event.fix(l)).type="mousewheel","detail"in l&&(u=-1*l.detail),"wheelDelta"in l&&(u=l.wheelDelta),"wheelDeltaY"in l&&(u=l.wheelDeltaY),"wheelDeltaX"in l&&(h=-1*l.wheelDeltaX),"axis"in l&&l.axis===l.HORIZONTAL_AXIS&&(h=-1*u,u=0),a=0===u?h:u,"deltaY"in l&&(a=u=-1*l.deltaY),"deltaX"in l&&(h=l.deltaX,0===u&&(a=-1*h)),0!==u||0!==h)return 1===l.deltaMode?(a*=n=r.data(this,"mousewheel-line-height"),u*=n,h*=n):2===l.deltaMode&&(a*=i=r.data(this,"mousewheel-page-height"),u*=i,h*=i),t=Math.max(Math.abs(u),Math.abs(h)),(!f||t