Merge pull request cferdinandi#230 from cferdinandi/development

v9.0.1

Author: cferdinandi

dist/js/smooth-scroll.js

@@ -1,5 +1,5 @@
 /*!
- * smooth-scroll v9.0.0: Animate scrolling to anchor links
+ * smooth-scroll v9.0.1: Animate scrolling to anchor links
  * (c) 2016 Chris Ferdinandi
  * MIT License
  * http://github.com/cferdinandi/smooth-scroll
@@ -23,7 +23,7 @@
 
 	var smoothScroll = {}; // Object for public APIs
 	var supports = 'querySelector' in document && 'addEventListener' in root; // Feature test
-	var settings, eventTimeout, fixedHeader, headerHeight;
+	var settings, eventTimeout, fixedHeader, headerHeight, animationInterval;
 
 	// Default settings
 	var defaults = {
@@ -341,6 +341,8 @@
 	 */
 	smoothScroll.animateScroll = function ( anchor, toggle, options ) {
 
+		// if ( scrolling ) return;
+
 		// Options and overrides
 		var overrides = getDataOptions( toggle ? toggle.getAttribute('data-options') : null );
 		var settings = extend( settings || defaults, options || {}, overrides ); // Merge user options with defaults
@@ -354,7 +356,6 @@
 		if ( !fixedHeader ) { fixedHeader = root.document.querySelector( settings.selectorHeader ); }  // Get the fixed header if not already set
 		if ( !headerHeight ) { headerHeight = getHeaderHeight( fixedHeader ); } // Get the height of a fixed header if one exists and not already set
 		var endLocation = isNum ? anchor : getEndLocation( anchorElem, headerHeight, parseInt(settings.offset, 10) ); // Location to scroll to
-		var animationInterval; // interval timer
 		var distance = endLocation - startLocation; // distance to travel
 		var documentHeight = getDocumentHeight();
 		var timeLapsed = 0;
@@ -401,6 +402,7 @@
 		 * @private
 		 */
 		var startAnimateScroll = function () {
+			clearInterval(animationInterval);
 			animationInterval = setInterval(loopAnimateScroll, 16);
 		};
 
@@ -463,6 +465,7 @@
 		eventTimeout = null;
 		fixedHeader = null;
 		headerHeight = null;
+		animationInterval = null;
 	};
 
 	/**

dist/js/smooth-scroll.min.js

@@ -1,5 +1,5 @@
 /*!
- * smooth-scroll v9.0.0: Animate scrolling to anchor links
+ * smooth-scroll v9.0.1: Animate scrolling to anchor links
  * (c) 2016 Chris Ferdinandi
  * MIT License
  * http://github.com/cferdinandi/smooth-scroll
@@ -23,7 +23,7 @@
 
 	var smoothScroll = {}; // Object for public APIs
 	var supports = 'querySelector' in document && 'addEventListener' in root; // Feature test
-	var settings, eventTimeout, fixedHeader, headerHeight;
+	var settings, eventTimeout, fixedHeader, headerHeight, animationInterval;
 
 	// Default settings
 	var defaults = {
@@ -341,6 +341,8 @@
 	 */
 	smoothScroll.animateScroll = function ( anchor, toggle, options ) {
 
+		// if ( scrolling ) return;
+
 		// Options and overrides
 		var overrides = getDataOptions( toggle ? toggle.getAttribute('data-options') : null );
 		var settings = extend( settings || defaults, options || {}, overrides ); // Merge user options with defaults
@@ -354,7 +356,6 @@
 		if ( !fixedHeader ) { fixedHeader = root.document.querySelector( settings.selectorHeader ); }  // Get the fixed header if not already set
 		if ( !headerHeight ) { headerHeight = getHeaderHeight( fixedHeader ); } // Get the height of a fixed header if one exists and not already set
 		var endLocation = isNum ? anchor : getEndLocation( anchorElem, headerHeight, parseInt(settings.offset, 10) ); // Location to scroll to
-		var animationInterval; // interval timer
 		var distance = endLocation - startLocation; // distance to travel
 		var documentHeight = getDocumentHeight();
 		var timeLapsed = 0;
@@ -401,6 +402,7 @@
 		 * @private
 		 */
 		var startAnimateScroll = function () {
+			clearInterval(animationInterval);
 			animationInterval = setInterval(loopAnimateScroll, 16);
 		};
 
@@ -463,6 +465,7 @@
 		eventTimeout = null;
 		fixedHeader = null;
 		headerHeight = null;
+		animationInterval = null;
 	};
 
 	/**