Merge pull request StartBootstrap#70 from rrikesh/gh-pages

Don't let the user lose scroll control when a '.page-scroll a' is cli…
hzhao16 · Jun 27, 2016 · 3ba328e · 3ba328e
2 parents 561dec5 + 5043b2b
commit 3ba328e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/js/contact_me.js b/js/contact_me.js
@@ -54,7 +54,7 @@ $(function() {
                     //clear all fields
                     $('#contactForm').trigger("reset");
                 },
-            })
+            });
         },
         filter: function() {
             return $(this).is(":visible");

diff --git a/js/freelancer.js b/js/freelancer.js
@@ -8,9 +8,16 @@
 $(function() {
     $('body').on('click', '.page-scroll a', function(event) {
         var $anchor = $(this);
-        $('html, body').stop().animate({
+
+        $('html, body')
+        .bind('scroll mousedown DOMMouseScroll mousewheel keyup', function(){
+          $('html, body').stop();
+        })
+        .stop()
+        .animate({
             scrollTop: $($anchor.attr('href')).offset().top
         }, 1500, 'easeInOutExpo');
+
         event.preventDefault();
     });
 });
@@ -29,7 +36,7 @@ $(function() {
 // Highlight the top nav as scrolling occurs
 $('body').scrollspy({
     target: '.navbar-fixed-top'
-})
+});
 
 // Closes the Responsive Menu on Menu Item Click
 $('.navbar-collapse ul li a:not(.dropdown-toggle)').click(function() {