Merge pull request #4361 from alvarotrigo/dev

Merging Dev branch 4.0.5
alvarotrigo · Apr 12, 2022 · 97bd920 · 97bd920
2 parents 0955c40 + 1bfdae9
commit 97bd920
Show file tree

Hide file tree

Showing 24 changed files with 56 additions and 33 deletions.
diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@
 
 ---
 
-![fullPage.js version](http://img.shields.io/badge/fullPage.js-v4.0.4-brightgreen.svg)
+![fullPage.js version](http://img.shields.io/badge/fullPage.js-v4.0.5-brightgreen.svg)
 [![License](https://img.shields.io/badge/License-GPL-blue.svg)](https://www.gnu.org/licenses/gpl-3.0.html)
 [![PayPal Donate](https://img.shields.io/badge/donate-PayPal.me-ff69b4.svg)](https://www.paypal.me/alvarotrigo/9.95)
 [![jsDelivr Hits](https://data.jsdelivr.com/v1/package/npm/fullpage.js/badge?style=rounded)](https://www.jsdelivr.com/package/npm/fullpage.js)

diff --git a/dist/fullpage.css b/dist/fullpage.css
@@ -1,5 +1,5 @@
 /*!
- * fullPage 4.0.4
+ * fullPage 4.0.5
  * https://github.com/alvarotrigo/fullPage.js
  *
  * @license GPLv3 for open source use only

diff --git a/dist/fullpage.extensions.min.js b/dist/fullpage.extensions.min.js
diff --git a/dist/fullpage.js b/dist/fullpage.js
@@ -1,5 +1,5 @@
 /*!
-* fullPage 4.0.4
+* fullPage 4.0.5
 * https://github.com/alvarotrigo/fullPage.js
 *
 * @license GPLv3 for open source use only
@@ -867,6 +867,7 @@
       touchDirection: 'none',
       wheelDirection: 'none',
       isGrabbing: false,
+      isUsingWheel: false,
       isWindowFocused: true,
       previousDestTop: 0,
       windowsHeight: getWindowHeight(),
@@ -1786,7 +1787,7 @@
 
     function getBulletLinkName(i, defaultName, item) {
       var anchor = defaultName === 'Section' ? getOptions().anchors[i] : getAttr(item, 'data-anchor');
-      return getOptions().navigationTooltips[i] || anchor || defaultName + ' ' + (i + 1);
+      return encodeURI(getOptions().navigationTooltips[i] || anchor || defaultName + ' ' + (i + 1));
     }
 
     function slideBulletHandler(e) {
@@ -2354,7 +2355,7 @@
           link = section.anchor;
         }
 
-        li += '<li><a href="#' + link + '"><span class="fp-sr-only">' + getBulletLinkName(section.index(), 'Section') + '</span><span></span></a>'; // Only add tooltip if needed (defined by user)
+        li += '<li><a href="#' + encodeURI(link) + '"><span class="fp-sr-only">' + getBulletLinkName(section.index(), 'Section') + '</span><span></span></a>'; // Only add tooltip if needed (defined by user)
 
         var tooltip = getOptions().navigationTooltips[section.index()];
 
@@ -2670,7 +2671,7 @@
         var timeDiff = this.timeLastScroll - scrollOverflowHandler.timeBeforeReachingLimit;
         var isUsingTouch = isTouchDevice || isTouch;
         var isGrabbing = isUsingTouch && state.isGrabbing;
-        var isNotFirstTimeReachingLimit = !isUsingTouch && timeDiff > 600;
+        var isNotFirstTimeReachingLimit = state.isUsingWheel && timeDiff > 600;
         return isGrabbing && timeDiff > 400 || isNotFirstTimeReachingLimit;
       },
       onPanelScroll: function () {
@@ -3715,7 +3716,8 @@
 
       if (isReallyTouch(e)) {
         setState({
-          isGrabbing: true
+          isGrabbing: true,
+          isUsingWheel: false
         });
 
         if (getOptions().autoScrolling) {
@@ -4312,7 +4314,16 @@
     function MouseWheelHandler(e) {
       var curTime = new Date().getTime();
       var isNormalScroll = hasClass($(COMPLETELY_SEL)[0], NORMAL_SCROLL);
-      var isScrollAllowedBeyondFullPage = beyondFullPageHandler(getContainer(), e); //is scroll allowed?
+      var isScrollAllowedBeyondFullPage = beyondFullPageHandler(getContainer(), e);
+
+      if (!state.isUsingWheel) {
+        setState({
+          isGrabbing: false,
+          isUsingWheel: true,
+          touchDirection: 'none'
+        });
+      } //is scroll allowed?
+
 
       if (!getIsScrollAllowed().m.down && !getIsScrollAllowed().m.up) {
         preventDefault(e);
@@ -5113,7 +5124,7 @@
         });
       });
       var t = ["-"];
-      var n = "2022-3-12".split("-"),
+      var n = "2022-3-13".split("-"),
           e = new Date(n[0], n[1], n[2]),
           i = ["se", "licen", "-", "v3", "l", "gp"];
 
@@ -5529,7 +5540,7 @@
       }; //public functions
 
 
-      FP.version = '4.0.4';
+      FP.version = '4.0.5';
       FP.test = Object.assign(FP.test, {
         top: '0px',
         translate3d: 'translate3d(0px, 0px, 0px)',

diff --git a/dist/fullpage.min.css b/dist/fullpage.min.css
diff --git a/dist/fullpage.min.css.map b/dist/fullpage.min.css.map
diff --git a/dist/fullpage.min.js b/dist/fullpage.min.js
diff --git a/lang/chinese/README.md b/lang/chinese/README.md
@@ -16,7 +16,7 @@
 
 ---
 
-![fullPage.js version](http://img.shields.io/badge/fullPage.js-v4.0.4,2-brightgreen.svg)
+![fullPage.js version](http://img.shields.io/badge/fullPage.js-v4.0.5,2-brightgreen.svg)
 [![License](https://img.shields.io/badge/License-GPL-blue.svg)](https://www.gnu.org/licenses/gpl-3.0.html)
 [![PayPal Donate](https://img.shields.io/badge/donate-PayPal.me-ff69b4.svg)](https://www.paypal.me/alvarotrigo/9.95)
 [![jsDelivr Hits](https://data.jsdelivr.com/v1/package/npm/fullpage.js/badge?style=rounded)](https://www.jsdelivr.com/package/npm/fullpage.js)

diff --git a/lang/french/README.md b/lang/french/README.md
@@ -17,7 +17,7 @@
 
 ---
 
-![fullPage.js version](http://img.shields.io/badge/fullPage.js-v4.0.4-brightgreen.svg)
+![fullPage.js version](http://img.shields.io/badge/fullPage.js-v4.0.5-brightgreen.svg)
 [![License](https://img.shields.io/badge/License-GPL-blue.svg)](https://www.gnu.org/licenses/gpl-3.0.html)
 [![PayPal Donate](https://img.shields.io/badge/donate-PayPal.me-ff69b4.svg)](https://www.paypal.me/alvarotrigo/9.95)
 [![jsDelivr Hits](https://data.jsdelivr.com/v1/package/npm/fullpage.js/badge?style=rounded)](https://www.jsdelivr.com/package/npm/fullpage.js)

diff --git a/lang/korean/README.md b/lang/korean/README.md
@@ -16,7 +16,7 @@
 </p>
 ---
 
-![fullPage.js version](http://img.shields.io/badge/fullPage.js-v4.0.4-brightgreen.svg)
+![fullPage.js version](http://img.shields.io/badge/fullPage.js-v4.0.5-brightgreen.svg)
 [![License](https://img.shields.io/badge/License-GPL-blue.svg)](https://www.gnu.org/licenses/gpl-3.0.html)
 [![PayPal](https://img.shields.io/badge/donate-PayPal.me-ff69b4.svg)](https://www.paypal.me/alvarotrigo/9.95)
 [![jsDelivr Hits](https://data.jsdelivr.com/v1/package/npm/fullpage.js/badge?style=rounded)](https://www.jsdelivr.com/package/npm/fullpage.js)

diff --git a/lang/russian/README.md b/lang/russian/README.md
@@ -17,7 +17,7 @@
 
 ---
 
-![Версия fullPage.js](http://img.shields.io/badge/fullPage.js-v4.0.4-brightgreen.svg)
+![Версия fullPage.js](http://img.shields.io/badge/fullPage.js-v4.0.5-brightgreen.svg)
 [![Лицензия](https://img.shields.io/badge/License-GPL-blue.svg)](https://www.gnu.org/licenses/gpl-3.0.html)
 [![Перечисление на PayPal](https://img.shields.io/badge/donate-PayPal.me-ff69b4.svg)](https://www.paypal.me/alvarotrigo/9.95)
 [![jsDelivr Hits](https://data.jsdelivr.com/v1/package/npm/fullpage.js/badge?style=rounded)](https://www.jsdelivr.com/package/npm/fullpage.js)

diff --git a/lang/spanish/README.md b/lang/spanish/README.md
@@ -18,7 +18,7 @@
 
 ---
 
-![fullPage.js version](http://img.shields.io/badge/fullPage.js-v4.0.4-brightgreen.svg)
+![fullPage.js version](http://img.shields.io/badge/fullPage.js-v4.0.5-brightgreen.svg)
 [![License](https://img.shields.io/badge/License-GPL-blue.svg)](https://www.gnu.org/licenses/gpl-3.0.html)
 [![PayPal Donate](https://img.shields.io/badge/donate-PayPal.me-ff69b4.svg)](https://www.paypal.me/alvarotrigo/9.95)
 [![jsDelivr Hits](https://data.jsdelivr.com/v1/package/npm/fullpage.js/badge?style=rounded)](https://www.jsdelivr.com/package/npm/fullpage.js)

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fullpage.js",
-  "version": "4.0.4",
+  "version": "4.0.5",
   "description": "Create beautiful fullscreen snap scrolling websites",
   "main": "dist/fullpage.js",
   "scripts": {

diff --git a/rollup.config.js b/rollup.config.js
@@ -3,7 +3,7 @@ import resolve from "@rollup/plugin-node-resolve";
 import babel from "@rollup/plugin-babel";
 
 const licenseContent = `/*!
-* fullPage 4.0.4
+* fullPage 4.0.5
 * https://github.com/alvarotrigo/fullPage.js
 *
 * @license GPLv3 for open source use only

diff --git a/src/css/fullpage.css b/src/css/fullpage.css
@@ -1,5 +1,5 @@
 /*!
- * fullPage 4.0.4
+ * fullPage 4.0.5
  * https://github.com/alvarotrigo/fullPage.js
  *
  * @license GPLv3 for open source use only

diff --git a/src/js/common/state.js b/src/js/common/state.js
@@ -20,6 +20,7 @@ export const state = {
     touchDirection: 'none',
     wheelDirection: 'none',
     isGrabbing: false,
+    isUsingWheel: false,
     isWindowFocused: true,
     previousDestTop: 0,
     windowsHeight: utils.getWindowHeight(),

diff --git a/src/js/fullpage.js b/src/js/fullpage.js
@@ -60,7 +60,7 @@ function setAPI(){
     };
 
     //public functions
-    FP.version = '4.0.4';
+    FP.version = '4.0.5';
 
     FP.test = Object.assign(FP.test, {
         top: '0px',

diff --git a/src/js/mixed/index.min.js b/src/js/mixed/index.min.js
diff --git a/src/js/mouse/wheel.js b/src/js/mouse/wheel.js
@@ -109,6 +109,14 @@ function MouseWheelHandler(e) {
     var isNormalScroll = utils.hasClass(utils.$(COMPLETELY_SEL)[0], NORMAL_SCROLL);
     var isScrollAllowedBeyondFullPage = beyondFullPageHandler(getContainer(), e);
 
+    if(!state.isUsingWheel){
+        setState({
+            isGrabbing: false,
+            isUsingWheel: true,
+            touchDirection: 'none'
+        });
+    }
+
     //is scroll allowed?
     if (!getIsScrollAllowed().m.down && !getIsScrollAllowed().m.up) {
         utils.preventDefault(e);

diff --git a/src/js/nav/getBulletLinkName.js b/src/js/nav/getBulletLinkName.js
@@ -6,7 +6,7 @@ import { getOptions } from "../common/options.js";
 */
 export function getBulletLinkName(i, defaultName, item){
     var anchor = defaultName === 'Section' ? getOptions().anchors[i] : utils.getAttr(item, 'data-anchor');
-    return getOptions().navigationTooltips[i] || 
+    return encodeURI(getOptions().navigationTooltips[i] || 
         anchor || 
-        defaultName + ' ' + (i+1);
+        defaultName + ' ' + (i+1));
 }
diff --git a/src/js/nav/sections.js b/src/js/nav/sections.js
@@ -64,7 +64,7 @@ export function addVerticalNavigation(){
             link = section.anchor;
         }
 
-        li += '<li><a href="#' + link + '"><span class="fp-sr-only">' + getBulletLinkName(section.index(), 'Section') + '</span><span></span></a>';
+        li += '<li><a href="#' + encodeURI(link) + '"><span class="fp-sr-only">' + getBulletLinkName(section.index(), 'Section') + '</span><span></span></a>';
 
         // Only add tooltip if needed (defined by user)
         var tooltip = getOptions().navigationTooltips[section.index()];
@@ -98,4 +98,4 @@ export function sectionBulletHandler(e){
     EventEmitter.emit('scrollPage', {
         destination: getState().sections[indexBullet]
     });
-}
+}
diff --git a/src/js/nav/slides.js b/src/js/nav/slides.js
@@ -65,4 +65,4 @@ export function addSlidesNavigation(section){
 
     var activeSlideIndex = section.activeSlide ? section.activeSlide.index() : 0;
     utils.addClass(utils.$('a', utils.$('li', nav)[activeSlideIndex] ), ACTIVE);
-}
+}
diff --git a/src/js/scrolloverflow.js b/src/js/scrolloverflow.js
@@ -131,7 +131,7 @@ export const scrollOverflowHandler = {
         var timeDiff = this.timeLastScroll - scrollOverflowHandler.timeBeforeReachingLimit;
         var isUsingTouch = isTouchDevice || isTouch;
         var isGrabbing = isUsingTouch && state.isGrabbing;
-        var isNotFirstTimeReachingLimit = !isUsingTouch && timeDiff > 600;
+        var isNotFirstTimeReachingLimit = state.isUsingWheel && timeDiff > 600;
 
         return isGrabbing && timeDiff > 400 || isNotFirstTimeReachingLimit;
     },

diff --git a/src/js/touch.js b/src/js/touch.js
@@ -77,7 +77,10 @@ function touchMoveHandler(e){
     var direction = isHorizontalPredominantMove ? directionH : directionV;
 
     if (isReallyTouch(e) ) {
-        setState({isGrabbing: true});
+        setState({
+            isGrabbing: true,
+            isUsingWheel: false
+        });
 
         if(getOptions().autoScrolling){
             if(!hasActiveSectionOverflow || (hasActiveSectionOverflow && !state.canScroll)){