Merge pull request cferdinandi#138 from cferdinandi/development

Adjust how fixedHeader is set

Author: cferdinandi

README.md

@@ -254,8 +254,10 @@ Smooth Scroll is licensed under the [MIT License](http://gomakethings.com/mit/).
 
 Smooth Scroll uses [semantic versioning](http://semver.org/).
 
+* v5.3.3 - December 21, 2014
+	* Adjust how fixed header is set for better accuracy and flexibility.
 * v5.3.2 - December 20, 2014
-	* Added method to get nod eheight more accurately.
+	* Added method to get node height more accurately.
 * v5.3.1 - December 20, 2014
 	* Cache header height for better performance.
 * v5.3.0 - December 20, 2014

dist/js/smooth-scroll.js

@@ -1,5 +1,5 @@
 /**
- * smooth-scroll v5.3.2
+ * smooth-scroll v5.3.3
  * Animate scrolling to anchor links, by Chris Ferdinandi.
  * http://github.com/cferdinandi/smooth-scroll
  * 
@@ -25,7 +25,7 @@
 
 	var smoothScroll = {}; // Object for public APIs
 	var supports = !!document.querySelector && !!root.addEventListener; // Feature test
-	var settings, eventTimeout, fixedHeader, headerHeight;
+	var settings, eventTimeout, fixedHeader;
 
 	// Default settings
 	var defaults = {
@@ -287,6 +287,8 @@
 		// Selectors and variables
 		var anchorElem = anchor === '#' ? document.documentElement : document.querySelector(anchor);
 		var startLocation = root.pageYOffset; // Current location on the page
+		if ( !fixedHeader ) { fixedHeader = document.querySelector('[data-scroll-header]'); }  // Get the fixed header if not already set
+		var headerHeight = fixedHeader === null ? 0 : ( getHeight( fixedHeader ) + fixedHeader.offsetTop ); // Get the height of a fixed header if one exists
 		var endLocation = getEndLocation( anchorElem, headerHeight, parseInt(settings.offset, 10) ); // Scroll to location
 		var animationInterval; // interval timer
 		var distance = endLocation - startLocation; // distance to travel
@@ -392,7 +394,6 @@
 		settings = null;
 		eventTimeout = null;
 		fixedHeader = null;
-		headerHeight = null;
 	};
 
 	/**
@@ -411,7 +412,6 @@
 		// Selectors and variables
 		settings = extend( defaults, options || {} ); // Merge user options with defaults
 		fixedHeader = document.querySelector('[data-scroll-header]'); // Get the fixed header
-		headerHeight = fixedHeader === null ? 0 : ( getHeight( fixedHeader ) + fixedHeader.offsetTop ); // Get the height of a fixed header if one exists
 
 		// When a toggle is clicked, run the click handler
 		document.addEventListener('click', eventHandler, false );

dist/js/smooth-scroll.min.js

@@ -1,5 +1,5 @@
 /**
- * smooth-scroll v5.3.2
+ * smooth-scroll v5.3.3
  * Animate scrolling to anchor links, by Chris Ferdinandi.
  * http://github.com/cferdinandi/smooth-scroll
  * 
@@ -25,7 +25,7 @@
 
 	var smoothScroll = {}; // Object for public APIs
 	var supports = !!document.querySelector && !!root.addEventListener; // Feature test
-	var settings, eventTimeout, fixedHeader, headerHeight;
+	var settings, eventTimeout, fixedHeader;
 
 	// Default settings
 	var defaults = {
@@ -287,6 +287,8 @@
 		// Selectors and variables
 		var anchorElem = anchor === '#' ? document.documentElement : document.querySelector(anchor);
 		var startLocation = root.pageYOffset; // Current location on the page
+		if ( !fixedHeader ) { fixedHeader = document.querySelector('[data-scroll-header]'); }  // Get the fixed header if not already set
+		var headerHeight = fixedHeader === null ? 0 : ( getHeight( fixedHeader ) + fixedHeader.offsetTop ); // Get the height of a fixed header if one exists
 		var endLocation = getEndLocation( anchorElem, headerHeight, parseInt(settings.offset, 10) ); // Scroll to location
 		var animationInterval; // interval timer
 		var distance = endLocation - startLocation; // distance to travel
@@ -392,7 +394,6 @@
 		settings = null;
 		eventTimeout = null;
 		fixedHeader = null;
-		headerHeight = null;
 	};
 
 	/**
@@ -411,7 +412,6 @@
 		// Selectors and variables
 		settings = extend( defaults, options || {} ); // Merge user options with defaults
 		fixedHeader = document.querySelector('[data-scroll-header]'); // Get the fixed header
-		headerHeight = fixedHeader === null ? 0 : ( getHeight( fixedHeader ) + fixedHeader.offsetTop ); // Get the height of a fixed header if one exists
 
 		// When a toggle is clicked, run the click handler
 		document.addEventListener('click', eventHandler, false );

docs/dist/js/smooth-scroll.js

@@ -1,6 +1,6 @@
 {
 	"name": "smooth-scroll",
-	"version": "5.3.2",
+	"version": "5.3.3",
 	"description": "Animate scrolling to anchor links",
 	"main": "./dist/js/smooth-scroll.js",
 	"author": {