Merge pull request #4634 from alvarotrigo/dev

Merging dev branch 4.0.25
alvarotrigo · Jun 22, 2024 · 3e002b9 · 3e002b9
2 parents c2eff2b + 40ce005
commit 3e002b9
Show file tree

Hide file tree

Showing 19 changed files with 24 additions and 24 deletions.
diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@
 
 ---
 
-![fullPage.js version](https://img.shields.io/badge/fullPage.js-v4.0.23-brightgreen.svg)
+![fullPage.js version](https://img.shields.io/badge/fullPage.js-v4.0.25-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.24
+ * fullPage 4.0.25
  * 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.24
+* fullPage 4.0.25
 * https://github.com/alvarotrigo/fullPage.js
 *
 * @license GPLv3 for open source use only
@@ -3047,7 +3047,7 @@
         var isBottomReached = direction === 'down' && scrollableItem.scrollHeight <= Math.ceil(scrollableItem.offsetHeight + positionY) + ie11offset;
         var isScrolled = isTopReached || isBottomReached;
 
-        if (!isScrolled) {
+        if (!isScrolled && direction !== 'none') {
           this.timeBeforeReachingLimit = new Date().getTime();
         }
 
@@ -5500,7 +5500,7 @@
         });
       });
       var t = ["-"];
-      var n = "\x32\x30\x32\x34\x2d\x35\x2d\x32\x31".split("-"),
+      var n = "\x32\x30\x32\x34\x2d\x35\x2d\x32\x32".split("-"),
           e = new Date(n[0], n[1], n[2]),
           r = ["se", "licen", "-", "v3", "l", "gp"];
 
@@ -5936,7 +5936,7 @@
       }; //public functions
 
 
-      FP.version = '4.0.24';
+      FP.version = '4.0.25';
       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/brazilian-portuguese/README.md b/lang/brazilian-portuguese/README.md
@@ -18,7 +18,7 @@
 
 ---
 
-![fullPage.js version](https://img.shields.io/badge/fullPage.js-v4.0.23-brightgreen.svg)
+![fullPage.js version](https://img.shields.io/badge/fullPage.js-v4.0.25-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/chinese/README.md b/lang/chinese/README.md
@@ -17,7 +17,7 @@
 
 ---
 
-![fullPage.js version](https://img.shields.io/badge/fullPage.js-v4.0.23,2-brightgreen.svg)
+![fullPage.js version](https://img.shields.io/badge/fullPage.js-v4.0.25,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
@@ -18,7 +18,7 @@
 
 ---
 
-![fullPage.js version](https://img.shields.io/badge/fullPage.js-v4.0.23-brightgreen.svg)
+![fullPage.js version](https://img.shields.io/badge/fullPage.js-v4.0.25-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
@@ -17,7 +17,7 @@
 </p>
 ---
 
-![fullPage.js version](https://img.shields.io/badge/fullPage.js-v4.0.23-brightgreen.svg)
+![fullPage.js version](https://img.shields.io/badge/fullPage.js-v4.0.25-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
@@ -18,7 +18,7 @@
 
 ---
 
-![Версия fullPage.js](https://img.shields.io/badge/fullPage.js-v4.0.23-brightgreen.svg)
+![Версия fullPage.js](https://img.shields.io/badge/fullPage.js-v4.0.25-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
@@ -19,7 +19,7 @@
 
 ---
 
-![fullPage.js version](https://img.shields.io/badge/fullPage.js-v4.0.23-brightgreen.svg)
+![fullPage.js version](https://img.shields.io/badge/fullPage.js-v4.0.25-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.24",
+  "version": "4.0.25",
   "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.24
+* fullPage 4.0.25
 * 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.24
+ * fullPage 4.0.25
  * https://github.com/alvarotrigo/fullPage.js
  *
  * @license GPLv3 for open source use only

diff --git a/src/js/fullpage.js b/src/js/fullpage.js
@@ -61,7 +61,7 @@ function setAPI(){
     };
 
     //public functions
-    FP.version = '4.0.24';
+    FP.version = '4.0.25';
 
     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/scrolloverflow.js b/src/js/scrolloverflow.js
@@ -255,7 +255,7 @@ export const scrollOverflowHandler = {
         var isBottomReached = direction === 'down' && scrollableItem.scrollHeight <= Math.ceil(scrollableItem.offsetHeight + positionY) + ie11offset;
         var isScrolled = isTopReached || isBottomReached;
 
-        if(!isScrolled){
+        if(!isScrolled && direction !== 'none'){
             this.timeBeforeReachingLimit = new Date().getTime();
         }
         return isScrolled;