From 28a8758e94de739ca3601869347128273e49ba8f Mon Sep 17 00:00:00 2001 From: Taro Matsuzawa Date: Mon, 8 Mar 2021 19:38:34 +0900 Subject: [PATCH] - remove jquery.easing - use on event instead of click and scroll --- dist/css/styles.css | 2 +- dist/index.html | 2 +- dist/js/scripts.js | 21 ++++++++++----------- src/js/scripts.js | 19 +++++++++---------- src/pug/index.pug | 4 ++-- 5 files changed, 23 insertions(+), 25 deletions(-) diff --git a/dist/css/styles.css b/dist/css/styles.css index 90dc049..29cdd4a 100644 --- a/dist/css/styles.css +++ b/dist/css/styles.css @@ -1,7 +1,7 @@ @charset "UTF-8"; /*! * Start Bootstrap - Agency v6.0.3 (https://startbootstrap.com/theme/agency) -* Copyright 2013-2020 Start Bootstrap +* Copyright 2013-2021 Start Bootstrap * Licensed under MIT (https://github.com/StartBootstrap/startbootstrap-agency/blob/master/LICENSE) */ /*! diff --git a/dist/index.html b/dist/index.html index be29a1e..97ebc0f 100644 --- a/dist/index.html +++ b/dist/index.html @@ -538,7 +538,7 @@ - + diff --git a/dist/js/scripts.js b/dist/js/scripts.js index ddfa4fa..a993760 100644 --- a/dist/js/scripts.js +++ b/dist/js/scripts.js @@ -1,13 +1,13 @@ /*! * Start Bootstrap - Agency v6.0.3 (https://startbootstrap.com/theme/agency) - * Copyright 2013-2020 Start Bootstrap + * Copyright 2013-2021 Start Bootstrap * Licensed under MIT (https://github.com/StartBootstrap/startbootstrap-agency/blob/master/LICENSE) */ (function ($) { "use strict"; // Start of use strict // Smooth scrolling using jQuery easing - $('a.js-scroll-trigger[href*="#"]:not([href="#"])').click(function () { + $('a.js-scroll-trigger[href*="#"]:not([href="#"])').on('click', function () { if ( location.pathname.replace(/^\//, "") == this.pathname.replace(/^\//, "") && @@ -18,20 +18,19 @@ ? target : $("[name=" + this.hash.slice(1) + "]"); if (target.length) { - $("html, body").animate( - { - scrollTop: target.offset().top - 72, - }, - 1000, - "easeInOutExpo" - ); + anime({ + targets: 'html, body', + scrollTop: target.offset().top - 72, + duration: 1000, + easing: 'easeInOutExpo' + }); return false; } } }); // Closes responsive menu when a scroll trigger link is clicked - $(".js-scroll-trigger").click(function () { + $(".js-scroll-trigger").on('click', function () { $(".navbar-collapse").collapse("hide"); }); @@ -52,5 +51,5 @@ // Collapse now if page is not at top navbarCollapse(); // Collapse the navbar when page is scrolled - $(window).scroll(navbarCollapse); + $(window).on('scroll', navbarCollapse); })(jQuery); // End of use strict diff --git a/src/js/scripts.js b/src/js/scripts.js index 35125dd..203264b 100644 --- a/src/js/scripts.js +++ b/src/js/scripts.js @@ -2,7 +2,7 @@ "use strict"; // Start of use strict // Smooth scrolling using jQuery easing - $('a.js-scroll-trigger[href*="#"]:not([href="#"])').click(function () { + $('a.js-scroll-trigger[href*="#"]:not([href="#"])').on('click', function () { if ( location.pathname.replace(/^\//, "") == this.pathname.replace(/^\//, "") && @@ -13,20 +13,19 @@ ? target : $("[name=" + this.hash.slice(1) + "]"); if (target.length) { - $("html, body").animate( - { - scrollTop: target.offset().top - 72, - }, - 1000, - "easeInOutExpo" - ); + anime({ + targets: 'html, body', + scrollTop: target.offset().top - 72, + duration: 1000, + easing: 'easeInOutExpo' + }); return false; } } }); // Closes responsive menu when a scroll trigger link is clicked - $(".js-scroll-trigger").click(function () { + $(".js-scroll-trigger").on('click', function () { $(".navbar-collapse").collapse("hide"); }); @@ -47,5 +46,5 @@ // Collapse now if page is not at top navbarCollapse(); // Collapse the navbar when page is scrolled - $(window).scroll(navbarCollapse); + $(window).on('scroll', navbarCollapse); })(jQuery); // End of use strict diff --git a/src/pug/index.pug b/src/pug/index.pug index fa96b31..524095a 100644 --- a/src/pug/index.pug +++ b/src/pug/index.pug @@ -449,11 +449,11 @@ html(lang='en') script(src='https://cdn.jsdelivr.net/npm/bootstrap@4.5.3/dist/js/bootstrap.bundle.min.js') // Third party plugin JS - script(src='https://cdnjs.cloudflare.com/ajax/libs/jquery-easing/1.4.1/jquery.easing.min.js') + script(src='https://cdnjs.cloudflare.com/ajax/libs/animejs/3.2.1/anime.min.js') // Contact form JS script(src='assets/mail/jqBootstrapValidation.js') script(src='assets/mail/contact_me.js') // Core theme JS - script(src='js/scripts.js') \ No newline at end of file + script(src='js/scripts.js')