nav anchor scroll bug fix

drzzle-app · Jun 1, 2020 · 55710d5 · 55710d5
1 parent 37d8e88
commit 55710d5
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 16 deletions.
diff --git a/dist/js/picazzo.bundle.min.js b/dist/js/picazzo.bundle.min.js
diff --git a/dist/js/picazzo.droplet.lib.js b/dist/js/picazzo.droplet.lib.js
@@ -4561,11 +4561,13 @@ window.drzzle = {
   $.fn.drzAnchorScroll = function anchorScroll() {
     var $this = $(this);
     var scrollTo = function scrollTo(e) {
-      var name = $(this.hash).selector.split('#')[1];
-      var $el = $('[data-anchor-scroll="' + name + '"]');
-      if (_typeof($el.offset()) !== (typeof undefined === 'undefined' ? 'undefined' : _typeof(undefined)) && $el.offset() !== false) {
-        e.preventDefault();
-        $('html, body').animate({ scrollTop: $el.offset().top }, 500);
+      if (this.hash !== '#/cart') {
+        var name = $(this.hash).selector.split('#')[1];
+        var $el = $('[data-anchor-scroll="' + name + '"]');
+        if (_typeof($el.offset()) !== (typeof undefined === 'undefined' ? 'undefined' : _typeof(undefined)) && $el.offset() !== false) {
+          e.preventDefault();
+          $('html, body').animate({ scrollTop: $el.offset().top }, 500);
+        }
       }
     };
     $this.find('a').click(scrollTo);

diff --git a/dist/js/picazzo.droplet.lib.min.js b/dist/js/picazzo.droplet.lib.min.js
diff --git a/dist/js/tools/scrolling.min.js b/dist/js/tools/scrolling.min.js
diff --git a/package.json b/package.json
@@ -25,7 +25,8 @@
     "build:icons": "gulp build-icons",
     "deploy:docs": "./scripts/deploy-docs.sh",
     "deploy:lib:dev": "./scripts/deploy-lib.sh",
-    "deploy:lib:prod": "./scripts/deploy-lib.sh prod"
+    "deploy:lib:prod": "./scripts/deploy-lib.sh prod",
+    "postversion": "git push && git push --tags"
   },
   "repository": {
     "type": "git",

diff --git a/src/droplets/navigation/template.html b/src/droplets/navigation/template.html
@@ -1,5 +1,10 @@
 <div class="drzNav drzNav-links-right" data-nav-slide="left" ref="navigation">
   <button class="drzNav-hamburger"></button>
+  <a href="#">
+    <div class="drzNav-logo drzNav-logo-left">
+      <!-- <img here> -->
+    </div>
+  </a>
   <a class="drzNav-cart" href="#/cart" name="cart">
     <span class="drzNav-cart-count">(1)</span>
   </a>
@@ -13,7 +18,6 @@
       </div>
     </div>
   </div>
-  <a href="#"><div class="drzNav-logo drzNav-logo-left"></div></a>
   <ul class="drzNav-list">
     <li class="drzNav-item"><a href="#" class="drzNav-link drzNav-link-dropDown">DD Link</a>
       <ul class="drzNav-subList">

diff --git a/src/js-lib/picazzo.global.js b/src/js-lib/picazzo.global.js
@@ -140,7 +140,6 @@ window.drzzle = {
   };
 })(jQuery);
 
-
 /* Url checker for hashed links
 * ======================= */
 (($) => {

diff --git a/src/tools/scrolling/plugin.js b/src/tools/scrolling/plugin.js
@@ -26,11 +26,13 @@
   $.fn.drzAnchorScroll = function anchorScroll() {
     const $this = $(this);
     const scrollTo = function scrollTo(e) {
-      const name = $(this.hash).selector.split('#')[1];
-      const $el = $(`[data-anchor-scroll="${name}"]`);
-      if (typeof $el.offset() !== typeof undefined && $el.offset() !== false) {
-        e.preventDefault();
-        $('html, body').animate({ scrollTop: $el.offset().top }, 500);
+      if (this.hash !== '#/cart') {
+        const name = $(this.hash).selector.split('#')[1];
+        const $el = $(`[data-anchor-scroll="${name}"]`);
+        if (typeof $el.offset() !== typeof undefined && $el.offset() !== false) {
+          e.preventDefault();
+          $('html, body').animate({ scrollTop: $el.offset().top }, 500);
+        }
       }
     };
     $this.find('a').click(scrollTo);