scroll-into-view - npm Package Compare versions

Comparing version 1.1.0 to 1.1.1

package.json

 {
   "name": "scroll-into-view",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "",
@@ -5,0 +5,0 @@ "main": "scrollIntoView.js",

scrollIntoView.js

@@ -48,4 +48,8 @@ function setElementScroll(element, x, y){
     requestAnimationFrame(function(){
-        var scrollSettings = parent._scrollSettings,
-            location = getTargetScrollLocation(scrollSettings.target, parent),
+        var scrollSettings = parent._scrollSettings;
+        if(!scrollSettings){
+            return;
+        }
+
+        var location = getTargetScrollLocation(scrollSettings.target, parent),
             time = Date.now() - scrollSettings.startTime,
@@ -59,3 +63,3 @@ timeValue = 1 / scrollSettings.time * time;
             parent._scrollSettings = null;
-            return scrollSettings.callback();
+            return scrollSettings.end();
         }
@@ -78,16 +82,25 @@
 function transitionScrollTo(target, parent, settings, callback){
-    var scrollSettings = {
-            startTime: Date.now(),
-            target: target,
-            time: settings.time,
-            ease: settings.ease,
-            callback: callback
-        };
+    var idle = !parent._scrollSettings;
 
-    if(!parent._scrollSettings){
-        parent._scrollSettings = scrollSettings;
+    if(parent._scrollSettings){
+        parent._scrollSettings.end();
+    }
+
+    function end(){
+        parent._scrollSettings = null;
+        callback();
+        parent.removeEventListener('touchstart', end);
+    }
+
+    parent._scrollSettings = {
+        startTime: Date.now(),
+        target: target,
+        time: settings.time,
+        ease: settings.ease,
+        end: end
+    };
+    parent.addEventListener('touchstart', end);    
+
+    if(idle){
         animate(parent);
-    }else{
-        parent._scrollSettings.callback();
-        parent._scrollSettings = scrollSettings;
     }
@@ -113,5 +126,5 @@ }
 
-    var parent = target.parentElement;
+    var parent = target.parentElement,
+        parents = 0;
 
-    var parents = 0;
     function done(){
@@ -126,4 +139,7 @@ parents--;
         if(
-            parent.scrollHeight !== parent.clientHeight ||
-            parent.scrollWidth !== parent.clientWidth
+            (
+                parent.scrollHeight !== parent.clientHeight ||
+                parent.scrollWidth !== parent.clientWidth
+            ) &&
+            getComputedStyle(parent).overflow !== 'hidden'
         ){
@@ -130,0 +146,0 @@ parents++;

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

11155

increased by2.41%

Lines of code

236

increased by5.36%

No dependency changes