Properly call scrollTo callback when already at the target (native)

gabcaron · Mar 23, 2021 · 2e86f14 · 2e86f14
1 parent 22c1c0f
commit 2e86f14
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 25 deletions.
diff --git a/dist/locomotive-scroll.esm.js b/dist/locomotive-scroll.esm.js
@@ -1318,17 +1318,24 @@ var _default$1 = /*#__PURE__*/function (_Core) {
         offset = target + offset;
       }
 
-      if (callback) {
-        offset = offset.toFixed();
+      var isTargetReached = function isTargetReached() {
+        return parseInt(window.pageYOffset) === parseInt(offset);
+      };
 
-        var onScroll = function onScroll() {
-          if (window.pageYOffset.toFixed() === offset) {
-            window.removeEventListener('scroll', onScroll);
-            callback();
-          }
-        };
+      if (callback) {
+        if (isTargetReached()) {
+          callback();
+          return;
+        } else {
+          var onScroll = function onScroll() {
+            if (isTargetReached()) {
+              window.removeEventListener('scroll', onScroll);
+              callback();
+            }
+          };
 
-        window.addEventListener('scroll', onScroll);
+          window.addEventListener('scroll', onScroll);
+        }
       }
 
       window.scrollTo({

diff --git a/dist/locomotive-scroll.js b/dist/locomotive-scroll.js
@@ -1324,17 +1324,24 @@
           offset = target + offset;
         }
 
-        if (callback) {
-          offset = offset.toFixed();
+        var isTargetReached = function isTargetReached() {
+          return parseInt(window.pageYOffset) === parseInt(offset);
+        };
 
-          var onScroll = function onScroll() {
-            if (window.pageYOffset.toFixed() === offset) {
-              window.removeEventListener('scroll', onScroll);
-              callback();
-            }
-          };
+        if (callback) {
+          if (isTargetReached()) {
+            callback();
+            return;
+          } else {
+            var onScroll = function onScroll() {
+              if (isTargetReached()) {
+                window.removeEventListener('scroll', onScroll);
+                callback();
+              }
+            };
 
-          window.addEventListener('scroll', onScroll);
+            window.addEventListener('scroll', onScroll);
+          }
         }
 
         window.scrollTo({

diff --git a/dist/locomotive-scroll.min.js b/dist/locomotive-scroll.min.js
diff --git a/docs/dist/scripts/main.js b/docs/dist/scripts/main.js
diff --git a/src/scripts/Native.js b/src/scripts/Native.js
@@ -232,18 +232,18 @@ export default class extends Core {
             offset = target + offset;
         }
 
+        const isTargetReached = () => { return parseInt(window.pageYOffset) === parseInt(offset) }
         if (callback) {
-            offset = offset.toFixed();
-            if (parseInt(offset) === 0) {
+            if (isTargetReached()) {
                 callback();
                 return;
-            } else {    
+            } else {
                 let onScroll = function () {
-                    if (window.pageYOffset.toFixed() === offset) {
+                    if (isTargetReached()) {
                         window.removeEventListener('scroll', onScroll);
                         callback();
                     }
-                };            
+                };
                 window.addEventListener('scroll', onScroll);
             }
         }