@glitchr/stickyjs 1.0.27 → 1.0.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glitchr/stickyjs",
-  "version": "1.0.27",
+  "version": "1.0.28",
   "description": "Sticky scroll library",
   "main": "src/index.js",
   "repository": {

package/src/js/sticky.js

@@ -207,7 +207,8 @@ $.fn.serializeObject = function () {
             "right":false ,
         },
 
-        "scrollpercent"           : true   ,
+        "passive": false,
+        "scrollpercent"        : true   ,
 
         "scrollsnap"           : true   ,
         "scrollsnap_start"     : "start", //start, center, end
@@ -804,7 +805,6 @@ $.fn.serializeObject = function () {
 
     Sticky.enableScroll = function(el = window) {
 
-        console.log(el);
         // left: 37, up: 38, right: 39, down: 40,
         // spacebar: 32, pageup: 33, pagedown: 34, end: 35, home: 36
         var keys = {37: 1, 38: 1, 39: 1, 40: 1};
@@ -825,9 +825,10 @@ $.fn.serializeObject = function () {
             }));
         } catch(e) {}
 
-        var wheelOpt = supportsPassive ? { passive: true } : false;
+        var wheelOpt = supportsPassive ? { passive: false } : false;
         var wheelEvent = 'onwheel' in document.createElement('div') ? 'wheel.preventDefault' : 'mousewheel.preventDefault';
 
+        el.addEventListener('DOMMouseScroll', preventDefault, false); // older FF
         el.addEventListener(wheelEvent, preventDefault, wheelOpt); // modern desktop
         el.addEventListener('touchmove.preventDefault', preventDefault, wheelOpt); // mobile
         el.addEventListener('keydown.preventDefault', preventDefaultForScrollKeys, false);
@@ -856,9 +857,10 @@ $.fn.serializeObject = function () {
             }));
         } catch(e) {}
 
-        var wheelOpt = supportsPassive ? { passive: true } : false;
+        var wheelOpt = supportsPassive ? { passive: false } : false;
         var wheelEvent = 'onwheel' in document.createElement('div') ? 'wheel.preventDefault' : 'mousewheel.preventDefault';
 
+        el.removeEventListener('DOMMouseScroll.preventDefault', preventDefault, false);
         el.removeEventListener(wheelEvent, preventDefault, wheelOpt);
         el.removeEventListener('touchmove.preventDefault', preventDefault, wheelOpt);
         el.removeEventListener('keydown.preventDefault', preventDefaultForScrollKeys, false);
@@ -989,6 +991,8 @@ $.fn.serializeObject = function () {
         if (Settings.debug) console.log(show,"Sticky magnetic:", scrollSnap, scrollSnapStart, scrollSnapProximity);
         if(!Settings.ready) return;
 
+        if(Sticky.get("passive") == true) return;
+
         var scrollSnap = Sticky.get("scrollsnap");
         if(!scrollSnap) return;
 
@@ -1595,7 +1599,9 @@ $.fn.serializeObject = function () {
 
         Sticky.reset(el);
 
-        $(el).on('wheel.sticky', Sticky.onWheel, {passive: true});
+        if(Sticky.get("passive") == false)
+            $(el).on('wheel.sticky', Sticky.onWheel);
+
         $(el).on('scrolldelta.sticky', Sticky.onScrollDelta);
         $(el).on('scrolldelta.sticky', Sticky.debounce(Sticky.onScrollDebounce, 1000*Sticky.parseDuration(Sticky.get("debounce"))));
 
@@ -1718,7 +1724,7 @@ $.fn.serializeObject = function () {
                             if(autoscrollTimeout != undefined) clearTimeout(autoscrollTimeout);
                             $(scroller).prop("user-scroll", true);
                             $(scroller).stop();
-                        }, {passive: true});
+                        });
 
                         $(scroller).on("mouseleave.autoscroll touchend.autoscroll");
                         $(scroller).on("mouseleave.autoscroll touchend.autoscroll", function() {
@@ -1729,11 +1735,12 @@ $.fn.serializeObject = function () {
                                 $(scroller).data("autoscroll-prevent", "true");
                                 $(scroller).off("mouseleave.autoscroll touchend.autoscroll");
                             }
-                        }, {passive: true});
+                        });
 
                         $(scroller).on("onbeforeunload.autoscroll");
                         $(scroller).on("onbeforeunload.autoscroll", function() {
 
+                            $(this).off("mousewheel.autoscroll touchstart.autoscroll");
                             $(this).off("mouseenter.autoscroll touchstart.autoscroll");
                             $(this).off("mouseleave.autoscroll touchend.autoscroll");
                             $(this).off("scroll.autoscroll");
@@ -1741,7 +1748,7 @@ $.fn.serializeObject = function () {
 
                             var scrollerWindow = $(this).closestScrollableWindow();
                             $(scrollerWindow).off("scroll.autoscroll");
-                        }, {passive: true});
+                        });
                     }
 
                     //
@@ -1757,7 +1764,7 @@ $.fn.serializeObject = function () {
 
                             $(this).prop("user-scroll", true);
                             $(this).stop();
-                        }, {passive: true});
+                        });
 
                         if (Settings.debug) console.log("Autoscroll reverse delay applied is \"" + reverseDelay + "\".");
                         setTimeout(() => Sticky.scrollTo({