- Fixed bug: overflow:scroll isn't scrollable inside scrollOverflow alvarotrigo#3725

alvarotrigo · alvarotrigo · commit ae6e90d04700 · 2019-09-24T13:14:20.000+02:00
diff --git a/src/fullpage.js b/src/fullpage.js
@@ -1,5 +1,5 @@
 /*!
- * fullPage 3.0.7
+ * fullPage 3.0.8
  * https://github.com/alvarotrigo/fullPage.js
  *
  * @license GPLv3 for open source use only
@@ -760,6 +760,7 @@
             //coming from closing a normalScrollElements modal or moving outside viewport?
             if(target == document || !target){
                 setMouseHijack(true);
+                options.scrollOverflowHandler.setIscroll(target, true);
                 return;
             }
 
@@ -788,6 +789,7 @@
                     if(isNormalScrollTarget || isNormalScrollChildFocused){
                         if(!FP.shared.isNormalScrollElement){
                             setMouseHijack(false);
+                            options.scrollOverflowHandler.setIscroll(target, false);
                         }
                         FP.shared.isNormalScrollElement = true;
                         isInsideOneNormalScroll = true;
@@ -798,6 +800,7 @@
             //not inside a single normal scroll element anymore?
             if(!isInsideOneNormalScroll && FP.shared.isNormalScrollElement){
                 setMouseHijack(true);
+                options.scrollOverflowHandler.setIscroll(target, true);
                 FP.shared.isNormalScrollElement = false;
             }
         }
diff --git a/vendors/scrolloverflow.js b/vendors/scrolloverflow.js
@@ -2139,7 +2139,7 @@ if ( typeof module != 'undefined' && module.exports ) {
 
 
 /*!
-* Scrolloverflow 2.0.4 module for fullPage.js >= 3
+* Scrolloverflow 2.0.5 module for fullPage.js >= 3
 * https://github.com/alvarotrigo/fullPage.js
 * @license MIT licensed
 *
@@ -2397,6 +2397,16 @@ if ( typeof module != 'undefined' && module.exports ) {
                 });
             },
 
+            // Enables or disables the whole iScroll feature based on the given parameter.
+            setIscroll: function(target, enable){
+                var scrollable = fp_utils.closest(target, SCROLLABLE_SEL) || $(SCROLLABLE_SEL, target)[0];
+                var action = enable ? 'enable' : 'disable';
+                
+                if(scrollable){
+                    scrollable.fp_iscrollInstance[action]();
+                }
+            },
+
             /**
             * Turns off iScroll for the destination section.
             * When scrolling very fast on some trackpads (and Apple laptops) the inertial scrolling would

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*!`
`2`		`- * fullPage 3.0.7`
	`2`	`+ * fullPage 3.0.8`
`3`	`3`	`* https://github.com/alvarotrigo/fullPage.js`
`4`	`4`	`*`
`5`	`5`	`* @license GPLv3 for open source use only`
`@@ -760,6 +760,7 @@`
`760`	`760`	`//coming from closing a normalScrollElements modal or moving outside viewport?`
`761`	`761`	`if(target == document \|\| !target){`
`762`	`762`	`setMouseHijack(true);`
	`763`	`+ options.scrollOverflowHandler.setIscroll(target, true);`
`763`	`764`	`return;`
`764`	`765`	`}`
`765`	`766`
`@@ -788,6 +789,7 @@`
`788`	`789`	`if(isNormalScrollTarget \|\| isNormalScrollChildFocused){`
`789`	`790`	`if(!FP.shared.isNormalScrollElement){`
`790`	`791`	`setMouseHijack(false);`
	`792`	`+ options.scrollOverflowHandler.setIscroll(target, false);`
`791`	`793`	`}`
`792`	`794`	`FP.shared.isNormalScrollElement = true;`
`793`	`795`	`isInsideOneNormalScroll = true;`
`@@ -798,6 +800,7 @@`
`798`	`800`	`//not inside a single normal scroll element anymore?`
`799`	`801`	`if(!isInsideOneNormalScroll && FP.shared.isNormalScrollElement){`
`800`	`802`	`setMouseHijack(true);`
	`803`	`+ options.scrollOverflowHandler.setIscroll(target, true);`
`801`	`804`	`FP.shared.isNormalScrollElement = false;`
`802`	`805`	`}`
`803`	`806`	`}`