refactor: remove redundant conditionals around showAnchor calls

sebnitu · Jul 16, 2020 · 12da5a2 · 12da5a2
1 parent 4563c1a
commit 12da5a2
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 35 deletions.
diff --git a/dist/scripts.cjs.js b/dist/scripts.cjs.js
@@ -51,10 +51,7 @@ var index = (function (options) {
     api.scrolls = document.querySelectorAll("[data-".concat(api.settings.dataScroll, "]"));
     setScrollPosition();
     api.scrolls.forEach(function (item) {
-      if (api.settings.selectorAnchor) {
-        showAnchor(item);
-      }
-
+      showAnchor(item);
       item.addEventListener('scroll', throttle, false);
     });
   };
@@ -70,10 +67,7 @@ var index = (function (options) {
 
   api.showAnchor = function (el) {
     var behavior = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : api.settings.behavior;
-
-    if (api.settings.selectorAnchor) {
-      showAnchor(el, behavior);
-    }
+    showAnchor(el, behavior);
   };
 
   var throttle = function throttle() {
@@ -130,7 +124,7 @@ var index = (function (options) {
       return el.querySelector(dataAnchor);
     }
 
-    var selectorAnchor = el.querySelector(api.settings.selectorAnchor);
+    var selectorAnchor = api.settings.selectorAnchor ? el.querySelector(api.settings.selectorAnchor) : null;
 
     if (selectorAnchor && api.settings.selectorAnchorParent) {
       var parentAnchor = selectorAnchor.closest(api.settings.selectorAnchorParent);

diff --git a/dist/scripts.js b/dist/scripts.js
@@ -52,10 +52,7 @@ this.ScrollStash = (function () {
       api.scrolls = document.querySelectorAll("[data-".concat(api.settings.dataScroll, "]"));
       setScrollPosition();
       api.scrolls.forEach(function (item) {
-        if (api.settings.selectorAnchor) {
-          showAnchor(item);
-        }
-
+        showAnchor(item);
         item.addEventListener('scroll', throttle, false);
       });
     };
@@ -71,10 +68,7 @@ this.ScrollStash = (function () {
 
     api.showAnchor = function (el) {
       var behavior = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : api.settings.behavior;
-
-      if (api.settings.selectorAnchor) {
-        showAnchor(el, behavior);
-      }
+      showAnchor(el, behavior);
     };
 
     var throttle = function throttle() {
@@ -131,7 +125,7 @@ this.ScrollStash = (function () {
         return el.querySelector(dataAnchor);
       }
 
-      var selectorAnchor = el.querySelector(api.settings.selectorAnchor);
+      var selectorAnchor = api.settings.selectorAnchor ? el.querySelector(api.settings.selectorAnchor) : null;
 
       if (selectorAnchor && api.settings.selectorAnchorParent) {
         var parentAnchor = selectorAnchor.closest(api.settings.selectorAnchorParent);

diff --git a/dist/scripts.min.js b/dist/scripts.min.js
diff --git a/index.js b/index.js
@@ -28,9 +28,7 @@ export default (options) => {
     api.scrolls = document.querySelectorAll(`[data-${api.settings.dataScroll}]`);
     setScrollPosition();
     api.scrolls.forEach((item) => {
-      if (api.settings.selectorAnchor) {
-        showAnchor(item);
-      }
+      showAnchor(item);
       item.addEventListener('scroll', throttle, false);
     });
   };
@@ -45,9 +43,7 @@ export default (options) => {
   };
 
   api.showAnchor = (el, behavior = api.settings.behavior) => {
-    if (api.settings.selectorAnchor) {
-      showAnchor(el, behavior);
-    }
+    showAnchor(el, behavior);
   };
 
   const throttle = () => {
@@ -108,7 +104,8 @@ export default (options) => {
     }
 
     // 3. If selectAnchor and parentAnchor return an anchor, return parentAnchor
-    const selectorAnchor = el.querySelector(api.settings.selectorAnchor);
+    const selectorAnchor = (api.settings.selectorAnchor) ?
+      el.querySelector(api.settings.selectorAnchor) : null;
     if (selectorAnchor && api.settings.selectorAnchorParent) {
       const parentAnchor = selectorAnchor.closest(api.settings.selectorAnchorParent);
       if (parentAnchor) return parentAnchor;

diff --git a/tests/unit.test.js b/tests/unit.test.js
@@ -235,12 +235,3 @@ test('should scroll to anchor when showAnchor api is called', () => {
   scrollStash.showAnchor(el1);
   expect(el1.scroll).toHaveBeenCalled();
 });
-
-test('should ignore showAnchor api call if select anchor is not set', () => {
-  scrollStash = new ScrollStash({
-    autoInit: true,
-  });
-  const el1 = document.querySelector('[data-scroll-stash="example-1"]');
-  scrollStash.showAnchor(el1);
-  expect(el1.scroll).not.toHaveBeenCalled();
-});