From 80a2d6ba807250dd5e2260900edd999e384c2b35 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Sat, 9 Nov 2013 11:20:34 -0500 Subject: [PATCH 001/285] Converted from spaces to tabs --- index.html | 52 +++++++-------- smooth-scroll.js | 162 +++++++++++++++++++++++------------------------ 2 files changed, 107 insertions(+), 107 deletions(-) diff --git a/index.html b/index.html index f4c12e2..5d23558 100644 --- a/index.html +++ b/index.html @@ -1,47 +1,47 @@ - - Smooth Scroll - A simple vanilla JS script to animate scrolling to anchor links. - - - - + + Smooth Scroll - A simple vanilla JS script to animate scrolling to anchor links. + + + +
-

Smooth Scroll

-

A simple vanilla JS script to animate scrolling to anchor links.

+

Smooth Scroll

+

A simple vanilla JS script to animate scrolling to anchor links.

-

Bazinga Booya

+

Bazinga Booya

-

- .
.
.
.
.
.
.
.
.
.
.
.
.
- .
.
.
.
.
.
.
.
.
.
.
.
.
- .
.
.
.
.
.
.
.
.
.
.
.
. -

+

+ .
.
.
.
.
.
.
.
.
.
.
.
.
+ .
.
.
.
.
.
.
.
.
.
.
.
.
+ .
.
.
.
.
.
.
.
.
.
.
.
. +

-

Bazinga!

+

Bazinga!

-

- .
.
.
.
.
.
.
.
.
.
.
.
.
- .
.
.
.
.
.
.
.
.
.
.
.
.
- .
.
.
.
.
.
.
.
.
.
.
.
. -

+

+ .
.
.
.
.
.
.
.
.
.
.
.
.
+ .
.
.
.
.
.
.
.
.
.
.
.
.
+ .
.
.
.
.
.
.
.
.
.
.
.
. +

-

Booya!

+

Booya!

-

Back to the top

+

Back to the top

- - + + diff --git a/smooth-scroll.js b/smooth-scroll.js index 17dd563..ea32957 100644 --- a/smooth-scroll.js +++ b/smooth-scroll.js @@ -1,90 +1,90 @@ /* ============================================================= - Smooth Scroll 2.3 - Animate scrolling to anchor links, by Chris Ferdinandi. - http://gomakethings.com + Smooth Scroll 2.3 + Animate scrolling to anchor links, by Chris Ferdinandi. + http://gomakethings.com + + Free to use under the MIT License. + http://gomakethings.com/mit/ - Free to use under the MIT License. - http://gomakethings.com/mit/ - * ============================================================= */ (function() { - 'use strict'; - - // Feature Test - if ( 'querySelector' in document && 'addEventListener' in window && Array.prototype.forEach ) { - - // Function to animate the scroll - var smoothScroll = function (anchor, duration) { - - // Calculate how far and how fast to scroll - var startLocation = window.pageYOffset; - var endLocation = anchor.offsetTop; - var distance = endLocation - startLocation; - var increments = distance/(duration/16); - var stopAnimation; - - // Scroll the page by an increment, and check if it's time to stop - var animateScroll = function () { - window.scrollBy(0, increments); - stopAnimation(); - }; - - // If scrolling down - if ( increments >= 0 ) { - // Stop animation when you reach the anchor OR the bottom of the page - stopAnimation = function () { - var travelled = window.pageYOffset; - if ( (travelled >= (endLocation - increments)) || ((window.innerHeight + travelled) >= document.body.offsetHeight) ) { - clearInterval(runAnimation); - } - }; - } - // If scrolling up - else { - // Stop animation when you reach the anchor OR the top of the page - stopAnimation = function () { - var travelled = window.pageYOffset; - if ( travelled <= (endLocation || 0) ) { - clearInterval(runAnimation); - } - }; - } - - // Loop the animation function - var runAnimation = setInterval(animateScroll, 16); - - }; - - // Define smooth scroll links - var scrollToggle = document.querySelectorAll('.scroll'); - - // For each smooth scroll link - [].forEach.call(scrollToggle, function (toggle) { - - // When the smooth scroll link is clicked - toggle.addEventListener('click', function(e) { - - // Prevent the default link behavior - e.preventDefault(); - - // Get anchor link and calculate distance from the top - var dataID = toggle.getAttribute('href'); - var dataTarget = document.querySelector(dataID); - var dataSpeed = toggle.getAttribute('data-speed'); - - // If the anchor exists - if (dataTarget) { - // Scroll to the anchor - smoothScroll(dataTarget, dataSpeed || 500); - } - - }, false); - - }); - - } + 'use strict'; + + // Feature Test + if ( 'querySelector' in document && 'addEventListener' in window && Array.prototype.forEach ) { + + // Function to animate the scroll + var smoothScroll = function (anchor, duration) { + + // Calculate how far and how fast to scroll + var startLocation = window.pageYOffset; + var endLocation = anchor.offsetTop; + var distance = endLocation - startLocation; + var increments = distance/(duration/16); + var stopAnimation; + + // Scroll the page by an increment, and check if it's time to stop + var animateScroll = function () { + window.scrollBy(0, increments); + stopAnimation(); + }; + + // If scrolling down + if ( increments >= 0 ) { + // Stop animation when you reach the anchor OR the bottom of the page + stopAnimation = function () { + var travelled = window.pageYOffset; + if ( (travelled >= (endLocation - increments)) || ((window.innerHeight + travelled) >= document.body.offsetHeight) ) { + clearInterval(runAnimation); + } + }; + } + // If scrolling up + else { + // Stop animation when you reach the anchor OR the top of the page + stopAnimation = function () { + var travelled = window.pageYOffset; + if ( travelled <= (endLocation || 0) ) { + clearInterval(runAnimation); + } + }; + } + + // Loop the animation function + var runAnimation = setInterval(animateScroll, 16); + + }; + + // Define smooth scroll links + var scrollToggle = document.querySelectorAll('.scroll'); + + // For each smooth scroll link + [].forEach.call(scrollToggle, function (toggle) { + + // When the smooth scroll link is clicked + toggle.addEventListener('click', function(e) { + + // Prevent the default link behavior + e.preventDefault(); + + // Get anchor link and calculate distance from the top + var dataID = toggle.getAttribute('href'); + var dataTarget = document.querySelector(dataID); + var dataSpeed = toggle.getAttribute('data-speed'); + + // If the anchor exists + if (dataTarget) { + // Scroll to the anchor + smoothScroll(dataTarget, dataSpeed || 500); + } + + }, false); + + }); + + } })(); \ No newline at end of file From 7f8935cc038848949dfb247689c4ef139ad3359d Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Thu, 21 Nov 2013 15:00:25 -0500 Subject: [PATCH 002/285] Added easing support --- README.md | 2 ++ index.html | 37 ++++++++++++++++++++++++++----- smooth-scroll.js | 57 ++++++++++++++++++++++++++++++++++-------------- 3 files changed, 74 insertions(+), 22 deletions(-) mode change 100644 => 100755 smooth-scroll.js diff --git a/README.md b/README.md index 8c37b6d..13f9d48 100755 --- a/README.md +++ b/README.md @@ -5,6 +5,8 @@ A simple script to animate scrolling to anchor links. Getting started with Smooth Scroll is really easy. [View the online tutorial](http://cferdinandi.github.com/smooth-scroll/) or dig through the `index.html` file. ## Changelog +* v2.4 (November 21, 2013) + * Added easing support with contributions from [Willem Liu](https://github.com/willemliu) and code from [Gaëtan Renaudeau](https://gist.github.com/gre/1650294). * v2.3 (August 27, 2013) * Added missing semicolons. * Defined `animationStop` variable once, add values later. diff --git a/index.html b/index.html index 5d23558..11f55bd 100644 --- a/index.html +++ b/index.html @@ -15,9 +15,36 @@

Smooth Scroll

-

A simple vanilla JS script to animate scrolling to anchor links.

+

A lightweight script to animate scrolling to anchor links.

-

Bazinga Booya

+

+ Linear
+ Linear (no other options)
+

+ +

+ Ease-In
+ Gentle
+ Normal
+ Intense
+ Extreme +

+ +

+ Ease-In-Out
+ Gentle
+ Normal
+ Intense
+ Extreme +

+ +

+ Ease-Out
+ Gentle
+ Normal
+ Intense
+ Extreme +

.
.
.
.
.
.
.
.
.
.
.
.
.
@@ -33,9 +60,7 @@

Smooth Scroll

.
.
.
.
.
.
.
.
.
.
.
.
.

-

Booya!

- -

Back to the top

+

Back to the top

@@ -44,4 +69,4 @@

Smooth Scroll

- + \ No newline at end of file diff --git a/smooth-scroll.js b/smooth-scroll.js old mode 100644 new mode 100755 index ea32957..e4d8440 --- a/smooth-scroll.js +++ b/smooth-scroll.js @@ -1,15 +1,21 @@ /* ============================================================= - Smooth Scroll 2.3 + Smooth Scroll 2.4 Animate scrolling to anchor links, by Chris Ferdinandi. http://gomakethings.com + Easing support contributed by Willem Liu. + https://github.com/willemliu + + Easing functions forked from Gaëtan Renaudeau. + https://gist.github.com/gre/1650294 + Free to use under the MIT License. http://gomakethings.com/mit/ * ============================================================= */ - (function() { +(function() { 'use strict'; @@ -17,23 +23,45 @@ if ( 'querySelector' in document && 'addEventListener' in window && Array.prototype.forEach ) { // Function to animate the scroll - var smoothScroll = function (anchor, duration) { + var smoothScroll = function (anchor, duration, easing) { // Calculate how far and how fast to scroll var startLocation = window.pageYOffset; var endLocation = anchor.offsetTop; var distance = endLocation - startLocation; - var increments = distance/(duration/16); - var stopAnimation; + var increments = distance / (duration / 16); + var timeLapsed = 0; + var percentage, position, stopAnimation; + + // Functions to control easing + var easingPattern = function (type, timing) { + if ( type == 'linear' ) return timing; // no easing, no acceleration + if ( type == 'easeInGentle' ) return timing * timing; // accelerating from zero velocity + if ( type == 'easeOutGentle' ) return timing * (2 - timing); // decelerating to zero velocity + if ( type == 'easeInOutGentle' ) return timing < 0.5 ? 2 * timing * timing : -1 + (4 - 2 * timing) * timing; // acceleration until halfway, then deceleration + if ( type == 'easeInNormal' ) return timing * timing * timing; // accelerating from zero velocity + if ( type == 'easeOutNormal' ) return (--timing) * timing * timing + 1; // decelerating to zero velocity + if ( type == 'easeInOutNormal' ) return timing < 0.5 ? 4 * timing * timing * timing : (timing - 1) * (2 * timing - 2) * (2 * timing - 2) + 1; // acceleration until halfway, then deceleration + if ( type == 'easeInIntense' ) return timing * timing * timing * timing; // accelerating from zero velocity + if ( type == 'easeOutInense' ) return 1 - (--timing) * timing * timing * timing; // decelerating to zero velocity + if ( type == 'easeInOutIntense' ) return timing < 0.5 ? 8 * timing * timing * timing * timing : 1 - 8 * (--timing) * timing * timing * timing; // acceleration until halfway, then deceleration + if ( type == 'easeInExtreme' ) return timing * timing * timing * timing * timing; // accelerating from zero velocity + if ( type == 'easeOutExtreme' ) return 1 + (--timing) * timing * timing * timing * timing; // decelerating to zero velocity + if ( type == 'easeInOutExtreme' ) return timing < 0.5 ? 16 * timing * timing * timing * timing * timing : 1 + 16 * (--timing) * timing * timing * timing * timing; // acceleration until halfway, then deceleration + }; // Scroll the page by an increment, and check if it's time to stop var animateScroll = function () { - window.scrollBy(0, increments); + timeLapsed += 16; + percentage = ( timeLapsed / duration ); + percentage = ( percentage > 1 ) ? 1 : percentage; + position = startLocation + ( distance * easingPattern(easing, percentage) ); + window.scrollTo(0, position); stopAnimation(); }; - // If scrolling down - if ( increments >= 0 ) { + // Stop the animation + if ( increments >= 0 ) { // If scrolling down // Stop animation when you reach the anchor OR the bottom of the page stopAnimation = function () { var travelled = window.pageYOffset; @@ -41,9 +69,7 @@ clearInterval(runAnimation); } }; - } - // If scrolling up - else { + } else { // If scrolling up // Stop animation when you reach the anchor OR the top of the page stopAnimation = function () { var travelled = window.pageYOffset; @@ -58,10 +84,8 @@ }; - // Define smooth scroll links - var scrollToggle = document.querySelectorAll('.scroll'); - // For each smooth scroll link + var scrollToggle = document.querySelectorAll('.scroll'); [].forEach.call(scrollToggle, function (toggle) { // When the smooth scroll link is clicked @@ -74,11 +98,12 @@ var dataID = toggle.getAttribute('href'); var dataTarget = document.querySelector(dataID); var dataSpeed = toggle.getAttribute('data-speed'); + var dataEasing = toggle.getAttribute('data-easing'); // WL: Added easing attribute support. // If the anchor exists if (dataTarget) { // Scroll to the anchor - smoothScroll(dataTarget, dataSpeed || 500); + smoothScroll(dataTarget, dataSpeed || 500, dataEasing || 'linear'); } }, false); @@ -87,4 +112,4 @@ } - })(); \ No newline at end of file +})(); \ No newline at end of file From 20f00b7675e119f2cdb50936fe885479c7253080 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Fri, 22 Nov 2013 10:59:55 -0500 Subject: [PATCH 003/285] Changed default easing to `easeInOutNormal` --- README.md | 6 ++++-- smooth-scroll.js | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 13f9d48..a2deea5 100755 --- a/README.md +++ b/README.md @@ -1,10 +1,12 @@ # Smooth Scroll -A simple script to animate scrolling to anchor links. +A simple script to animate scrolling to anchor links. Easing support contributed by [Willem Liu](https://github.com/willemliu) with code from [Gaëtan Renaudeau](https://gist.github.com/gre/1650294). ## How It Works Getting started with Smooth Scroll is really easy. [View the online tutorial](http://cferdinandi.github.com/smooth-scroll/) or dig through the `index.html` file. ## Changelog +* v2.5 (November 22, 2013) + * Changed the default easing to `easeInOutNormal`. * v2.4 (November 21, 2013) * Added easing support with contributions from [Willem Liu](https://github.com/willemliu) and code from [Gaëtan Renaudeau](https://gist.github.com/gre/1650294). * v2.3 (August 27, 2013) @@ -29,4 +31,4 @@ Getting started with Smooth Scroll is really easy. [View the online tutorial](ht * Initial release. ## License -Smooth Scroll is free to use under the [MIT License](http://gomakethings.com/mit/). +Smooth Scroll is free to use under the [MIT License](http://gomakethings.com/mit/). \ No newline at end of file diff --git a/smooth-scroll.js b/smooth-scroll.js index e4d8440..6718d6d 100755 --- a/smooth-scroll.js +++ b/smooth-scroll.js @@ -1,6 +1,6 @@ /* ============================================================= - Smooth Scroll 2.4 + Smooth Scroll 2.5 Animate scrolling to anchor links, by Chris Ferdinandi. http://gomakethings.com @@ -103,7 +103,7 @@ // If the anchor exists if (dataTarget) { // Scroll to the anchor - smoothScroll(dataTarget, dataSpeed || 500, dataEasing || 'linear'); + smoothScroll(dataTarget, dataSpeed || 500, dataEasing || 'easeInOutNormal'); } }, false); From 893ad3ca82d5d47809e7f1d6630319fa639190f8 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Fri, 22 Nov 2013 16:17:09 -0500 Subject: [PATCH 004/285] Typos fixed --- smooth-scroll.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/smooth-scroll.js b/smooth-scroll.js index 6718d6d..7f068fe 100755 --- a/smooth-scroll.js +++ b/smooth-scroll.js @@ -43,7 +43,7 @@ if ( type == 'easeOutNormal' ) return (--timing) * timing * timing + 1; // decelerating to zero velocity if ( type == 'easeInOutNormal' ) return timing < 0.5 ? 4 * timing * timing * timing : (timing - 1) * (2 * timing - 2) * (2 * timing - 2) + 1; // acceleration until halfway, then deceleration if ( type == 'easeInIntense' ) return timing * timing * timing * timing; // accelerating from zero velocity - if ( type == 'easeOutInense' ) return 1 - (--timing) * timing * timing * timing; // decelerating to zero velocity + if ( type == 'easeOutIntense' ) return 1 - (--timing) * timing * timing * timing; // decelerating to zero velocity if ( type == 'easeInOutIntense' ) return timing < 0.5 ? 8 * timing * timing * timing * timing : 1 - 8 * (--timing) * timing * timing * timing; // acceleration until halfway, then deceleration if ( type == 'easeInExtreme' ) return timing * timing * timing * timing * timing; // accelerating from zero velocity if ( type == 'easeOutExtreme' ) return 1 + (--timing) * timing * timing * timing * timing; // decelerating to zero velocity From 39f5555619f773c0573991ee791dad679f81df28 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Fri, 22 Nov 2013 16:19:13 -0500 Subject: [PATCH 005/285] Missing character was causing certain easing functions to break. --- README.md | 2 ++ smooth-scroll.js | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index a2deea5..2a26bdf 100755 --- a/README.md +++ b/README.md @@ -5,6 +5,8 @@ A simple script to animate scrolling to anchor links. Easing support contributed Getting started with Smooth Scroll is really easy. [View the online tutorial](http://cferdinandi.github.com/smooth-scroll/) or dig through the `index.html` file. ## Changelog +* v2.6 (November 26, 2013) + * Missing character was causing certain easing functions to break. * v2.5 (November 22, 2013) * Changed the default easing to `easeInOutNormal`. * v2.4 (November 21, 2013) diff --git a/smooth-scroll.js b/smooth-scroll.js index 7f068fe..2cda354 100755 --- a/smooth-scroll.js +++ b/smooth-scroll.js @@ -1,6 +1,6 @@ /* ============================================================= - Smooth Scroll 2.5 + Smooth Scroll 2.6 Animate scrolling to anchor links, by Chris Ferdinandi. http://gomakethings.com From 3b388f0d3e3517cd8d82a4b8f39bbcc00353a00c Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Mon, 25 Nov 2013 12:59:24 -0500 Subject: [PATCH 006/285] Converted naming conventions back to mathmatical roots (ex. `easeInCubic`) to remain consistent with development community language. https://github.com/cferdinandi/smooth-scroll/pull/6 --- README.md | 2 ++ smooth-scroll.js | 32 ++++++++++++++++---------------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 2a26bdf..7d6c6ef 100755 --- a/README.md +++ b/README.md @@ -5,6 +5,8 @@ A simple script to animate scrolling to anchor links. Easing support contributed Getting started with Smooth Scroll is really easy. [View the online tutorial](http://cferdinandi.github.com/smooth-scroll/) or dig through the `index.html` file. ## Changelog +* v2.7 (November 25, 2013) + * Converted naming conventions back to mathmatical roots (ex. `easeInCubic`) to remain consistent with development community language. * v2.6 (November 26, 2013) * Missing character was causing certain easing functions to break. * v2.5 (November 22, 2013) diff --git a/smooth-scroll.js b/smooth-scroll.js index 2cda354..3c4053f 100755 --- a/smooth-scroll.js +++ b/smooth-scroll.js @@ -1,6 +1,6 @@ /* ============================================================= - Smooth Scroll 2.6 + Smooth Scroll 2.7 Animate scrolling to anchor links, by Chris Ferdinandi. http://gomakethings.com @@ -34,20 +34,20 @@ var percentage, position, stopAnimation; // Functions to control easing - var easingPattern = function (type, timing) { - if ( type == 'linear' ) return timing; // no easing, no acceleration - if ( type == 'easeInGentle' ) return timing * timing; // accelerating from zero velocity - if ( type == 'easeOutGentle' ) return timing * (2 - timing); // decelerating to zero velocity - if ( type == 'easeInOutGentle' ) return timing < 0.5 ? 2 * timing * timing : -1 + (4 - 2 * timing) * timing; // acceleration until halfway, then deceleration - if ( type == 'easeInNormal' ) return timing * timing * timing; // accelerating from zero velocity - if ( type == 'easeOutNormal' ) return (--timing) * timing * timing + 1; // decelerating to zero velocity - if ( type == 'easeInOutNormal' ) return timing < 0.5 ? 4 * timing * timing * timing : (timing - 1) * (2 * timing - 2) * (2 * timing - 2) + 1; // acceleration until halfway, then deceleration - if ( type == 'easeInIntense' ) return timing * timing * timing * timing; // accelerating from zero velocity - if ( type == 'easeOutIntense' ) return 1 - (--timing) * timing * timing * timing; // decelerating to zero velocity - if ( type == 'easeInOutIntense' ) return timing < 0.5 ? 8 * timing * timing * timing * timing : 1 - 8 * (--timing) * timing * timing * timing; // acceleration until halfway, then deceleration - if ( type == 'easeInExtreme' ) return timing * timing * timing * timing * timing; // accelerating from zero velocity - if ( type == 'easeOutExtreme' ) return 1 + (--timing) * timing * timing * timing * timing; // decelerating to zero velocity - if ( type == 'easeInOutExtreme' ) return timing < 0.5 ? 16 * timing * timing * timing * timing * timing : 1 + 16 * (--timing) * timing * timing * timing * timing; // acceleration until halfway, then deceleration + var easingPattern = function (type, time) { + if ( type == 'linear' ) return time; // no easing, no acceleration + if ( type == 'easeInQuad' ) return time * time; // accelerating from zero velocity + if ( type == 'easeOutQuad' ) return time * (2 - time); // decelerating to zero velocity + if ( type == 'easeInOutQuad' ) return time < 0.5 ? 2 * time * time : -1 + (4 - 2 * time) * time; // acceleration until halfway, then deceleration + if ( type == 'easeInCubic' ) return time * time * time; // accelerating from zero velocity + if ( type == 'easeOutCubic' ) return (--time) * time * time + 1; // decelerating to zero velocity + if ( type == 'easeInOutCubic' ) return time < 0.5 ? 4 * time * time * time : (time - 1) * (2 * time - 2) * (2 * time - 2) + 1; // acceleration until halfway, then deceleration + if ( type == 'easeInQuart' ) return time * time * time * time; // accelerating from zero velocity + if ( type == 'easeOutQuart' ) return 1 - (--time) * time * time * time; // decelerating to zero velocity + if ( type == 'easeInOutQuart' ) return time < 0.5 ? 8 * time * time * time * time : 1 - 8 * (--time) * time * time * time; // acceleration until halfway, then deceleration + if ( type == 'easeInQuint' ) return time * time * time * time * time; // accelerating from zero velocity + if ( type == 'easeOutQuint' ) return 1 + (--time) * time * time * time * time; // decelerating to zero velocity + if ( type == 'easeInOutQuint' ) return time < 0.5 ? 16 * time * time * time * time * time : 1 + 16 * (--time) * time * time * time * time; // acceleration until halfway, then deceleration }; // Scroll the page by an increment, and check if it's time to stop @@ -103,7 +103,7 @@ // If the anchor exists if (dataTarget) { // Scroll to the anchor - smoothScroll(dataTarget, dataSpeed || 500, dataEasing || 'easeInOutNormal'); + smoothScroll(dataTarget, dataSpeed || 500, dataEasing || 'easeInOutCubic'); } }, false); From f372c9ffba6a16d5c25601ff1882aed8c9268027 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Mon, 2 Dec 2013 09:20:15 -0500 Subject: [PATCH 007/285] Fixed typos in `index.html` --- index.html | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/index.html b/index.html index 11f55bd..eefc5bf 100644 --- a/index.html +++ b/index.html @@ -24,26 +24,26 @@

Smooth Scroll

Ease-In
- Gentle
- Normal
- Intense
- Extreme + Quad
+ Cubic
+ Quart
+ Quint

Ease-In-Out
- Gentle
- Normal
- Intense
- Extreme + Quad
+ Cubic
+ Quart
+ Quint

Ease-Out
- Gentle
- Normal
- Intense
- Extreme + Quad
+ Cubic
+ Quart
+ Quint

@@ -60,7 +60,7 @@

Smooth Scroll

.
.
.
.
.
.
.
.
.
.
.
.
.

-

Back to the top

+

Back to the top

From 208b5a0dd6a56a7bdf2770e7f309e51dc9cfe525 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Tue, 3 Dec 2013 09:39:43 -0500 Subject: [PATCH 008/285] Fixed false distance reading Also added linear easing as fallback when easing pattern not recognized to prevent script from failing. --- README.md | 3 +++ smooth-scroll.js | 32 +++++++++++++++++++++----------- 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 7d6c6ef..a4eebcb 100755 --- a/README.md +++ b/README.md @@ -5,6 +5,9 @@ A simple script to animate scrolling to anchor links. Easing support contributed Getting started with Smooth Scroll is really easy. [View the online tutorial](http://cferdinandi.github.com/smooth-scroll/) or dig through the `index.html` file. ## Changelog +* v2.8 (December 3, 2013) + * [Fixed false distance reading.](https://github.com/cferdinandi/smooth-scroll/issues/11) + * Added linear easing as fallback when easing pattern not recognized to prevent script from failing. * v2.7 (November 25, 2013) * Converted naming conventions back to mathmatical roots (ex. `easeInCubic`) to remain consistent with development community language. * v2.6 (November 26, 2013) diff --git a/smooth-scroll.js b/smooth-scroll.js index 3c4053f..9441f5e 100755 --- a/smooth-scroll.js +++ b/smooth-scroll.js @@ -25,17 +25,8 @@ // Function to animate the scroll var smoothScroll = function (anchor, duration, easing) { - // Calculate how far and how fast to scroll - var startLocation = window.pageYOffset; - var endLocation = anchor.offsetTop; - var distance = endLocation - startLocation; - var increments = distance / (duration / 16); - var timeLapsed = 0; - var percentage, position, stopAnimation; - // Functions to control easing var easingPattern = function (type, time) { - if ( type == 'linear' ) return time; // no easing, no acceleration if ( type == 'easeInQuad' ) return time * time; // accelerating from zero velocity if ( type == 'easeOutQuad' ) return time * (2 - time); // decelerating to zero velocity if ( type == 'easeInOutQuad' ) return time < 0.5 ? 2 * time * time : -1 + (4 - 2 * time) * time; // acceleration until halfway, then deceleration @@ -48,7 +39,26 @@ if ( type == 'easeInQuint' ) return time * time * time * time * time; // accelerating from zero velocity if ( type == 'easeOutQuint' ) return 1 + (--time) * time * time * time * time; // decelerating to zero velocity if ( type == 'easeInOutQuint' ) return time < 0.5 ? 16 * time * time * time * time * time : 1 + 16 * (--time) * time * time * time * time; // acceleration until halfway, then deceleration + return time; // no easing, no acceleration + }; + + // Calculate how far and how fast to scroll + // http://www.quirksmode.org/blog/archives/2008/01/using_the_assig.html + var startLocation = window.pageYOffset; + var endLocation = function (anchor) { + var distance = 0; + if (anchor.offsetParent) { + do { + distance += anchor.offsetTop; + anchor = anchor.offsetParent; + } while (anchor); + } + return distance; }; + var distance = endLocation(anchor) - startLocation; + var increments = distance / (duration / 16); + var timeLapsed = 0; + var percentage, position, stopAnimation; // Scroll the page by an increment, and check if it's time to stop var animateScroll = function () { @@ -65,7 +75,7 @@ // Stop animation when you reach the anchor OR the bottom of the page stopAnimation = function () { var travelled = window.pageYOffset; - if ( (travelled >= (endLocation - increments)) || ((window.innerHeight + travelled) >= document.body.offsetHeight) ) { + if ( (travelled >= (endLocation(anchor) - increments)) || ((window.innerHeight + travelled) >= document.body.offsetHeight) ) { clearInterval(runAnimation); } }; @@ -73,7 +83,7 @@ // Stop animation when you reach the anchor OR the top of the page stopAnimation = function () { var travelled = window.pageYOffset; - if ( travelled <= (endLocation || 0) ) { + if ( travelled <= (endLocation(anchor) || 0) ) { clearInterval(runAnimation); } }; From ad413a42d2433775d7665a03e35b21175f17d79f Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Tue, 3 Dec 2013 09:40:18 -0500 Subject: [PATCH 009/285] Updated version number --- smooth-scroll.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/smooth-scroll.js b/smooth-scroll.js index 9441f5e..bdcb497 100755 --- a/smooth-scroll.js +++ b/smooth-scroll.js @@ -1,6 +1,6 @@ /* ============================================================= - Smooth Scroll 2.7 + Smooth Scroll 2.8 Animate scrolling to anchor links, by Chris Ferdinandi. http://gomakethings.com From 3dc805c1052239d7975a38f91f0299ff9cc77c91 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Mon, 9 Dec 2013 20:24:51 -0500 Subject: [PATCH 010/285] Added fixed for infinite loop when scrolling up https://github.com/cferdinandi/smooth-scroll/issues/13 --- README.md | 2 ++ smooth-scroll.js | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a4eebcb..829b739 100755 --- a/README.md +++ b/README.md @@ -5,6 +5,8 @@ A simple script to animate scrolling to anchor links. Easing support contributed Getting started with Smooth Scroll is really easy. [View the online tutorial](http://cferdinandi.github.com/smooth-scroll/) or dig through the `index.html` file. ## Changelog +* v2.9 (December 9, 2013) + * [Added fixed for infinite loop when scrolling up.](https://github.com/cferdinandi/smooth-scroll/issues/13) * v2.8 (December 3, 2013) * [Fixed false distance reading.](https://github.com/cferdinandi/smooth-scroll/issues/11) * Added linear easing as fallback when easing pattern not recognized to prevent script from failing. diff --git a/smooth-scroll.js b/smooth-scroll.js index bdcb497..3c2a890 100755 --- a/smooth-scroll.js +++ b/smooth-scroll.js @@ -1,6 +1,6 @@ /* ============================================================= - Smooth Scroll 2.8 + Smooth Scroll 2.9 Animate scrolling to anchor links, by Chris Ferdinandi. http://gomakethings.com @@ -83,7 +83,7 @@ // Stop animation when you reach the anchor OR the top of the page stopAnimation = function () { var travelled = window.pageYOffset; - if ( travelled <= (endLocation(anchor) || 0) ) { + if ( travelled <= endLocation(anchor) || travelled <= 0 ) { clearInterval(runAnimation); } }; From abd69e4ae6330a6e5d92730ff61f9e757b7c94e3 Mon Sep 17 00:00:00 2001 From: PG Date: Wed, 18 Dec 2013 07:02:27 +0800 Subject: [PATCH 011/285] Use scrollHeight instead of offsetHeight --- smooth-scroll.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/smooth-scroll.js b/smooth-scroll.js index 3c2a890..9023f4c 100755 --- a/smooth-scroll.js +++ b/smooth-scroll.js @@ -75,7 +75,7 @@ // Stop animation when you reach the anchor OR the bottom of the page stopAnimation = function () { var travelled = window.pageYOffset; - if ( (travelled >= (endLocation(anchor) - increments)) || ((window.innerHeight + travelled) >= document.body.offsetHeight) ) { + if ( (travelled >= (endLocation(anchor) - increments)) || ((window.innerHeight + travelled) >= document.body.scrollHeight) ) { clearInterval(runAnimation); } }; From 3d3d9a2acfa68ba2378c0c464dcdfbf53b3f4ee3 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Tue, 31 Dec 2013 13:32:33 -0500 Subject: [PATCH 012/285] Added URL history update support https://github.com/cferdinandi/smooth-scroll/pull/17 --- README.md | 2 ++ index.html | 2 +- smooth-scroll.js | 21 +++++++++++++++++---- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 829b739..89b0be8 100755 --- a/README.md +++ b/README.md @@ -5,6 +5,8 @@ A simple script to animate scrolling to anchor links. Easing support contributed Getting started with Smooth Scroll is really easy. [View the online tutorial](http://cferdinandi.github.com/smooth-scroll/) or dig through the `index.html` file. ## Changelog +* v2.10 (December 31, 2013) + * [Added URL history support.](https://github.com/cferdinandi/smooth-scroll/pull/17) * v2.9 (December 9, 2013) * [Added fixed for infinite loop when scrolling up.](https://github.com/cferdinandi/smooth-scroll/issues/13) * v2.8 (December 3, 2013) diff --git a/index.html b/index.html index eefc5bf..8b2aee5 100644 --- a/index.html +++ b/index.html @@ -60,7 +60,7 @@

Smooth Scroll

.
.
.
.
.
.
.
.
.
.
.
.
.

-

Back to the top

+

Back to the top

diff --git a/smooth-scroll.js b/smooth-scroll.js index 3c2a890..4a46713 100755 --- a/smooth-scroll.js +++ b/smooth-scroll.js @@ -1,6 +1,6 @@ /* ============================================================= - Smooth Scroll 2.9 + Smooth Scroll 2.10 Animate scrolling to anchor links, by Chris Ferdinandi. http://gomakethings.com @@ -10,6 +10,9 @@ Easing functions forked from Gaëtan Renaudeau. https://gist.github.com/gre/1650294 + URL history support contributed by Robert Pate. + https://github.com/robertpateii + Free to use under the MIT License. http://gomakethings.com/mit/ @@ -23,7 +26,7 @@ if ( 'querySelector' in document && 'addEventListener' in window && Array.prototype.forEach ) { // Function to animate the scroll - var smoothScroll = function (anchor, duration, easing) { + var smoothScroll = function (anchor, duration, easing, url) { // Functions to control easing var easingPattern = function (type, time) { @@ -42,6 +45,13 @@ return time; // no easing, no acceleration }; + // Function to update URL + var updateURL = function (url, anchor) { + if ( url === 'true' && history.pushState ) { + history.pushState(null, null, '#' + anchor.id); + } + }; + // Calculate how far and how fast to scroll // http://www.quirksmode.org/blog/archives/2008/01/using_the_assig.html var startLocation = window.pageYOffset; @@ -77,6 +87,7 @@ var travelled = window.pageYOffset; if ( (travelled >= (endLocation(anchor) - increments)) || ((window.innerHeight + travelled) >= document.body.offsetHeight) ) { clearInterval(runAnimation); + updateURL(url, anchor); } }; } else { // If scrolling up @@ -85,6 +96,7 @@ var travelled = window.pageYOffset; if ( travelled <= endLocation(anchor) || travelled <= 0 ) { clearInterval(runAnimation); + updateURL(url, anchor); } }; } @@ -108,12 +120,13 @@ var dataID = toggle.getAttribute('href'); var dataTarget = document.querySelector(dataID); var dataSpeed = toggle.getAttribute('data-speed'); - var dataEasing = toggle.getAttribute('data-easing'); // WL: Added easing attribute support. + var dataEasing = toggle.getAttribute('data-easing'); + var dataURL = toggle.getAttribute('data-url'); // If the anchor exists if (dataTarget) { // Scroll to the anchor - smoothScroll(dataTarget, dataSpeed || 500, dataEasing || 'easeInOutCubic'); + smoothScroll(dataTarget, dataSpeed || 500, dataEasing || 'easeInOutCubic', dataURL || 'true'); } }, false); From 2b1f96ac86ad30049354f696bacd6db6507760f0 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Tue, 31 Dec 2013 13:44:55 -0500 Subject: [PATCH 013/285] Changed default data-url value to false --- index.html | 26 +++++++++++++------------- smooth-scroll.js | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/index.html b/index.html index 8b2aee5..a321ed5 100644 --- a/index.html +++ b/index.html @@ -19,31 +19,31 @@

Smooth Scroll

Linear
- Linear (no other options)
+ Linear (no other options)

Ease-In
- Quad
- Cubic
- Quart
- Quint + Quad
+ Cubic
+ Quart
+ Quint

Ease-In-Out
- Quad
- Cubic
- Quart
- Quint + Quad
+ Cubic
+ Quart
+ Quint

Ease-Out
- Quad
- Cubic
- Quart
- Quint + Quad
+ Cubic
+ Quart
+ Quint

diff --git a/smooth-scroll.js b/smooth-scroll.js index 4a46713..047463e 100755 --- a/smooth-scroll.js +++ b/smooth-scroll.js @@ -126,7 +126,7 @@ // If the anchor exists if (dataTarget) { // Scroll to the anchor - smoothScroll(dataTarget, dataSpeed || 500, dataEasing || 'easeInOutCubic', dataURL || 'true'); + smoothScroll(dataTarget, dataSpeed || 500, dataEasing || 'easeInOutCubic', dataURL || 'false'); } }, false); From 0d8889934d8026f17b2f6119ff6d42f3267549be Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Sat, 4 Jan 2014 21:04:05 -0500 Subject: [PATCH 014/285] Change `offsetHeight` to `scrollHeight` to fix fixed/absolute positioning issues. https://github.com/cferdinandi/smooth-scroll/pull/14 --- README.md | 2 ++ smooth-scroll.js | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 89b0be8..6075344 100755 --- a/README.md +++ b/README.md @@ -5,6 +5,8 @@ A simple script to animate scrolling to anchor links. Easing support contributed Getting started with Smooth Scroll is really easy. [View the online tutorial](http://cferdinandi.github.com/smooth-scroll/) or dig through the `index.html` file. ## Changelog +* v2.11 (January 4, 2013) + * [Change `offsetHeight` to `scrollHeight` to fix fixed/absolute positioning issues.](https://github.com/cferdinandi/smooth-scroll/pull/14) * v2.10 (December 31, 2013) * [Added URL history support.](https://github.com/cferdinandi/smooth-scroll/pull/17) * v2.9 (December 9, 2013) diff --git a/smooth-scroll.js b/smooth-scroll.js index 32822b5..339691d 100755 --- a/smooth-scroll.js +++ b/smooth-scroll.js @@ -1,6 +1,6 @@ /* ============================================================= - Smooth Scroll 2.10 + Smooth Scroll 2.11 Animate scrolling to anchor links, by Chris Ferdinandi. http://gomakethings.com From ed53fdb0c35e08a9ee6eb9c7ff7d6120dc4d4aba Mon Sep 17 00:00:00 2001 From: Arndt von Lucadou Date: Sun, 5 Jan 2014 19:10:21 +0100 Subject: [PATCH 015/285] Added fixed header option Websites using a fixed navigation bar can add the class "scroll-header" to the navigation element to offset the end of the scrolling animation at the right position - and not as default at the top of the page. --- smooth-scroll.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/smooth-scroll.js b/smooth-scroll.js index 339691d..098f2aa 100755 --- a/smooth-scroll.js +++ b/smooth-scroll.js @@ -63,7 +63,10 @@ anchor = anchor.offsetParent; } while (anchor); } - return distance; + // optional fixed header offset + var scrollHeader = document.querySelector( '.scroll-header' ); + var headerHeight = scrollHeader === null ? 0 : scrollHeader.offsetHeight; + return distance - headerHeight; }; var distance = endLocation(anchor) - startLocation; var increments = distance / (duration / 16); @@ -135,4 +138,4 @@ } -})(); \ No newline at end of file +})(); From 34f16ec1ade80a86b30bee6e6b97e762551ae1ec Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Tue, 7 Jan 2014 21:58:36 -0500 Subject: [PATCH 016/285] Added fixed header offset support https://github.com/cferdinandi/smooth-scroll/pull/20#issuecomment-317735 47 --- README.md | 4 +++- smooth-scroll.js | 11 +++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 6075344..d9bf260 100755 --- a/README.md +++ b/README.md @@ -5,7 +5,9 @@ A simple script to animate scrolling to anchor links. Easing support contributed Getting started with Smooth Scroll is really easy. [View the online tutorial](http://cferdinandi.github.com/smooth-scroll/) or dig through the `index.html` file. ## Changelog -* v2.11 (January 4, 2013) +* v2.12 (January 7, 2014) + * [Added fixed header support.](https://github.com/cferdinandi/smooth-scroll/pull/20#issuecomment-31773547) +* v2.11 (January 4, 2014) * [Change `offsetHeight` to `scrollHeight` to fix fixed/absolute positioning issues.](https://github.com/cferdinandi/smooth-scroll/pull/14) * v2.10 (December 31, 2013) * [Added URL history support.](https://github.com/cferdinandi/smooth-scroll/pull/17) diff --git a/smooth-scroll.js b/smooth-scroll.js index 098f2aa..95730fc 100755 --- a/smooth-scroll.js +++ b/smooth-scroll.js @@ -1,6 +1,6 @@ /* ============================================================= - Smooth Scroll 2.11 + Smooth Scroll 2.12 Animate scrolling to anchor links, by Chris Ferdinandi. http://gomakethings.com @@ -13,6 +13,9 @@ URL history support contributed by Robert Pate. https://github.com/robertpateii + Fixed header support contributed by Arndt von Lucadou. + https://github.com/a-v-l + Free to use under the MIT License. http://gomakethings.com/mit/ @@ -57,15 +60,15 @@ var startLocation = window.pageYOffset; var endLocation = function (anchor) { var distance = 0; + // If a fixed header is used, get its height + var scrollHeader = document.querySelector( '.scroll-header' ); + var headerHeight = scrollHeader === null ? 0 : scrollHeader.offsetHeight; if (anchor.offsetParent) { do { distance += anchor.offsetTop; anchor = anchor.offsetParent; } while (anchor); } - // optional fixed header offset - var scrollHeader = document.querySelector( '.scroll-header' ); - var headerHeight = scrollHeader === null ? 0 : scrollHeader.offsetHeight; return distance - headerHeight; }; var distance = endLocation(anchor) - startLocation; From 0f4f5278f70ccd8cf2f8243d8d2488b17a0846ab Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Tue, 7 Jan 2014 22:48:58 -0500 Subject: [PATCH 017/285] Moved variable placement for better performance --- smooth-scroll.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/smooth-scroll.js b/smooth-scroll.js index 95730fc..fea588b 100755 --- a/smooth-scroll.js +++ b/smooth-scroll.js @@ -58,11 +58,10 @@ // Calculate how far and how fast to scroll // http://www.quirksmode.org/blog/archives/2008/01/using_the_assig.html var startLocation = window.pageYOffset; + var scrollHeader = document.querySelector( '.scroll-header' ); + var headerHeight = scrollHeader === null ? 0 : scrollHeader.offsetHeight; var endLocation = function (anchor) { var distance = 0; - // If a fixed header is used, get its height - var scrollHeader = document.querySelector( '.scroll-header' ); - var headerHeight = scrollHeader === null ? 0 : scrollHeader.offsetHeight; if (anchor.offsetParent) { do { distance += anchor.offsetTop; From 1707d8705e03ee6423c7188f78a999fd10bc6e44 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Wed, 15 Jan 2014 19:06:57 -0500 Subject: [PATCH 018/285] Fixed bug that caused animation to stop several pixels short. https://github.com/cferdinandi/smooth-scroll/pull/15#issuecomment-323807 70 --- README.md | 2 ++ smooth-scroll.js | 59 ++++++++++++++++++++---------------------------- 2 files changed, 27 insertions(+), 34 deletions(-) diff --git a/README.md b/README.md index d9bf260..087044e 100755 --- a/README.md +++ b/README.md @@ -5,6 +5,8 @@ A simple script to animate scrolling to anchor links. Easing support contributed Getting started with Smooth Scroll is really easy. [View the online tutorial](http://cferdinandi.github.com/smooth-scroll/) or dig through the `index.html` file. ## Changelog +* v2.14 (January 15, 2014) + * [Fixed bug that caused animation to stop several pixels short.](https://github.com/cferdinandi/smooth-scroll/pull/15#issuecomment-32380770) * v2.12 (January 7, 2014) * [Added fixed header support.](https://github.com/cferdinandi/smooth-scroll/pull/20#issuecomment-31773547) * v2.11 (January 4, 2014) diff --git a/smooth-scroll.js b/smooth-scroll.js index fea588b..aa7f1db 100755 --- a/smooth-scroll.js +++ b/smooth-scroll.js @@ -1,6 +1,6 @@ /* ============================================================= - Smooth Scroll 2.12 + Smooth Scroll 2.14 Animate scrolling to anchor links, by Chris Ferdinandi. http://gomakethings.com @@ -55,12 +55,13 @@ } }; - // Calculate how far and how fast to scroll - // http://www.quirksmode.org/blog/archives/2008/01/using_the_assig.html - var startLocation = window.pageYOffset; - var scrollHeader = document.querySelector( '.scroll-header' ); + // Get the height of a fixed header if one exists + var scrollHeader = document.querySelector('.scroll-header'); var headerHeight = scrollHeader === null ? 0 : scrollHeader.offsetHeight; - var endLocation = function (anchor) { + + // Calculate how far to scroll + var startLocation = window.pageYOffset; + var getEndLocation = function (anchor) { var distance = 0; if (anchor.offsetParent) { do { @@ -70,10 +71,22 @@ } return distance - headerHeight; }; - var distance = endLocation(anchor) - startLocation; - var increments = distance / (duration / 16); + var endLocation = getEndLocation(anchor); + var distance = endLocation - startLocation; + + // Function to stop the scrolling animation + var stopAnimation = function () { + var currentLocation = window.pageYOffset; + // var there = endLocation(anchor); + if ( currentLocation == endLocation || ( (window.innerHeight + currentLocation) >= document.body.scrollHeight ) ) { + clearInterval(runAnimation); + updateURL(url, anchor); + } + }; + + // Set the animation variables to 0/undefined. var timeLapsed = 0; - var percentage, position, stopAnimation; + var percentage, position; // Scroll the page by an increment, and check if it's time to stop var animateScroll = function () { @@ -81,31 +94,10 @@ percentage = ( timeLapsed / duration ); percentage = ( percentage > 1 ) ? 1 : percentage; position = startLocation + ( distance * easingPattern(easing, percentage) ); - window.scrollTo(0, position); + window.scrollTo( 0, position ); stopAnimation(); }; - // Stop the animation - if ( increments >= 0 ) { // If scrolling down - // Stop animation when you reach the anchor OR the bottom of the page - stopAnimation = function () { - var travelled = window.pageYOffset; - if ( (travelled >= (endLocation(anchor) - increments)) || ((window.innerHeight + travelled) >= document.body.scrollHeight) ) { - clearInterval(runAnimation); - updateURL(url, anchor); - } - }; - } else { // If scrolling up - // Stop animation when you reach the anchor OR the top of the page - stopAnimation = function () { - var travelled = window.pageYOffset; - if ( travelled <= endLocation(anchor) || travelled <= 0 ) { - clearInterval(runAnimation); - updateURL(url, anchor); - } - }; - } - // Loop the animation function var runAnimation = setInterval(animateScroll, 16); @@ -128,10 +120,9 @@ var dataEasing = toggle.getAttribute('data-easing'); var dataURL = toggle.getAttribute('data-url'); - // If the anchor exists + // If the anchor exists, scroll to it if (dataTarget) { - // Scroll to the anchor - smoothScroll(dataTarget, dataSpeed || 500, dataEasing || 'easeInOutCubic', dataURL || 'false'); + smoothScroll( dataTarget, dataSpeed || 500, dataEasing || 'easeInOutCubic', dataURL || 'false' ); } }, false); From b43ffe2b8999423b62e40bb2c5b7d1ac924574a7 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Thu, 16 Jan 2014 18:59:14 -0500 Subject: [PATCH 019/285] Fixed bug that caused "scroll-to-top" animation to create endless loop. https://github.com/cferdinandi/smooth-scroll/issues/24 --- README.md | 2 ++ smooth-scroll.js | 16 +++++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 087044e..388f19e 100755 --- a/README.md +++ b/README.md @@ -5,6 +5,8 @@ A simple script to animate scrolling to anchor links. Easing support contributed Getting started with Smooth Scroll is really easy. [View the online tutorial](http://cferdinandi.github.com/smooth-scroll/) or dig through the `index.html` file. ## Changelog +* v2.15 (January 16, 2014) + * [Fixed bug that caused "scroll-to-top" animation to create endless loop.](https://github.com/cferdinandi/smooth-scroll/issues/24) * v2.14 (January 15, 2014) * [Fixed bug that caused animation to stop several pixels short.](https://github.com/cferdinandi/smooth-scroll/pull/15#issuecomment-32380770) * v2.12 (January 7, 2014) diff --git a/smooth-scroll.js b/smooth-scroll.js index aa7f1db..5e8b110 100755 --- a/smooth-scroll.js +++ b/smooth-scroll.js @@ -1,6 +1,6 @@ /* ============================================================= - Smooth Scroll 2.14 + Smooth Scroll 2.15 Animate scrolling to anchor links, by Chris Ferdinandi. http://gomakethings.com @@ -77,10 +77,16 @@ // Function to stop the scrolling animation var stopAnimation = function () { var currentLocation = window.pageYOffset; - // var there = endLocation(anchor); - if ( currentLocation == endLocation || ( (window.innerHeight + currentLocation) >= document.body.scrollHeight ) ) { - clearInterval(runAnimation); - updateURL(url, anchor); + if ( distance >= 0 ) { // If scrolling down + if ( currentLocation == endLocation || ( (window.innerHeight + currentLocation) >= document.body.scrollHeight ) ) { + clearInterval(runAnimation); + updateURL(url, anchor); + } + } else { // If scrolling up + if ( currentLocation == endLocation || currentLocation === 0 ) { + clearInterval(runAnimation); + updateURL(url, anchor); + } } }; From 05101b1c60a32f5a9b8eefe0453d7dad20c91d4e Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Thu, 16 Jan 2014 21:03:28 -0500 Subject: [PATCH 020/285] Updated variables for more accurate easing math when scrolling to top of page. https://github.com/cferdinandi/smooth-scroll/pull/25#issuecomment-325667 29 --- README.md | 2 ++ smooth-scroll.js | 26 ++++++++++++-------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 388f19e..1628e82 100755 --- a/README.md +++ b/README.md @@ -5,6 +5,8 @@ A simple script to animate scrolling to anchor links. Easing support contributed Getting started with Smooth Scroll is really easy. [View the online tutorial](http://cferdinandi.github.com/smooth-scroll/) or dig through the `index.html` file. ## Changelog +* v2.16 (Junuary 16, 2014) + * [Updated variables for more accurate easing math when scrolling to top of page.](https://github.com/cferdinandi/smooth-scroll/pull/25#issuecomment-32566729) * v2.15 (January 16, 2014) * [Fixed bug that caused "scroll-to-top" animation to create endless loop.](https://github.com/cferdinandi/smooth-scroll/issues/24) * v2.14 (January 15, 2014) diff --git a/smooth-scroll.js b/smooth-scroll.js index 5e8b110..e1b8a52 100755 --- a/smooth-scroll.js +++ b/smooth-scroll.js @@ -1,6 +1,6 @@ /* ============================================================= - Smooth Scroll 2.15 + Smooth Scroll 2.16 Animate scrolling to anchor links, by Chris Ferdinandi. http://gomakethings.com @@ -62,14 +62,19 @@ // Calculate how far to scroll var startLocation = window.pageYOffset; var getEndLocation = function (anchor) { - var distance = 0; + var location = 0; if (anchor.offsetParent) { do { - distance += anchor.offsetTop; + location += anchor.offsetTop; anchor = anchor.offsetParent; } while (anchor); } - return distance - headerHeight; + location = location - headerHeight; + if ( location >= 0 ) { + return location; + } else { + return 0; + } }; var endLocation = getEndLocation(anchor); var distance = endLocation - startLocation; @@ -77,16 +82,9 @@ // Function to stop the scrolling animation var stopAnimation = function () { var currentLocation = window.pageYOffset; - if ( distance >= 0 ) { // If scrolling down - if ( currentLocation == endLocation || ( (window.innerHeight + currentLocation) >= document.body.scrollHeight ) ) { - clearInterval(runAnimation); - updateURL(url, anchor); - } - } else { // If scrolling up - if ( currentLocation == endLocation || currentLocation === 0 ) { - clearInterval(runAnimation); - updateURL(url, anchor); - } + if ( currentLocation == endLocation || ( (window.innerHeight + currentLocation) >= document.body.scrollHeight ) ) { + clearInterval(runAnimation); + updateURL(url, anchor); } }; From efcd34f6da26a47288f6c3cbc73b53c086673b71 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Fri, 17 Jan 2014 19:25:53 -0500 Subject: [PATCH 021/285] Fixed back button behavior when using `data-url` feature. https://github.com/cferdinandi/smooth-scroll/pull/18 --- README.md | 4 +++- smooth-scroll.js | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 1628e82..bff86f1 100755 --- a/README.md +++ b/README.md @@ -5,7 +5,9 @@ A simple script to animate scrolling to anchor links. Easing support contributed Getting started with Smooth Scroll is really easy. [View the online tutorial](http://cferdinandi.github.com/smooth-scroll/) or dig through the `index.html` file. ## Changelog -* v2.16 (Junuary 16, 2014) +* v2.17 (January 17, 2014) + * [Fixed back button behavior when using `data-url` feature.](https://github.com/cferdinandi/smooth-scroll/pull/18) +* v2.16 (January 16, 2014) * [Updated variables for more accurate easing math when scrolling to top of page.](https://github.com/cferdinandi/smooth-scroll/pull/25#issuecomment-32566729) * v2.15 (January 16, 2014) * [Fixed bug that caused "scroll-to-top" animation to create endless loop.](https://github.com/cferdinandi/smooth-scroll/issues/24) diff --git a/smooth-scroll.js b/smooth-scroll.js index e1b8a52..ba199f2 100755 --- a/smooth-scroll.js +++ b/smooth-scroll.js @@ -1,6 +1,6 @@ /* ============================================================= - Smooth Scroll 2.16 + Smooth Scroll 2.17 Animate scrolling to anchor links, by Chris Ferdinandi. http://gomakethings.com @@ -51,7 +51,7 @@ // Function to update URL var updateURL = function (url, anchor) { if ( url === 'true' && history.pushState ) { - history.pushState(null, null, '#' + anchor.id); + window.location.hash = '#' + anchor.id; } }; @@ -135,4 +135,4 @@ } -})(); +})(); \ No newline at end of file From 16aee38b147272974f6a5cb3262e0ed4e4219e50 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Thu, 23 Jan 2014 15:35:38 -0500 Subject: [PATCH 022/285] Update URL before animation, and fix back button behavior in Firefox. https://github.com/cferdinandi/smooth-scroll/pull/27 https://github.com/cferdinandi/smooth-scroll/issues/26 --- README.md | 3 +++ smooth-scroll.js | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index bff86f1..15bc609 100755 --- a/README.md +++ b/README.md @@ -5,6 +5,9 @@ A simple script to animate scrolling to anchor links. Easing support contributed Getting started with Smooth Scroll is really easy. [View the online tutorial](http://cferdinandi.github.com/smooth-scroll/) or dig through the `index.html` file. ## Changelog +* v2.18 (January 23, 2014) + * [Update URL before animation.](https://github.com/cferdinandi/smooth-scroll/pull/27) + * [Fix back button behavior in Firefox.](https://github.com/cferdinandi/smooth-scroll/issues/26) * v2.17 (January 17, 2014) * [Fixed back button behavior when using `data-url` feature.](https://github.com/cferdinandi/smooth-scroll/pull/18) * v2.16 (January 16, 2014) diff --git a/smooth-scroll.js b/smooth-scroll.js index ba199f2..1db0de5 100755 --- a/smooth-scroll.js +++ b/smooth-scroll.js @@ -1,6 +1,6 @@ /* ============================================================= - Smooth Scroll 2.17 + Smooth Scroll 2.18 Animate scrolling to anchor links, by Chris Ferdinandi. http://gomakethings.com @@ -51,7 +51,7 @@ // Function to update URL var updateURL = function (url, anchor) { if ( url === 'true' && history.pushState ) { - window.location.hash = '#' + anchor.id; + history.pushState( {pos:anchor.id}, '', '#' + anchor.id ); } }; @@ -84,7 +84,6 @@ var currentLocation = window.pageYOffset; if ( currentLocation == endLocation || ( (window.innerHeight + currentLocation) >= document.body.scrollHeight ) ) { clearInterval(runAnimation); - updateURL(url, anchor); } }; @@ -102,7 +101,8 @@ stopAnimation(); }; - // Loop the animation function + // Update the URL and loop the animation function + updateURL(url, anchor); var runAnimation = setInterval(animateScroll, 16); }; From 7506bd6353372be18bdcefc5651996ff9035a0ee Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Thu, 23 Jan 2014 18:32:30 -0500 Subject: [PATCH 023/285] Fix back button behavior in Chrome. https://github.com/cferdinandi/smooth-scroll/issues/26#issuecomment-3317 2325 --- README.md | 2 ++ index.html | 2 +- smooth-scroll.js | 9 ++++++++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 15bc609..a5e3531 100755 --- a/README.md +++ b/README.md @@ -5,6 +5,8 @@ A simple script to animate scrolling to anchor links. Easing support contributed Getting started with Smooth Scroll is really easy. [View the online tutorial](http://cferdinandi.github.com/smooth-scroll/) or dig through the `index.html` file. ## Changelog +* v2.19 (January 23, 2014) + * [Fix back button behavior in Chrome.](https://github.com/cferdinandi/smooth-scroll/issues/26#issuecomment-33172325) * v2.18 (January 23, 2014) * [Update URL before animation.](https://github.com/cferdinandi/smooth-scroll/pull/27) * [Fix back button behavior in Firefox.](https://github.com/cferdinandi/smooth-scroll/issues/26) diff --git a/index.html b/index.html index a321ed5..230b8d6 100644 --- a/index.html +++ b/index.html @@ -19,7 +19,7 @@

Smooth Scroll

Linear
- Linear (no other options)
+ Linear (no other options)

diff --git a/smooth-scroll.js b/smooth-scroll.js index 1db0de5..98a1f8f 100755 --- a/smooth-scroll.js +++ b/smooth-scroll.js @@ -1,6 +1,6 @@ /* ============================================================= - Smooth Scroll 2.18 + Smooth Scroll 2.19 Animate scrolling to anchor links, by Chris Ferdinandi. http://gomakethings.com @@ -133,6 +133,13 @@ }); + // Return to the top of the page when back button is clicked and no hash is set + window.onpopstate = function (event) { + if ( event.state === null && window.location.hash === '' ) { + window.scrollTo( 0, 0 ); + } + }; + } })(); \ No newline at end of file From df305354d1281b17ed604f8fb73a96db14d90b39 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Thu, 23 Jan 2014 18:32:57 -0500 Subject: [PATCH 024/285] Set data-url to true --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 230b8d6..a321ed5 100644 --- a/index.html +++ b/index.html @@ -19,7 +19,7 @@

Smooth Scroll

Linear
- Linear (no other options)
+ Linear (no other options)

From 016dbf6e99560725a6f8ba30df4d7141223e04e3 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Sun, 26 Jan 2014 13:06:50 -0500 Subject: [PATCH 025/285] Updated IIFE --- smooth-scroll.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/smooth-scroll.js b/smooth-scroll.js index 98a1f8f..5091a9e 100755 --- a/smooth-scroll.js +++ b/smooth-scroll.js @@ -21,7 +21,7 @@ * ============================================================= */ -(function() { + (function (window, document, undefined) { 'use strict'; @@ -142,4 +142,4 @@ } -})(); \ No newline at end of file +})(window, document); \ No newline at end of file From f16e05746b25d084e8f2bc3d0a6827505d5d5e0a Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Sun, 26 Jan 2014 13:12:39 -0500 Subject: [PATCH 026/285] Remove extra whitespace --- smooth-scroll.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/smooth-scroll.js b/smooth-scroll.js index 5091a9e..e65406b 100755 --- a/smooth-scroll.js +++ b/smooth-scroll.js @@ -21,7 +21,7 @@ * ============================================================= */ - (function (window, document, undefined) { +(function (window, document, undefined) { 'use strict'; From 79f5253b773c1f52953e2c565b4f8da4dd0625fd Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Tue, 28 Jan 2014 10:25:04 -0500 Subject: [PATCH 027/285] Switched to a data attribute for the toggle selector. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also… * Added namespacing to IIFE. * Updated looping method and event listener. --- README.md | 4 +++ index.html | 28 +++++++-------- smooth-scroll.js | 92 +++++++++++++++++++++++++++++------------------- 3 files changed, 74 insertions(+), 50 deletions(-) diff --git a/README.md b/README.md index a5e3531..a15773b 100755 --- a/README.md +++ b/README.md @@ -5,6 +5,10 @@ A simple script to animate scrolling to anchor links. Easing support contributed Getting started with Smooth Scroll is really easy. [View the online tutorial](http://cferdinandi.github.com/smooth-scroll/) or dig through the `index.html` file. ## Changelog +* v2.0 (January 28, 2014) + * Switched to a data attribute for the toggle selector. + * Added namespacing to IIFE. + * Updated looping method and event listener. * v2.19 (January 23, 2014) * [Fix back button behavior in Chrome.](https://github.com/cferdinandi/smooth-scroll/issues/26#issuecomment-33172325) * v2.18 (January 23, 2014) diff --git a/index.html b/index.html index a321ed5..77cc863 100644 --- a/index.html +++ b/index.html @@ -19,31 +19,31 @@

Smooth Scroll

Linear
- Linear (no other options)
+ Linear (no other options)

Ease-In
- Quad
- Cubic
- Quart
- Quint + Quad
+ Cubic
+ Quart
+ Quint

Ease-In-Out
- Quad
- Cubic
- Quart
- Quint + Quad
+ Cubic
+ Quart
+ Quint

Ease-Out
- Quad
- Cubic
- Quart
- Quint + Quad
+ Cubic
+ Quart
+ Quint

@@ -60,7 +60,7 @@

Smooth Scroll

.
.
.
.
.
.
.
.
.
.
.
.
.

-

Back to the top

+

Back to the top

diff --git a/smooth-scroll.js b/smooth-scroll.js index e65406b..467f15b 100755 --- a/smooth-scroll.js +++ b/smooth-scroll.js @@ -1,6 +1,6 @@ /* ============================================================= - Smooth Scroll 2.19 + Smooth Scroll 3.0 Animate scrolling to anchor links, by Chris Ferdinandi. http://gomakethings.com @@ -21,17 +21,39 @@ * ============================================================= */ -(function (window, document, undefined) { +window.smoothScroll = (function (window, document, undefined) { 'use strict'; // Feature Test if ( 'querySelector' in document && 'addEventListener' in window && Array.prototype.forEach ) { - // Function to animate the scroll - var smoothScroll = function (anchor, duration, easing, url) { + // SELECTORS - // Functions to control easing + var scrollToggles = document.querySelectorAll('[data-scroll]'); + + + // METHODS + + // Run the smooth scroll animation + var runSmoothScroll = function (anchor, duration, easing, url) { + + // SELECTORS + + var startLocation = window.pageYOffset; + + // Get the height of a fixed header if one exists + var scrollHeader = document.querySelector('.scroll-header'); + var headerHeight = scrollHeader === null ? 0 : scrollHeader.offsetHeight; + + // Set the animation variables to 0/undefined. + var timeLapsed = 0; + var percentage, position; + + + // METHODS + + // Calculate the easing pattern var easingPattern = function (type, time) { if ( type == 'easeInQuad' ) return time * time; // accelerating from zero velocity if ( type == 'easeOutQuad' ) return time * (2 - time); // decelerating to zero velocity @@ -48,19 +70,14 @@ return time; // no easing, no acceleration }; - // Function to update URL + // Update the URL var updateURL = function (url, anchor) { if ( url === 'true' && history.pushState ) { history.pushState( {pos:anchor.id}, '', '#' + anchor.id ); } }; - // Get the height of a fixed header if one exists - var scrollHeader = document.querySelector('.scroll-header'); - var headerHeight = scrollHeader === null ? 0 : scrollHeader.offsetHeight; - // Calculate how far to scroll - var startLocation = window.pageYOffset; var getEndLocation = function (anchor) { var location = 0; if (anchor.offsetParent) { @@ -79,7 +96,7 @@ var endLocation = getEndLocation(anchor); var distance = endLocation - startLocation; - // Function to stop the scrolling animation + // Stop the scrolling animation when the anchor is reached (or at the top/bottom of the page) var stopAnimation = function () { var currentLocation = window.pageYOffset; if ( currentLocation == endLocation || ( (window.innerHeight + currentLocation) >= document.body.scrollHeight ) ) { @@ -87,10 +104,6 @@ } }; - // Set the animation variables to 0/undefined. - var timeLapsed = 0; - var percentage, position; - // Scroll the page by an increment, and check if it's time to stop var animateScroll = function () { timeLapsed += 16; @@ -101,37 +114,44 @@ stopAnimation(); }; - // Update the URL and loop the animation function + + // EVENTS, LISTENERS, AND INITS + updateURL(url, anchor); var runAnimation = setInterval(animateScroll, 16); }; - // For each smooth scroll link - var scrollToggle = document.querySelectorAll('.scroll'); - [].forEach.call(scrollToggle, function (toggle) { + // Check that anchor exists and run scroll animation + var handleToggleClick = function (event) { - // When the smooth scroll link is clicked - toggle.addEventListener('click', function(e) { + // SELECTORS - // Prevent the default link behavior - e.preventDefault(); + // Get anchor link and calculate distance from the top + var dataID = this.getAttribute('href'); + var dataTarget = document.querySelector(dataID); + var dataSpeed = this.getAttribute('data-speed'); + var dataEasing = this.getAttribute('data-easing'); + var dataURL = this.getAttribute('data-url'); - // Get anchor link and calculate distance from the top - var dataID = toggle.getAttribute('href'); - var dataTarget = document.querySelector(dataID); - var dataSpeed = toggle.getAttribute('data-speed'); - var dataEasing = toggle.getAttribute('data-easing'); - var dataURL = toggle.getAttribute('data-url'); - // If the anchor exists, scroll to it - if (dataTarget) { - smoothScroll( dataTarget, dataSpeed || 500, dataEasing || 'easeInOutCubic', dataURL || 'false' ); - } + // EVENTS, LISTENERS, AND INITS + + event.preventDefault(); + if (dataTarget) { + runSmoothScroll( dataTarget, dataSpeed || 500, dataEasing || 'easeInOutCubic', dataURL || 'false' ); + } + + }; + - }, false); + // EVENTS, LISTENERS, AND INITS - }); + // When a toggle is clicked, run the click handler + for (var i = scrollToggles.length; i--;) { + var toggle = scrollToggles[i]; + toggle.addEventListener('click', handleToggleClick, false); + } // Return to the top of the page when back button is clicked and no hash is set window.onpopstate = function (event) { From b0972d5750239adedfe9e338879820d5b752308e Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Tue, 28 Jan 2014 10:29:27 -0500 Subject: [PATCH 028/285] Updated data-scroll-header data attribute --- smooth-scroll.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/smooth-scroll.js b/smooth-scroll.js index 467f15b..6d67ba9 100755 --- a/smooth-scroll.js +++ b/smooth-scroll.js @@ -43,7 +43,7 @@ window.smoothScroll = (function (window, document, undefined) { var startLocation = window.pageYOffset; // Get the height of a fixed header if one exists - var scrollHeader = document.querySelector('.scroll-header'); + var scrollHeader = document.querySelector('[data-scroll-header]'); var headerHeight = scrollHeader === null ? 0 : scrollHeader.offsetHeight; // Set the animation variables to 0/undefined. From 822fbe1922856693c5ca9c70afeeabc0d713aeca Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Tue, 4 Feb 2014 22:08:54 -0500 Subject: [PATCH 029/285] Reverted to `Array.protype.foreach` loops. --- README.md | 4 +++- smooth-scroll.js | 7 +++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index a15773b..bac9c2f 100755 --- a/README.md +++ b/README.md @@ -5,7 +5,9 @@ A simple script to animate scrolling to anchor links. Easing support contributed Getting started with Smooth Scroll is really easy. [View the online tutorial](http://cferdinandi.github.com/smooth-scroll/) or dig through the `index.html` file. ## Changelog -* v2.0 (January 28, 2014) +* v3.1 (February 4, 2014) + * Reverted to `Array.protype.foreach` loops. +* v3.0 (January 28, 2014) * Switched to a data attribute for the toggle selector. * Added namespacing to IIFE. * Updated looping method and event listener. diff --git a/smooth-scroll.js b/smooth-scroll.js index 6d67ba9..0a98a56 100755 --- a/smooth-scroll.js +++ b/smooth-scroll.js @@ -1,6 +1,6 @@ /* ============================================================= - Smooth Scroll 3.0 + Smooth Scroll 3.1 Animate scrolling to anchor links, by Chris Ferdinandi. http://gomakethings.com @@ -148,10 +148,9 @@ window.smoothScroll = (function (window, document, undefined) { // EVENTS, LISTENERS, AND INITS // When a toggle is clicked, run the click handler - for (var i = scrollToggles.length; i--;) { - var toggle = scrollToggles[i]; + Array.prototype.forEach.call(scrollToggles, function (toggle, index) { toggle.addEventListener('click', handleToggleClick, false); - } + }); // Return to the top of the page when back button is clicked and no hash is set window.onpopstate = function (event) { From 8a04112245cc2c4f1ee87cecd0de128aa8ceb503 Mon Sep 17 00:00:00 2001 From: Alex Guzman Date: Mon, 10 Feb 2014 02:05:02 -0600 Subject: [PATCH 030/285] Fix iOS stuck in infinite loop bug --- smooth-scroll.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/smooth-scroll.js b/smooth-scroll.js index 0a98a56..a9c6c90 100755 --- a/smooth-scroll.js +++ b/smooth-scroll.js @@ -99,7 +99,7 @@ window.smoothScroll = (function (window, document, undefined) { // Stop the scrolling animation when the anchor is reached (or at the top/bottom of the page) var stopAnimation = function () { var currentLocation = window.pageYOffset; - if ( currentLocation == endLocation || ( (window.innerHeight + currentLocation) >= document.body.scrollHeight ) ) { + if ( position == endLocation || currentLocation == endLocation || ( (window.innerHeight + currentLocation) >= document.body.scrollHeight ) ) { clearInterval(runAnimation); } }; @@ -161,4 +161,4 @@ window.smoothScroll = (function (window, document, undefined) { } -})(window, document); \ No newline at end of file +})(window, document); From 387e40b76bdd88ff7561da3106d0215c989f7020 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Mon, 10 Feb 2014 09:43:45 -0500 Subject: [PATCH 031/285] Fixes iOS infinite loop and Chrome browser zoom bugs. https://github.com/cferdinandi/smooth-scroll/pull/31 https://github.com/cferdinandi/smooth-scroll/pull/35 --- README.md | 2 ++ smooth-scroll.js | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index bac9c2f..d184b0a 100755 --- a/README.md +++ b/README.md @@ -5,6 +5,8 @@ A simple script to animate scrolling to anchor links. Easing support contributed Getting started with Smooth Scroll is really easy. [View the online tutorial](http://cferdinandi.github.com/smooth-scroll/) or dig through the `index.html` file. ## Changelog +* v3.2 (February 10, 2014) + * [Fixes iOS infinite loop](https://github.com/cferdinandi/smooth-scroll/pull/35) and [Chrome browser zoom](https://github.com/cferdinandi/smooth-scroll/issues/31) bugs. * v3.1 (February 4, 2014) * Reverted to `Array.protype.foreach` loops. * v3.0 (January 28, 2014) diff --git a/smooth-scroll.js b/smooth-scroll.js index a9c6c90..71043ad 100755 --- a/smooth-scroll.js +++ b/smooth-scroll.js @@ -1,6 +1,6 @@ /* ============================================================= - Smooth Scroll 3.1 + Smooth Scroll 3.2 Animate scrolling to anchor links, by Chris Ferdinandi. http://gomakethings.com @@ -16,6 +16,9 @@ Fixed header support contributed by Arndt von Lucadou. https://github.com/a-v-l + Infinite loop bugs in iOS and Chrome (when zoomed) by Alex Guzman. + https://github.com/alexguzman + Free to use under the MIT License. http://gomakethings.com/mit/ From 36c325686fe3dc3b2666da0fd82a816e07f4d01c Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Mon, 10 Feb 2014 09:45:43 -0500 Subject: [PATCH 032/285] Removed unneeded space at the end of the file. --- smooth-scroll.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/smooth-scroll.js b/smooth-scroll.js index 71043ad..d2307a6 100755 --- a/smooth-scroll.js +++ b/smooth-scroll.js @@ -164,4 +164,4 @@ window.smoothScroll = (function (window, document, undefined) { } -})(window, document); +})(window, document); \ No newline at end of file From b53357058b15354d07cd72b00a4a3756ec2fceec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Folles=C3=B8?= Date: Wed, 19 Feb 2014 15:25:09 +0100 Subject: [PATCH 033/285] Add offsettTop to offsetHeight for scrollHeader MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If you have multiple fixed headers, it’s not enough to calculate the headerHeight as the height of the sticky header element. We need to add the offsetTop to compensate for the first sticky header. --- smooth-scroll.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/smooth-scroll.js b/smooth-scroll.js index d2307a6..129375d 100755 --- a/smooth-scroll.js +++ b/smooth-scroll.js @@ -47,7 +47,7 @@ window.smoothScroll = (function (window, document, undefined) { // Get the height of a fixed header if one exists var scrollHeader = document.querySelector('[data-scroll-header]'); - var headerHeight = scrollHeader === null ? 0 : scrollHeader.offsetHeight; + var headerHeight = scrollHeader === null ? 0 : (scrollHeader.offsetHeight + scrollHeader.offsetTop); // Set the animation variables to 0/undefined. var timeLapsed = 0; From bb4106c99c54ea0ee9acb51944ed0fc8a2ca2b4a Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Wed, 19 Feb 2014 18:30:36 -0500 Subject: [PATCH 034/285] Updated version number --- README.md | 2 ++ smooth-scroll.js | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index d184b0a..f077734 100755 --- a/README.md +++ b/README.md @@ -5,6 +5,8 @@ A simple script to animate scrolling to anchor links. Easing support contributed Getting started with Smooth Scroll is really easy. [View the online tutorial](http://cferdinandi.github.com/smooth-scroll/) or dig through the `index.html` file. ## Changelog +* v3.3 (February 19, 2014) + * [Add `offsettTop` to `offsetHeigh`t for `scrollHeader`. Allows for multiple fixed headers, or a fixed header that sits slightly below the top of the page.](https://github.com/cferdinandi/smooth-scroll/pull/36) * v3.2 (February 10, 2014) * [Fixes iOS infinite loop](https://github.com/cferdinandi/smooth-scroll/pull/35) and [Chrome browser zoom](https://github.com/cferdinandi/smooth-scroll/issues/31) bugs. * v3.1 (February 4, 2014) diff --git a/smooth-scroll.js b/smooth-scroll.js index 129375d..107ea49 100755 --- a/smooth-scroll.js +++ b/smooth-scroll.js @@ -1,6 +1,6 @@ /* ============================================================= - Smooth Scroll 3.2 + Smooth Scroll v3.3 Animate scrolling to anchor links, by Chris Ferdinandi. http://gomakethings.com From 550449278504fe4624575862e54c7c6bb87c6d18 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Fri, 21 Feb 2014 23:36:52 -0500 Subject: [PATCH 035/285] Redesigned script structure https://github.com/cferdinandi/kraken/issues/38 --- index.html | 39 ++++--- smooth-scroll.js | 257 +++++++++++++++++++++++++++-------------------- 2 files changed, 172 insertions(+), 124 deletions(-) diff --git a/index.html b/index.html index 77cc863..3e2268b 100644 --- a/index.html +++ b/index.html @@ -19,31 +19,31 @@

Smooth Scroll

Linear
- Linear (no other options)
+ Linear (no other options)

Ease-In
- Quad
- Cubic
- Quart
- Quint + Quad
+ Cubic
+ Quart
+ Quint

Ease-In-Out
- Quad
- Cubic
- Quart
- Quint + Quad
+ Cubic
+ Quart
+ Quint

Ease-Out
- Quad
- Cubic
- Quart
- Quint + Quad
+ Cubic
+ Quart
+ Quint

@@ -52,7 +52,7 @@

Smooth Scroll

.
.
.
.
.
.
.
.
.
.
.
.
.

-

Bazinga!

+

Bazinga!

.
.
.
.
.
.
.
.
.
.
.
.
.
@@ -60,13 +60,22 @@

Smooth Scroll

.
.
.
.
.
.
.
.
.
.
.
.
.

-

Back to the top

+

Back to the top

+ \ No newline at end of file diff --git a/smooth-scroll.js b/smooth-scroll.js index 107ea49..9082f22 100755 --- a/smooth-scroll.js +++ b/smooth-scroll.js @@ -28,140 +28,179 @@ window.smoothScroll = (function (window, document, undefined) { 'use strict'; - // Feature Test - if ( 'querySelector' in document && 'addEventListener' in window && Array.prototype.forEach ) { - - // SELECTORS - - var scrollToggles = document.querySelectorAll('[data-scroll]'); - - - // METHODS + // Calculate the easing pattern + // Private method + // Returns a decimal number + var _easingPattern = function (type, time) { + if ( type == 'easeInQuad' ) return time * time; // accelerating from zero velocity + if ( type == 'easeOutQuad' ) return time * (2 - time); // decelerating to zero velocity + if ( type == 'easeInOutQuad' ) return time < 0.5 ? 2 * time * time : -1 + (4 - 2 * time) * time; // acceleration until halfway, then deceleration + if ( type == 'easeInCubic' ) return time * time * time; // accelerating from zero velocity + if ( type == 'easeOutCubic' ) return (--time) * time * time + 1; // decelerating to zero velocity + if ( type == 'easeInOutCubic' ) return time < 0.5 ? 4 * time * time * time : (time - 1) * (2 * time - 2) * (2 * time - 2) + 1; // acceleration until halfway, then deceleration + if ( type == 'easeInQuart' ) return time * time * time * time; // accelerating from zero velocity + if ( type == 'easeOutQuart' ) return 1 - (--time) * time * time * time; // decelerating to zero velocity + if ( type == 'easeInOutQuart' ) return time < 0.5 ? 8 * time * time * time * time : 1 - 8 * (--time) * time * time * time; // acceleration until halfway, then deceleration + if ( type == 'easeInQuint' ) return time * time * time * time * time; // accelerating from zero velocity + if ( type == 'easeOutQuint' ) return 1 + (--time) * time * time * time * time; // decelerating to zero velocity + if ( type == 'easeInOutQuint' ) return time < 0.5 ? 16 * time * time * time * time * time : 1 + 16 * (--time) * time * time * time * time; // acceleration until halfway, then deceleration + return time; // no easing, no acceleration + }; + + // Calculate how far to scroll + // Private method + // Returns an integer + var _getEndLocation = function (anchor, headerHeight) { + var location = 0; + if (anchor.offsetParent) { + do { + location += anchor.offsetTop; + anchor = anchor.offsetParent; + } while (anchor); + } + location = location - headerHeight; + if ( location >= 0 ) { + return location; + } else { + return 0; + } + }; + + // Convert data-options attribute into an object of key/value pairs + // Private method + // Returns {object} + var _getDataOptions = function ( options ) { + + if ( options === null || options === undefined ) { + return {}; + } else { + var settings = {}; // Create settings object + options = options.split(';'); // Split into array of options + + // Create a key/value pair for each setting + options.forEach( function(option) { + option = option.trim(); + if ( option !== '' ) { + option = option.split(':'); + settings[option[0]] = option[1].trim(); + } + }); - // Run the smooth scroll animation - var runSmoothScroll = function (anchor, duration, easing, url) { + return settings; + } - // SELECTORS + }; - var startLocation = window.pageYOffset; + // Start/stop the scrolling animation + // Private method + var _runAnimateScroll = function ( startLocation, endLocation, duration, easing ) { - // Get the height of a fixed header if one exists - var scrollHeader = document.querySelector('[data-scroll-header]'); - var headerHeight = scrollHeader === null ? 0 : (scrollHeader.offsetHeight + scrollHeader.offsetTop); + // Selectors and variables + var animationInterval; // interval timer + var distance = endLocation - startLocation; // distance to travel + var timeLapsed = 0; + var percentage, position; - // Set the animation variables to 0/undefined. - var timeLapsed = 0; - var percentage, position; + // Stop the scroll animation when it reaches its target (or the bottom/top of page) + // Private method + var _stopAnimateScroll = function () { + var currentLocation = window.pageYOffset; + if ( position == endLocation || currentLocation == endLocation || ( (window.innerHeight + currentLocation) >= document.body.scrollHeight ) ) { + clearInterval(animationInterval); + } + }; + // Loop scrolling animation + // Private method + var _animateScroll = function () { + timeLapsed += 16; + percentage = ( timeLapsed / duration ); + percentage = ( percentage > 1 ) ? 1 : percentage; + position = startLocation + ( distance * _easingPattern(easing, percentage) ); + window.scrollTo( 0, position ); + _stopAnimateScroll(position, endLocation, animationInterval); + }; - // METHODS + // Set interval timer + // Private method + var _startAnimateScroll = function () { + animationInterval = setInterval(_animateScroll, 16); + }; - // Calculate the easing pattern - var easingPattern = function (type, time) { - if ( type == 'easeInQuad' ) return time * time; // accelerating from zero velocity - if ( type == 'easeOutQuad' ) return time * (2 - time); // decelerating to zero velocity - if ( type == 'easeInOutQuad' ) return time < 0.5 ? 2 * time * time : -1 + (4 - 2 * time) * time; // acceleration until halfway, then deceleration - if ( type == 'easeInCubic' ) return time * time * time; // accelerating from zero velocity - if ( type == 'easeOutCubic' ) return (--time) * time * time + 1; // decelerating to zero velocity - if ( type == 'easeInOutCubic' ) return time < 0.5 ? 4 * time * time * time : (time - 1) * (2 * time - 2) * (2 * time - 2) + 1; // acceleration until halfway, then deceleration - if ( type == 'easeInQuart' ) return time * time * time * time; // accelerating from zero velocity - if ( type == 'easeOutQuart' ) return 1 - (--time) * time * time * time; // decelerating to zero velocity - if ( type == 'easeInOutQuart' ) return time < 0.5 ? 8 * time * time * time * time : 1 - 8 * (--time) * time * time * time; // acceleration until halfway, then deceleration - if ( type == 'easeInQuint' ) return time * time * time * time * time; // accelerating from zero velocity - if ( type == 'easeOutQuint' ) return 1 + (--time) * time * time * time * time; // decelerating to zero velocity - if ( type == 'easeInOutQuint' ) return time < 0.5 ? 16 * time * time * time * time * time : 1 + 16 * (--time) * time * time * time * time; // acceleration until halfway, then deceleration - return time; // no easing, no acceleration - }; + // Start scrolling animation + _startAnimateScroll(); - // Update the URL - var updateURL = function (url, anchor) { - if ( url === 'true' && history.pushState ) { - history.pushState( {pos:anchor.id}, '', '#' + anchor.id ); - } - }; - - // Calculate how far to scroll - var getEndLocation = function (anchor) { - var location = 0; - if (anchor.offsetParent) { - do { - location += anchor.offsetTop; - anchor = anchor.offsetParent; - } while (anchor); - } - location = location - headerHeight; - if ( location >= 0 ) { - return location; - } else { - return 0; - } - }; - var endLocation = getEndLocation(anchor); - var distance = endLocation - startLocation; - - // Stop the scrolling animation when the anchor is reached (or at the top/bottom of the page) - var stopAnimation = function () { - var currentLocation = window.pageYOffset; - if ( position == endLocation || currentLocation == endLocation || ( (window.innerHeight + currentLocation) >= document.body.scrollHeight ) ) { - clearInterval(runAnimation); - } - }; + }; - // Scroll the page by an increment, and check if it's time to stop - var animateScroll = function () { - timeLapsed += 16; - percentage = ( timeLapsed / duration ); - percentage = ( percentage > 1 ) ? 1 : percentage; - position = startLocation + ( distance * easingPattern(easing, percentage) ); - window.scrollTo( 0, position ); - stopAnimation(); - }; + // Update the URL + // Private method + var _updateURL = function (url, anchor) { + if ( (url === true || url === 'true') && history.pushState ) { + history.pushState( {pos:anchor.id}, '', '#' + anchor.id ); + } + }; + // Run the smooth scroll animation + // Private method + var _runSmoothScroll = function (anchor, duration, easing, url) { - // EVENTS, LISTENERS, AND INITS + // Get the height of a fixed header if one exists + var scrollHeader = document.querySelector('[data-scroll-header]'); + var headerHeight = scrollHeader === null ? 0 : (scrollHeader.offsetHeight + scrollHeader.offsetTop); - updateURL(url, anchor); - var runAnimation = setInterval(animateScroll, 16); + // Get start and end locations + var startLocation = window.pageYOffset; + var endLocation = _getEndLocation(anchor, headerHeight); - }; + // Run animation and update URL + _updateURL(url, anchor); + _runAnimateScroll( startLocation, endLocation, duration, easing ); - // Check that anchor exists and run scroll animation - var handleToggleClick = function (event) { + }; - // SELECTORS + // Check that anchor exists and run scroll animation + // Private method + var _handleToggleClick = function (options, event) { - // Get anchor link and calculate distance from the top - var dataID = this.getAttribute('href'); - var dataTarget = document.querySelector(dataID); - var dataSpeed = this.getAttribute('data-speed'); - var dataEasing = this.getAttribute('data-easing'); - var dataURL = this.getAttribute('data-url'); + // Selectors and variables + var overrides = _getDataOptions( this.getAttribute('data-options') ); + var anchor = document.querySelector(this.getAttribute('href')); + var speed = overrides.speed || options.speed || 500; + var easing = overrides.easing || options.easing || 'easeInOutCubic'; + var updateURL = overrides.updateURL || options.updateURL || false; + // If an anchor exists, run Smooth Scroll + if ( anchor ) { + event.preventDefault(); + // _runSmoothScroll( dataTarget, dataSpeed, dataEasing, dataURL ); + _runSmoothScroll( anchor, speed, easing, updateURL ); + } - // EVENTS, LISTENERS, AND INITS + }; - event.preventDefault(); - if (dataTarget) { - runSmoothScroll( dataTarget, dataSpeed || 500, dataEasing || 'easeInOutCubic', dataURL || 'false' ); - } + // Initialize Smooth Scroll + var init = function ( options ) { - }; + // Feature test before initializing + if ( 'querySelector' in document && 'addEventListener' in window && Array.prototype.forEach ) { + // Selectors and variables + options = options || {}; + var scrollToggle = options.scrollToggle || '[data-scroll]'; + var toggles = document.querySelectorAll(scrollToggle); // Get smooth scroll toggles - // EVENTS, LISTENERS, AND INITS + // When a toggle is clicked, run the click handler + Array.prototype.forEach.call(toggles, function (toggle, index) { + toggle.addEventListener('click', _handleToggleClick.bind( toggle, options ), false); + }); - // When a toggle is clicked, run the click handler - Array.prototype.forEach.call(scrollToggles, function (toggle, index) { - toggle.addEventListener('click', handleToggleClick, false); - }); + } - // Return to the top of the page when back button is clicked and no hash is set - window.onpopstate = function (event) { - if ( event.state === null && window.location.hash === '' ) { - window.scrollTo( 0, 0 ); - } - }; + }; - } + // Return public methods + return { + init: init + }; })(window, document); \ No newline at end of file From 48ec771b4c367a8f24c09518f18b5de263428fff Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Fri, 21 Feb 2014 23:58:02 -0500 Subject: [PATCH 036/285] Redesigned script structure https://github.com/cferdinandi/kraken/issues/38 --- README.md | 5 +++++ smooth-scroll.js | 45 ++++++++++++++++----------------------------- 2 files changed, 21 insertions(+), 29 deletions(-) diff --git a/README.md b/README.md index f077734..ec93078 100755 --- a/README.md +++ b/README.md @@ -5,6 +5,11 @@ A simple script to animate scrolling to anchor links. Easing support contributed Getting started with Smooth Scroll is really easy. [View the online tutorial](http://cferdinandi.github.com/smooth-scroll/) or dig through the `index.html` file. ## Changelog +* v4.0 (February 21, 2014) + * Better public/private method namespacing. + * Require `init()` call to run. + * Better documentation (noting what's returned on functions). + * Switched data attribute overrides to single `data-options` attribute. * v3.3 (February 19, 2014) * [Add `offsettTop` to `offsetHeigh`t for `scrollHeader`. Allows for multiple fixed headers, or a fixed header that sits slightly below the top of the page.](https://github.com/cferdinandi/smooth-scroll/pull/36) * v3.2 (February 10, 2014) diff --git a/smooth-scroll.js b/smooth-scroll.js index 9082f22..7410b28 100755 --- a/smooth-scroll.js +++ b/smooth-scroll.js @@ -1,6 +1,6 @@ /* ============================================================= - Smooth Scroll v3.3 + Smooth Scroll v4.0 Animate scrolling to anchor links, by Chris Ferdinandi. http://gomakethings.com @@ -31,7 +31,7 @@ window.smoothScroll = (function (window, document, undefined) { // Calculate the easing pattern // Private method // Returns a decimal number - var _easingPattern = function (type, time) { + var _easingPattern = function ( type, time ) { if ( type == 'easeInQuad' ) return time * time; // accelerating from zero velocity if ( type == 'easeOutQuad' ) return time * (2 - time); // decelerating to zero velocity if ( type == 'easeInOutQuad' ) return time < 0.5 ? 2 * time * time : -1 + (4 - 2 * time) * time; // acceleration until halfway, then deceleration @@ -50,7 +50,7 @@ window.smoothScroll = (function (window, document, undefined) { // Calculate how far to scroll // Private method // Returns an integer - var _getEndLocation = function (anchor, headerHeight) { + var _getEndLocation = function ( anchor, headerHeight ) { var location = 0; if (anchor.offsetParent) { do { @@ -93,9 +93,13 @@ window.smoothScroll = (function (window, document, undefined) { // Start/stop the scrolling animation // Private method - var _runAnimateScroll = function ( startLocation, endLocation, duration, easing ) { + var _runAnimateScroll = function ( anchor, duration, easing, fixedHeader ) { // Selectors and variables + fixedHeader = document.querySelector(fixedHeader); // Get the fixed header + var headerHeight = fixedHeader === null ? 0 : (fixedHeader.offsetHeight + fixedHeader.offsetTop); // Get the height of a fixed header if one exists + var startLocation = window.pageYOffset; // Current location on the page + var endLocation = _getEndLocation(anchor, headerHeight); // Scroll to location var animationInterval; // interval timer var distance = endLocation - startLocation; // distance to travel var timeLapsed = 0; @@ -134,46 +138,29 @@ window.smoothScroll = (function (window, document, undefined) { // Update the URL // Private method - var _updateURL = function (url, anchor) { + var _updateURL = function ( url, anchor ) { if ( (url === true || url === 'true') && history.pushState ) { history.pushState( {pos:anchor.id}, '', '#' + anchor.id ); } }; - // Run the smooth scroll animation + // Run smooth scroll on a clicked link // Private method - var _runSmoothScroll = function (anchor, duration, easing, url) { - - // Get the height of a fixed header if one exists - var scrollHeader = document.querySelector('[data-scroll-header]'); - var headerHeight = scrollHeader === null ? 0 : (scrollHeader.offsetHeight + scrollHeader.offsetTop); - - // Get start and end locations - var startLocation = window.pageYOffset; - var endLocation = _getEndLocation(anchor, headerHeight); - - // Run animation and update URL - _updateURL(url, anchor); - _runAnimateScroll( startLocation, endLocation, duration, easing ); - - }; - - // Check that anchor exists and run scroll animation - // Private method - var _handleToggleClick = function (options, event) { + var _runSmoothScroll = function ( options, event ) { // Selectors and variables var overrides = _getDataOptions( this.getAttribute('data-options') ); var anchor = document.querySelector(this.getAttribute('href')); + var fixedHeader = options.fixedHeader || '[data-scroll-header]'; var speed = overrides.speed || options.speed || 500; var easing = overrides.easing || options.easing || 'easeInOutCubic'; var updateURL = overrides.updateURL || options.updateURL || false; - // If an anchor exists, run Smooth Scroll + // If an anchor exists, update URL and animate scroll if ( anchor ) { event.preventDefault(); - // _runSmoothScroll( dataTarget, dataSpeed, dataEasing, dataURL ); - _runSmoothScroll( anchor, speed, easing, updateURL ); + _updateURL(updateURL, anchor); + _runAnimateScroll( anchor, speed, easing, fixedHeader ); } }; @@ -191,7 +178,7 @@ window.smoothScroll = (function (window, document, undefined) { // When a toggle is clicked, run the click handler Array.prototype.forEach.call(toggles, function (toggle, index) { - toggle.addEventListener('click', _handleToggleClick.bind( toggle, options ), false); + toggle.addEventListener('click', _runSmoothScroll.bind( toggle, options ), false); }); } From 8c3fc1f01d0bd958f3113797af273d78152af334 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Sat, 22 Feb 2014 12:25:30 -0500 Subject: [PATCH 037/285] added animateScroll to public methods --- smooth-scroll.js | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/smooth-scroll.js b/smooth-scroll.js index 7410b28..6d619f2 100755 --- a/smooth-scroll.js +++ b/smooth-scroll.js @@ -92,8 +92,8 @@ window.smoothScroll = (function (window, document, undefined) { }; // Start/stop the scrolling animation - // Private method - var _runAnimateScroll = function ( anchor, duration, easing, fixedHeader ) { + // Public method + var animateScroll = function ( anchor, duration, easing, fixedHeader ) { // Selectors and variables fixedHeader = document.querySelector(fixedHeader); // Get the fixed header @@ -116,7 +116,7 @@ window.smoothScroll = (function (window, document, undefined) { // Loop scrolling animation // Private method - var _animateScroll = function () { + var _loopAnimateScroll = function () { timeLapsed += 16; percentage = ( timeLapsed / duration ); percentage = ( percentage > 1 ) ? 1 : percentage; @@ -128,7 +128,7 @@ window.smoothScroll = (function (window, document, undefined) { // Set interval timer // Private method var _startAnimateScroll = function () { - animationInterval = setInterval(_animateScroll, 16); + animationInterval = setInterval(_loopAnimateScroll, 16); }; // Start scrolling animation @@ -138,7 +138,7 @@ window.smoothScroll = (function (window, document, undefined) { // Update the URL // Private method - var _updateURL = function ( url, anchor ) { + var _updateURL = function ( anchor, url ) { if ( (url === true || url === 'true') && history.pushState ) { history.pushState( {pos:anchor.id}, '', '#' + anchor.id ); } @@ -159,8 +159,8 @@ window.smoothScroll = (function (window, document, undefined) { // If an anchor exists, update URL and animate scroll if ( anchor ) { event.preventDefault(); - _updateURL(updateURL, anchor); - _runAnimateScroll( anchor, speed, easing, fixedHeader ); + _updateURL(anchor, updateURL); + animateScroll( anchor, speed, easing, fixedHeader ); } }; @@ -187,7 +187,8 @@ window.smoothScroll = (function (window, document, undefined) { // Return public methods return { - init: init + init: init, + animateScroll: animateScroll }; })(window, document); \ No newline at end of file From 27233cd9ec83d450e275f467b2c4eac3cf800c28 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Sat, 22 Feb 2014 12:29:32 -0500 Subject: [PATCH 038/285] Updated documentation --- smooth-scroll.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/smooth-scroll.js b/smooth-scroll.js index 6d619f2..7accc38 100755 --- a/smooth-scroll.js +++ b/smooth-scroll.js @@ -68,7 +68,7 @@ window.smoothScroll = (function (window, document, undefined) { // Convert data-options attribute into an object of key/value pairs // Private method - // Returns {object} + // Returns an {object} var _getDataOptions = function ( options ) { if ( options === null || options === undefined ) { @@ -93,6 +93,7 @@ window.smoothScroll = (function (window, document, undefined) { // Start/stop the scrolling animation // Public method + // Runs functions var animateScroll = function ( anchor, duration, easing, fixedHeader ) { // Selectors and variables @@ -138,6 +139,7 @@ window.smoothScroll = (function (window, document, undefined) { // Update the URL // Private method + // Runs functions var _updateURL = function ( anchor, url ) { if ( (url === true || url === 'true') && history.pushState ) { history.pushState( {pos:anchor.id}, '', '#' + anchor.id ); @@ -166,6 +168,8 @@ window.smoothScroll = (function (window, document, undefined) { }; // Initialize Smooth Scroll + // Public method + // Runs functions var init = function ( options ) { // Feature test before initializing From 7fbe2294538664a85d3b263d11a00ebeaadf4d0d Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Mon, 24 Feb 2014 23:40:23 -0500 Subject: [PATCH 039/285] New API exposes additional methods for use in your own scripts. --- README.md | 4 +-- index.html | 6 ++-- smooth-scroll.js | 94 ++++++++++++++++++++++++++++-------------------- 3 files changed, 61 insertions(+), 43 deletions(-) diff --git a/README.md b/README.md index ec93078..7cb6f57 100755 --- a/README.md +++ b/README.md @@ -8,8 +8,8 @@ Getting started with Smooth Scroll is really easy. [View the online tutorial](ht * v4.0 (February 21, 2014) * Better public/private method namespacing. * Require `init()` call to run. - * Better documentation (noting what's returned on functions). - * Switched data attribute overrides to single `data-options` attribute. + * New API exposes additional methods for use in your own scripts. + * Better documentation. * v3.3 (February 19, 2014) * [Add `offsettTop` to `offsetHeigh`t for `scrollHeader`. Allows for multiple fixed headers, or a fixed header that sits slightly below the top of the page.](https://github.com/cferdinandi/smooth-scroll/pull/36) * v3.2 (February 10, 2014) diff --git a/index.html b/index.html index 3e2268b..bb54f69 100644 --- a/index.html +++ b/index.html @@ -69,11 +69,11 @@

Smooth Scroll

diff --git a/smooth-scroll.js b/smooth-scroll.js index 7accc38..7eaf483 100755 --- a/smooth-scroll.js +++ b/smooth-scroll.js @@ -28,6 +28,29 @@ window.smoothScroll = (function (window, document, undefined) { 'use strict'; + // Default settings + // Private method + // Returns an {object} + var _defaults = function () { + return { + speed: 500, + easing: 'easeInOutCubic', + updateURL: false, + callbackBefore: function () {}, + callbackAfter: function () {} + }; + }; + + // Merge default settings with user options + // Private method + // Returns an {object} + var _mergeObjects = function ( original, updates ) { + for (var key in updates) { + original[key] = updates[key]; + } + return original; + }; + // Calculate the easing pattern // Private method // Returns a decimal number @@ -91,27 +114,52 @@ window.smoothScroll = (function (window, document, undefined) { }; + // Update the URL + // Private method + // Runs functions + var _updateURL = function ( anchor, url ) { + if ( (url === true || url === 'true') && history.pushState ) { + history.pushState( {pos:anchor.id}, '', anchor ); + } + }; + // Start/stop the scrolling animation // Public method // Runs functions - var animateScroll = function ( anchor, duration, easing, fixedHeader ) { + var animateScroll = function ( toggle, anchor, options, event ) { + + // Options and overrides + options = _mergeObjects( _defaults(), options || {} ); // Merge user options with defaults + var overrides = _getDataOptions( toggle.getAttribute('data-options') ); + var speed = overrides.speed || options.speed; + var easing = overrides.easing || options.easing; + var updateURL = overrides.updateURL || options.updateURL; // Selectors and variables - fixedHeader = document.querySelector(fixedHeader); // Get the fixed header + var fixedHeader = document.querySelector('[data-scroll-header]'); // Get the fixed header var headerHeight = fixedHeader === null ? 0 : (fixedHeader.offsetHeight + fixedHeader.offsetTop); // Get the height of a fixed header if one exists var startLocation = window.pageYOffset; // Current location on the page - var endLocation = _getEndLocation(anchor, headerHeight); // Scroll to location + var endLocation = _getEndLocation( document.querySelector(anchor), headerHeight ); // Scroll to location var animationInterval; // interval timer var distance = endLocation - startLocation; // distance to travel var timeLapsed = 0; var percentage, position; + // Prevent default click event + if ( toggle && toggle.tagName === 'A' && event ) { + event.preventDefault(); + } + + // Update URL + _updateURL(anchor, updateURL); + // Stop the scroll animation when it reaches its target (or the bottom/top of page) // Private method var _stopAnimateScroll = function () { var currentLocation = window.pageYOffset; if ( position == endLocation || currentLocation == endLocation || ( (window.innerHeight + currentLocation) >= document.body.scrollHeight ) ) { clearInterval(animationInterval); + options.callbackAfter(); // Run callbacks after animation complete } }; @@ -119,7 +167,7 @@ window.smoothScroll = (function (window, document, undefined) { // Private method var _loopAnimateScroll = function () { timeLapsed += 16; - percentage = ( timeLapsed / duration ); + percentage = ( timeLapsed / speed ); percentage = ( percentage > 1 ) ? 1 : percentage; position = startLocation + ( distance * _easingPattern(easing, percentage) ); window.scrollTo( 0, position ); @@ -129,6 +177,7 @@ window.smoothScroll = (function (window, document, undefined) { // Set interval timer // Private method var _startAnimateScroll = function () { + options.callbackBefore(); // Run callbacks before animating scroll animationInterval = setInterval(_loopAnimateScroll, 16); }; @@ -137,36 +186,6 @@ window.smoothScroll = (function (window, document, undefined) { }; - // Update the URL - // Private method - // Runs functions - var _updateURL = function ( anchor, url ) { - if ( (url === true || url === 'true') && history.pushState ) { - history.pushState( {pos:anchor.id}, '', '#' + anchor.id ); - } - }; - - // Run smooth scroll on a clicked link - // Private method - var _runSmoothScroll = function ( options, event ) { - - // Selectors and variables - var overrides = _getDataOptions( this.getAttribute('data-options') ); - var anchor = document.querySelector(this.getAttribute('href')); - var fixedHeader = options.fixedHeader || '[data-scroll-header]'; - var speed = overrides.speed || options.speed || 500; - var easing = overrides.easing || options.easing || 'easeInOutCubic'; - var updateURL = overrides.updateURL || options.updateURL || false; - - // If an anchor exists, update URL and animate scroll - if ( anchor ) { - event.preventDefault(); - _updateURL(anchor, updateURL); - animateScroll( anchor, speed, easing, fixedHeader ); - } - - }; - // Initialize Smooth Scroll // Public method // Runs functions @@ -176,13 +195,12 @@ window.smoothScroll = (function (window, document, undefined) { if ( 'querySelector' in document && 'addEventListener' in window && Array.prototype.forEach ) { // Selectors and variables - options = options || {}; - var scrollToggle = options.scrollToggle || '[data-scroll]'; - var toggles = document.querySelectorAll(scrollToggle); // Get smooth scroll toggles + options = _mergeObjects( _defaults(), options || {} ); // Merge user options with defaults + var toggles = document.querySelectorAll('[data-scroll]'); // Get smooth scroll toggles // When a toggle is clicked, run the click handler Array.prototype.forEach.call(toggles, function (toggle, index) { - toggle.addEventListener('click', _runSmoothScroll.bind( toggle, options ), false); + toggle.addEventListener('click', animateScroll.bind( null, toggle, toggle.getAttribute('href'), options ), false); }); } From 3fccd6dee09bd055fd065a6d59d703e18e00d72b Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Mon, 24 Feb 2014 23:40:32 -0500 Subject: [PATCH 040/285] New API exposes additional methods for use in your own scripts. --- smooth-scroll.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/smooth-scroll.js b/smooth-scroll.js index 7eaf483..e1f1049 100755 --- a/smooth-scroll.js +++ b/smooth-scroll.js @@ -155,6 +155,7 @@ window.smoothScroll = (function (window, document, undefined) { // Stop the scroll animation when it reaches its target (or the bottom/top of page) // Private method + // Runs functions var _stopAnimateScroll = function () { var currentLocation = window.pageYOffset; if ( position == endLocation || currentLocation == endLocation || ( (window.innerHeight + currentLocation) >= document.body.scrollHeight ) ) { @@ -165,6 +166,7 @@ window.smoothScroll = (function (window, document, undefined) { // Loop scrolling animation // Private method + // Runs functions var _loopAnimateScroll = function () { timeLapsed += 16; percentage = ( timeLapsed / speed ); @@ -176,6 +178,7 @@ window.smoothScroll = (function (window, document, undefined) { // Set interval timer // Private method + // Runs functions var _startAnimateScroll = function () { options.callbackBefore(); // Run callbacks before animating scroll animationInterval = setInterval(_loopAnimateScroll, 16); From b20fb6dfded43c0bd3b66a1397c3d3e2375d0570 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Wed, 26 Feb 2014 10:38:24 -0500 Subject: [PATCH 041/285] Launched version 4 --- README.md | 148 +++++++++++++++++++++++++++++++++++++++++++++-- smooth-scroll.js | 2 +- 2 files changed, 145 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 7cb6f57..725e618 100755 --- a/README.md +++ b/README.md @@ -1,8 +1,131 @@ # Smooth Scroll -A simple script to animate scrolling to anchor links. Easing support contributed by [Willem Liu](https://github.com/willemliu) with code from [Gaëtan Renaudeau](https://gist.github.com/gre/1650294). +A lightweight script to animate scrolling to anchor links, by [Chris Ferdinandi](http://gomakethings.com). [View the Demo](http://cferdinandi.github.io/smooth-scroll/) + +1. [Getting Started](#getting-started) +2. [Browser Compatability](#browser-compatability) +3. [Options & Settings](#options-and-settings) +4. [Changelog](#changelog) +5. [License](#license) +6. [Older Docs](#older-docs) + + + +## Getting Started + +### 1. Include Smooth Scroll on your site. + + + +### 2. Add the markup to your HTML. + + Anchor Link + ... + Bazinga! + +Turn anchor links into Smooth Scroll links by adding the `[data-scroll]` data attribute. Give the anchor location an ID just like you normally would. + +### 3. Initialize Smooth Scroll. + + + +In the footer of your page, after the content, initialize Smooth Scroll. And that's it, you're done. Nice work! + + + +## Options and Settings + +Smooth Scroll includes smart defaults and works right out of the box. But if you want to customize things, it also has a robust API that provides multiple ways for you to adjust the default options and settings. + +### Global Settings + +You can pass options and callbacks into Smooth Scroll through the `init()` function: + + smoothScroll.init({ + speed: 500, // How fast to complete the scroll in milliseconds + easing: 'easeInOutCubic', // Easing pattern to use + updateURL: false, // Boolean. Whether or not to update the URL with the anchor hash on scroll + callbackBefore: function () {}, // Function to run before scrolling + callbackAfter: function () {} // Function to run after scrolling + }); + +#### Easing Options + +**Linear** +*Moves at the same speed from start to finish.* + +* Linear + + +**Ease-In** +*Gradually increases in speed.* + +* easeInQuad +* easeInCubic +* easeInQuart +* easeInQuint + + +**Ease-In-Out** +*Gradually increases in speed, peaks, and then gradually slows down.* + +* easeInOutQuad +* easeInOutCubic +* easeInOutQuart +* easeInOutQuint + + +**Ease-Out** +*Gradually decreases in speed.* + +* easeOutQuad +* easeOutCubic +* easeOutQuart +* easeOutQuint + + +Learn more about the different easing patterns and what they do at [easings.net](http://easings.net/). + +### Override settings with data attributes + +Smooth Scroll also lets you override global settings on a link-by-link basis using the `[data-options]` data attribute: + + + Anchor Link + + +### Use Smooth Scroll events in your own scripts + +You can also call Smooth Scroll's scroll animation events in your own scripts: + + smoothScroll.animateScroll( + toggle, // Node that toggles the animation. ex. document.querySelector('#toggle') + anchor, // ID of the anchor to scroll to. ex. '#bazinga' + options, // Classes and callbacks. Same options as those passed into the init() function. + event // Optional, if a DOM event was triggered. + ); + +### Fixed Headers + +Add a `[data-scroll-header]` data attribute to fixed headers. Smooth Scroll will automatically offset scroll distances by the header height. If you have multiple fixed headers, add `[data-scroll-header]` to the last one in the markup. + + + + +## Browser Compatability + +Smooth Scroll works in all modern browsers, and IE 9 and above. + +Smooth Scroll is built with modern JavaScript APIs, and uses progressive enhancement. If the JavaScript file fails to load, or if your site is viewed on older and less capable browsers, anchor links will jump the way they normally would. If you need to smooth scrolling for older browsers, [download the jQuery version of Smooth Scroll on GitHub](https://github.com/cferdinandi/smooth-scroll/tree/archive-v1). + -## How It Works -Getting started with Smooth Scroll is really easy. [View the online tutorial](http://cferdinandi.github.com/smooth-scroll/) or dig through the `index.html` file. ## Changelog * v4.0 (February 21, 2014) @@ -73,5 +196,22 @@ Getting started with Smooth Scroll is really easy. [View the online tutorial](ht * v1.0 (January 24, 2013) * Initial release. + + +## Contributors + +* [Willem Liu](https://github.com/willemliu) +* [Gaëtan Renaudeau](https://gist.github.com/gre/1650294) +* [Robert Pate](https://github.com/robertpateii) +* [Arndt von Lucadou](https://github.com/a-v-l) + + ## License -Smooth Scroll is free to use under the [MIT License](http://gomakethings.com/mit/). \ No newline at end of file +Smooth Scroll is licensed under the [MIT License](http://gomakethings.com/mit/). + + + +## Older Docs + +* [Version 3](http://cferdinandi.github.io/smooth-scroll/archive/v3/) +* [Version 1](https://github.com/cferdinandi/smooth-scroll/tree/archive-v1) \ No newline at end of file diff --git a/smooth-scroll.js b/smooth-scroll.js index e1f1049..b5d1f56 100755 --- a/smooth-scroll.js +++ b/smooth-scroll.js @@ -172,7 +172,7 @@ window.smoothScroll = (function (window, document, undefined) { percentage = ( timeLapsed / speed ); percentage = ( percentage > 1 ) ? 1 : percentage; position = startLocation + ( distance * _easingPattern(easing, percentage) ); - window.scrollTo( 0, position ); + window.scrollTo( 0, Math.floor(position) ); _stopAnimateScroll(position, endLocation, animationInterval); }; From dd74709909e1b3da1fda2f77e89e1dddceac6bd6 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Wed, 26 Feb 2014 10:40:19 -0500 Subject: [PATCH 042/285] Added Luke Siedle as a contributor --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 725e618..f77920d 100755 --- a/README.md +++ b/README.md @@ -204,6 +204,7 @@ Smooth Scroll is built with modern JavaScript APIs, and uses progressive enhance * [Gaëtan Renaudeau](https://gist.github.com/gre/1650294) * [Robert Pate](https://github.com/robertpateii) * [Arndt von Lucadou](https://github.com/a-v-l) +* [Luke Siedle](https://github.com/luke-siedle) ## License From a3f8d1123b763ae07e7ba17ff7c41320509a24fc Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Wed, 26 Feb 2014 17:43:30 -0500 Subject: [PATCH 043/285] Updated docs --- README.md | 222 +++++++++++++++++++++++++++++------------------------- 1 file changed, 119 insertions(+), 103 deletions(-) diff --git a/README.md b/README.md index f77920d..3f0ed8a 100755 --- a/README.md +++ b/README.md @@ -2,11 +2,12 @@ A lightweight script to animate scrolling to anchor links, by [Chris Ferdinandi](http://gomakethings.com). [View the Demo](http://cferdinandi.github.io/smooth-scroll/) 1. [Getting Started](#getting-started) -2. [Browser Compatability](#browser-compatability) -3. [Options & Settings](#options-and-settings) -4. [Changelog](#changelog) +2. [Options & Settings](#options-and-settings) +3. [Browser Compatibility](#browser-compatibility) +4. [Contributors](#contributors) 5. [License](#license) -6. [Older Docs](#older-docs) +6. [Changelog](#changelog) +7. [Older Docs](#older-docs) @@ -14,21 +15,27 @@ A lightweight script to animate scrolling to anchor links, by [Chris Ferdinandi] ### 1. Include Smooth Scroll on your site. - +```html + +``` ### 2. Add the markup to your HTML. - Anchor Link - ... - Bazinga! +```html +Anchor Link +... +Bazinga! +``` Turn anchor links into Smooth Scroll links by adding the `[data-scroll]` data attribute. Give the anchor location an ID just like you normally would. ### 3. Initialize Smooth Scroll. - +```html + +``` In the footer of your page, after the content, initialize Smooth Scroll. And that's it, you're done. Nice work! @@ -42,13 +49,15 @@ Smooth Scroll includes smart defaults and works right out of the box. But if you You can pass options and callbacks into Smooth Scroll through the `init()` function: - smoothScroll.init({ - speed: 500, // How fast to complete the scroll in milliseconds - easing: 'easeInOutCubic', // Easing pattern to use - updateURL: false, // Boolean. Whether or not to update the URL with the anchor hash on scroll - callbackBefore: function () {}, // Function to run before scrolling - callbackAfter: function () {} // Function to run after scrolling - }); +```javascript +smoothScroll.init({ + speed: 500, // How fast to complete the scroll in milliseconds + easing: 'easeInOutCubic', // Easing pattern to use + updateURL: false, // Boolean. Whether or not to update the URL with the anchor hash on scroll + callbackBefore: function () {}, // Function to run before scrolling + callbackAfter: function () {} // Function to run after scrolling +}); +``` #### Easing Options @@ -91,35 +100,41 @@ Learn more about the different easing patterns and what they do at [easings.net] Smooth Scroll also lets you override global settings on a link-by-link basis using the `[data-options]` data attribute: - - Anchor Link - +```html + + Anchor Link + +``` ### Use Smooth Scroll events in your own scripts You can also call Smooth Scroll's scroll animation events in your own scripts: - smoothScroll.animateScroll( - toggle, // Node that toggles the animation. ex. document.querySelector('#toggle') - anchor, // ID of the anchor to scroll to. ex. '#bazinga' - options, // Classes and callbacks. Same options as those passed into the init() function. - event // Optional, if a DOM event was triggered. - ); +```javascript +smoothScroll.animateScroll( + toggle, // Node that toggles the animation. ex. document.querySelector('#toggle') + anchor, // ID of the anchor to scroll to. ex. '#bazinga' + options, // Classes and callbacks. Same options as those passed into the init() function. + event // Optional, if a DOM event was triggered. +); +``` ### Fixed Headers Add a `[data-scroll-header]` data attribute to fixed headers. Smooth Scroll will automatically offset scroll distances by the header height. If you have multiple fixed headers, add `[data-scroll-header]` to the last one in the markup. +```html +``` -## Browser Compatability +## Browser Compatibility Smooth Scroll works in all modern browsers, and IE 9 and above. @@ -127,77 +142,6 @@ Smooth Scroll is built with modern JavaScript APIs, and uses progressive enhance -## Changelog -* v4.0 (February 21, 2014) - * Better public/private method namespacing. - * Require `init()` call to run. - * New API exposes additional methods for use in your own scripts. - * Better documentation. -* v3.3 (February 19, 2014) - * [Add `offsettTop` to `offsetHeigh`t for `scrollHeader`. Allows for multiple fixed headers, or a fixed header that sits slightly below the top of the page.](https://github.com/cferdinandi/smooth-scroll/pull/36) -* v3.2 (February 10, 2014) - * [Fixes iOS infinite loop](https://github.com/cferdinandi/smooth-scroll/pull/35) and [Chrome browser zoom](https://github.com/cferdinandi/smooth-scroll/issues/31) bugs. -* v3.1 (February 4, 2014) - * Reverted to `Array.protype.foreach` loops. -* v3.0 (January 28, 2014) - * Switched to a data attribute for the toggle selector. - * Added namespacing to IIFE. - * Updated looping method and event listener. -* v2.19 (January 23, 2014) - * [Fix back button behavior in Chrome.](https://github.com/cferdinandi/smooth-scroll/issues/26#issuecomment-33172325) -* v2.18 (January 23, 2014) - * [Update URL before animation.](https://github.com/cferdinandi/smooth-scroll/pull/27) - * [Fix back button behavior in Firefox.](https://github.com/cferdinandi/smooth-scroll/issues/26) -* v2.17 (January 17, 2014) - * [Fixed back button behavior when using `data-url` feature.](https://github.com/cferdinandi/smooth-scroll/pull/18) -* v2.16 (January 16, 2014) - * [Updated variables for more accurate easing math when scrolling to top of page.](https://github.com/cferdinandi/smooth-scroll/pull/25#issuecomment-32566729) -* v2.15 (January 16, 2014) - * [Fixed bug that caused "scroll-to-top" animation to create endless loop.](https://github.com/cferdinandi/smooth-scroll/issues/24) -* v2.14 (January 15, 2014) - * [Fixed bug that caused animation to stop several pixels short.](https://github.com/cferdinandi/smooth-scroll/pull/15#issuecomment-32380770) -* v2.12 (January 7, 2014) - * [Added fixed header support.](https://github.com/cferdinandi/smooth-scroll/pull/20#issuecomment-31773547) -* v2.11 (January 4, 2014) - * [Change `offsetHeight` to `scrollHeight` to fix fixed/absolute positioning issues.](https://github.com/cferdinandi/smooth-scroll/pull/14) -* v2.10 (December 31, 2013) - * [Added URL history support.](https://github.com/cferdinandi/smooth-scroll/pull/17) -* v2.9 (December 9, 2013) - * [Added fixed for infinite loop when scrolling up.](https://github.com/cferdinandi/smooth-scroll/issues/13) -* v2.8 (December 3, 2013) - * [Fixed false distance reading.](https://github.com/cferdinandi/smooth-scroll/issues/11) - * Added linear easing as fallback when easing pattern not recognized to prevent script from failing. -* v2.7 (November 25, 2013) - * Converted naming conventions back to mathmatical roots (ex. `easeInCubic`) to remain consistent with development community language. -* v2.6 (November 26, 2013) - * Missing character was causing certain easing functions to break. -* v2.5 (November 22, 2013) - * Changed the default easing to `easeInOutNormal`. -* v2.4 (November 21, 2013) - * Added easing support with contributions from [Willem Liu](https://github.com/willemliu) and code from [Gaëtan Renaudeau](https://gist.github.com/gre/1650294). -* v2.3 (August 27, 2013) - * Added missing semicolons. - * Defined `animationStop` variable once, add values later. - * Activated strict mode. - * Wrapped in IIFE. -* v2.2 (August 17, 2013) - * Now you can set the animation speed with the `data-speed` attribute. (ex. `data-speed="400"`) -* v2.1 (August 17, 2013) - * Improvement animation function interval for smoother animation. - * Updated to allow for scrolling up the page. -* v2.0 (August 14, 2013) - * Converted to vanilla JavaScript. - * Removed dependency on jQuery. -* v1.1 (June 7, 2013) - * Switched to MIT license. -* v1.1 (May 18, 2013) - * Added jQuery noConflict mode. - * Updated tutorial. -* v1.0 (January 24, 2013) - * Initial release. - - - ## Contributors * [Willem Liu](https://github.com/willemliu) @@ -207,11 +151,83 @@ Smooth Scroll is built with modern JavaScript APIs, and uses progressive enhance * [Luke Siedle](https://github.com/luke-siedle) + ## License Smooth Scroll is licensed under the [MIT License](http://gomakethings.com/mit/). +## Changelog +* v4.0 - February 21, 2014 + * Better public/private method namespacing. + * Require `init()` call to run. + * New API exposes additional methods for use in your own scripts. + * Better documentation. +* v3.3 - February 19, 2014 + * [Add `offsettTop` to `offsetHeigh`t for `scrollHeader`. Allows for multiple fixed headers, or a fixed header that sits slightly below the top of the page.](https://github.com/cferdinandi/smooth-scroll/pull/36) +* v3.2 - February 10, 2014 + * [Fixes iOS infinite loop](https://github.com/cferdinandi/smooth-scroll/pull/35) and [Chrome browser zoom](https://github.com/cferdinandi/smooth-scroll/issues/31) bugs. +* v3.1 - February 4, 2014 + * Reverted to `Array.protype.foreach` loops. +* v3.0 - January 28, 2014 + * Switched to a data attribute for the toggle selector. + * Added namespacing to IIFE. + * Updated looping method and event listener. +* v2.19 - January 23, 2014 + * [Fix back button behavior in Chrome.](https://github.com/cferdinandi/smooth-scroll/issues/26#issuecomment-33172325) +* v2.18 - January 23, 2014 + * [Update URL before animation.](https://github.com/cferdinandi/smooth-scroll/pull/27) + * [Fix back button behavior in Firefox.](https://github.com/cferdinandi/smooth-scroll/issues/26) +* v2.17 - January 17, 2014 + * [Fixed back button behavior when using `data-url` feature.](https://github.com/cferdinandi/smooth-scroll/pull/18) +* v2.16 - January 16, 2014 + * [Updated variables for more accurate easing math when scrolling to top of page.](https://github.com/cferdinandi/smooth-scroll/pull/25#issuecomment-32566729) +* v2.15 - January 16, 2014 + * [Fixed bug that caused "scroll-to-top" animation to create endless loop.](https://github.com/cferdinandi/smooth-scroll/issues/24) +* v2.14 - January 15, 2014 + * [Fixed bug that caused animation to stop several pixels short.](https://github.com/cferdinandi/smooth-scroll/pull/15#issuecomment-32380770) +* v2.12 - January 7, 2014 + * [Added fixed header support.](https://github.com/cferdinandi/smooth-scroll/pull/20#issuecomment-31773547) +* v2.11 - January 4, 2014 + * [Change `offsetHeight` to `scrollHeight` to fix fixed/absolute positioning issues.](https://github.com/cferdinandi/smooth-scroll/pull/14) +* v2.10 - December 31, 2013 + * [Added URL history support.](https://github.com/cferdinandi/smooth-scroll/pull/17) +* v2.9 - December 9, 2013 + * [Added fixed for infinite loop when scrolling up.](https://github.com/cferdinandi/smooth-scroll/issues/13) +* v2.8 - December 3, 2013 + * [Fixed false distance reading.](https://github.com/cferdinandi/smooth-scroll/issues/11) + * Added linear easing as fallback when easing pattern not recognized to prevent script from failing. +* v2.7 - November 25, 2013 + * Converted naming conventions back to mathmatical roots (ex. `easeInCubic`) to remain consistent with development community language. +* v2.6 - November 26, 2013 + * Missing character was causing certain easing functions to break. +* v2.5 - November 22, 2013 + * Changed the default easing to `easeInOutNormal`. +* v2.4 - November 21, 2013 + * Added easing support with contributions from [Willem Liu](https://github.com/willemliu) and code from [Gaëtan Renaudeau](https://gist.github.com/gre/1650294). +* v2.3 - August 27, 2013 + * Added missing semicolons. + * Defined `animationStop` variable once, add values later. + * Activated strict mode. + * Wrapped in IIFE. +* v2.2 - August 17, 2013 + * Now you can set the animation speed with the `data-speed` attribute. (ex. `data-speed="400"`) +* v2.1 - August 17, 2013 + * Improvement animation function interval for smoother animation. + * Updated to allow for scrolling up the page. +* v2.0 - August 14, 2013 + * Converted to vanilla JavaScript. + * Removed dependency on jQuery. +* v1.1 - June 7, 2013 + * Switched to MIT license. +* v1.1 - May 18, 2013 + * Added jQuery noConflict mode. + * Updated tutorial. +* v1.0 - January 24, 2013 + * Initial release. + + + ## Older Docs * [Version 3](http://cferdinandi.github.io/smooth-scroll/archive/v3/) From 8d56bc8d5208919d2661d96696fe676cc03ddf34 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Wed, 26 Feb 2014 17:46:03 -0500 Subject: [PATCH 044/285] Updated docs --- README.md | 5 ++++- smooth-scroll.js | 16 ++-------------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 3f0ed8a..4d2ee0a 100755 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # Smooth Scroll -A lightweight script to animate scrolling to anchor links, by [Chris Ferdinandi](http://gomakethings.com). [View the Demo](http://cferdinandi.github.io/smooth-scroll/) +A lightweight script to animate scrolling to anchor links. [View the demo](http://cferdinandi.github.io/smooth-scroll/). + +**In This Documentation** 1. [Getting Started](#getting-started) 2. [Options & Settings](#options-and-settings) @@ -148,6 +150,7 @@ Smooth Scroll is built with modern JavaScript APIs, and uses progressive enhance * [Gaëtan Renaudeau](https://gist.github.com/gre/1650294) * [Robert Pate](https://github.com/robertpateii) * [Arndt von Lucadou](https://github.com/a-v-l) +* [Alex Guzman](https://github.com/alexguzman) * [Luke Siedle](https://github.com/luke-siedle) diff --git a/smooth-scroll.js b/smooth-scroll.js index b5d1f56..4c6b304 100755 --- a/smooth-scroll.js +++ b/smooth-scroll.js @@ -4,20 +4,8 @@ Animate scrolling to anchor links, by Chris Ferdinandi. http://gomakethings.com - Easing support contributed by Willem Liu. - https://github.com/willemliu - - Easing functions forked from Gaëtan Renaudeau. - https://gist.github.com/gre/1650294 - - URL history support contributed by Robert Pate. - https://github.com/robertpateii - - Fixed header support contributed by Arndt von Lucadou. - https://github.com/a-v-l - - Infinite loop bugs in iOS and Chrome (when zoomed) by Alex Guzman. - https://github.com/alexguzman + Additional contributors: + https://github.com/cferdinandi/smooth-scroll#contributors Free to use under the MIT License. http://gomakethings.com/mit/ From 9171356112d5782bad346c58667a22336f65b081 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Wed, 26 Feb 2014 17:47:14 -0500 Subject: [PATCH 045/285] Updated docs --- README.md | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 4d2ee0a..50cb846 100755 --- a/README.md +++ b/README.md @@ -66,34 +66,34 @@ smoothScroll.init({ **Linear** *Moves at the same speed from start to finish.* -* Linear +* `Linear` **Ease-In** *Gradually increases in speed.* -* easeInQuad -* easeInCubic -* easeInQuart -* easeInQuint +* `easeInQuad` +* `easeInCubic` +* `easeInQuart` +* `easeInQuint` **Ease-In-Out** *Gradually increases in speed, peaks, and then gradually slows down.* -* easeInOutQuad -* easeInOutCubic -* easeInOutQuart -* easeInOutQuint +* `easeInOutQuad` +* `easeInOutCubic` +* `easeInOutQuart` +* `easeInOutQuint` **Ease-Out** *Gradually decreases in speed.* -* easeOutQuad -* easeOutCubic -* easeOutQuart -* easeOutQuint +* `easeOutQuad` +* `easeOutCubic` +* `easeOutQuart` +* `easeOutQuint` Learn more about the different easing patterns and what they do at [easings.net](http://easings.net/). From 15f459eab63b37d539f42ba76c39466ed3f483f4 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Wed, 26 Feb 2014 20:30:28 -0500 Subject: [PATCH 046/285] Updated docs --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 50cb846..1a72681 100755 --- a/README.md +++ b/README.md @@ -146,12 +146,12 @@ Smooth Scroll is built with modern JavaScript APIs, and uses progressive enhance ## Contributors -* [Willem Liu](https://github.com/willemliu) -* [Gaëtan Renaudeau](https://gist.github.com/gre/1650294) -* [Robert Pate](https://github.com/robertpateii) -* [Arndt von Lucadou](https://github.com/a-v-l) -* [Alex Guzman](https://github.com/alexguzman) -* [Luke Siedle](https://github.com/luke-siedle) +* Easing support contributed by [Willem Liu](https://github.com/willemliu) +* Easing functions forked from [Gaëtan Renaudeau](https://gist.github.com/gre/1650294) +* URL history support contributed by [Robert Pate](https://github.com/robertpateii) +* Fixed header support contributed by [Arndt von Lucadou](https://github.com/a-v-l) +* Infinite loop bugs in iOS and Chrome (when zoomed) by [Alex Guzman](https://github.com/alexguzman) +* IE10 rounding error fixed by [Luke Siedle](https://github.com/luke-siedle) From 7b35bc4e4e4b3d6eb84cbd434e5d558582613497 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Wed, 26 Feb 2014 20:31:19 -0500 Subject: [PATCH 047/285] Updated docs --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 1a72681..4403280 100755 --- a/README.md +++ b/README.md @@ -146,12 +146,12 @@ Smooth Scroll is built with modern JavaScript APIs, and uses progressive enhance ## Contributors -* Easing support contributed by [Willem Liu](https://github.com/willemliu) -* Easing functions forked from [Gaëtan Renaudeau](https://gist.github.com/gre/1650294) -* URL history support contributed by [Robert Pate](https://github.com/robertpateii) -* Fixed header support contributed by [Arndt von Lucadou](https://github.com/a-v-l) -* Infinite loop bugs in iOS and Chrome (when zoomed) by [Alex Guzman](https://github.com/alexguzman) -* IE10 rounding error fixed by [Luke Siedle](https://github.com/luke-siedle) +* Easing support contributed by [Willem Liu](https://github.com/willemliu). +* Easing functions forked from [Gaëtan Renaudeau](https://gist.github.com/gre/1650294). +* URL history support contributed by [Robert Pate](https://github.com/robertpateii). +* Fixed header support contributed by [Arndt von Lucadou](https://github.com/a-v-l). +* Infinite loop bugs in iOS and Chrome (when zoomed) by [Alex Guzman](https://github.com/alexguzman). +* IE10 rounding error fixed by [Luke Siedle](https://github.com/luke-siedle). From 6fbb65e29388420197c52800d2b7554d3b9fa1ec Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Thu, 27 Feb 2014 17:32:23 -0500 Subject: [PATCH 048/285] Updated docs --- README.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/README.md b/README.md index 4403280..8813adc 100755 --- a/README.md +++ b/README.md @@ -125,6 +125,20 @@ smoothScroll.animateScroll( ); ``` +**Example 1** + +```javascript +smoothScroll.animateScroll( null, '#bazinga' ); +``` + +**Example 2** + +```javascript +var toggle = document.querySelector('#toggle'); +var options = { speed: 1000, easing: 'easeOutCubic' }; +smoothScroll.animateScroll( toggle, '#bazinga', options ); +``` + ### Fixed Headers Add a `[data-scroll-header]` data attribute to fixed headers. Smooth Scroll will automatically offset scroll distances by the header height. If you have multiple fixed headers, add `[data-scroll-header]` to the last one in the markup. From 383e16dca9bfaa3edd1ca7aed60dc6df238a8d3e Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Thu, 27 Feb 2014 18:34:00 -0500 Subject: [PATCH 049/285] Converted `_defaults` to a literal object --- README.md | 2 ++ smooth-scroll.js | 23 ++++++++++------------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 8813adc..4263c3b 100755 --- a/README.md +++ b/README.md @@ -175,6 +175,8 @@ Smooth Scroll is licensed under the [MIT License](http://gomakethings.com/mit/). ## Changelog +* v4.1 - February 27, 2014 + * Converted `_defaults` to a literal object * v4.0 - February 21, 2014 * Better public/private method namespacing. * Require `init()` call to run. diff --git a/smooth-scroll.js b/smooth-scroll.js index 4c6b304..ee700b0 100755 --- a/smooth-scroll.js +++ b/smooth-scroll.js @@ -1,6 +1,6 @@ /* ============================================================= - Smooth Scroll v4.0 + Smooth Scroll v4.1 Animate scrolling to anchor links, by Chris Ferdinandi. http://gomakethings.com @@ -17,16 +17,13 @@ window.smoothScroll = (function (window, document, undefined) { 'use strict'; // Default settings - // Private method - // Returns an {object} - var _defaults = function () { - return { - speed: 500, - easing: 'easeInOutCubic', - updateURL: false, - callbackBefore: function () {}, - callbackAfter: function () {} - }; + // Private {object} variable + var _defaults = { + speed: 500, + easing: 'easeInOutCubic', + updateURL: false, + callbackBefore: function () {}, + callbackAfter: function () {} }; // Merge default settings with user options @@ -117,7 +114,7 @@ window.smoothScroll = (function (window, document, undefined) { var animateScroll = function ( toggle, anchor, options, event ) { // Options and overrides - options = _mergeObjects( _defaults(), options || {} ); // Merge user options with defaults + options = _mergeObjects( _defaults, options || {} ); // Merge user options with defaults var overrides = _getDataOptions( toggle.getAttribute('data-options') ); var speed = overrides.speed || options.speed; var easing = overrides.easing || options.easing; @@ -186,7 +183,7 @@ window.smoothScroll = (function (window, document, undefined) { if ( 'querySelector' in document && 'addEventListener' in window && Array.prototype.forEach ) { // Selectors and variables - options = _mergeObjects( _defaults(), options || {} ); // Merge user options with defaults + options = _mergeObjects( _defaults, options || {} ); // Merge user options with defaults var toggles = document.querySelectorAll('[data-scroll]'); // Get smooth scroll toggles // When a toggle is clicked, run the click handler From aab742ef5422eb4af7b43c243b7e23d6ab7f2ff6 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Thu, 27 Feb 2014 21:13:20 -0500 Subject: [PATCH 050/285] Fixed error for null `toggle` argument in `animateScroll` function. https://github.com/cferdinandi/smooth-scroll/issues/43 --- index.html | 1 + smooth-scroll.js | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index bb54f69..3c5a921 100644 --- a/index.html +++ b/index.html @@ -75,6 +75,7 @@

Smooth Scroll

callbackBefore: function () {}, callbackAfter: function () {} }); + smoothScroll.animateScroll( null, '#bazinga' ); diff --git a/smooth-scroll.js b/smooth-scroll.js index ee700b0..5e87c65 100755 --- a/smooth-scroll.js +++ b/smooth-scroll.js @@ -1,6 +1,6 @@ /* ============================================================= - Smooth Scroll v4.1 + Smooth Scroll v4.2 Animate scrolling to anchor links, by Chris Ferdinandi. http://gomakethings.com @@ -115,7 +115,7 @@ window.smoothScroll = (function (window, document, undefined) { // Options and overrides options = _mergeObjects( _defaults, options || {} ); // Merge user options with defaults - var overrides = _getDataOptions( toggle.getAttribute('data-options') ); + var overrides = _getDataOptions( toggle ? toggle.getAttribute('data-options') : null ); var speed = overrides.speed || options.speed; var easing = overrides.easing || options.easing; var updateURL = overrides.updateURL || options.updateURL; From d412541bc3ed9722fadd60540333c500b60533d4 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Thu, 27 Feb 2014 21:14:23 -0500 Subject: [PATCH 051/285] Removed `animateScroll` from demo --- index.html | 1 - 1 file changed, 1 deletion(-) diff --git a/index.html b/index.html index 3c5a921..bb54f69 100644 --- a/index.html +++ b/index.html @@ -75,7 +75,6 @@

Smooth Scroll

callbackBefore: function () {}, callbackAfter: function () {} }); - smoothScroll.animateScroll( null, '#bazinga' ); From 0e6c6eb6e7eed71efb134486d470815b9495f3de Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Thu, 27 Feb 2014 22:41:29 -0500 Subject: [PATCH 052/285] Fixed error for null `toggle` argument in `animateScroll` function https://github.com/cferdinandi/smooth-scroll/issues/43 --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 4263c3b..6666974 100755 --- a/README.md +++ b/README.md @@ -175,6 +175,8 @@ Smooth Scroll is licensed under the [MIT License](http://gomakethings.com/mit/). ## Changelog +* v4.2 - February 27, 2014 + * Fixed error for null `toggle` argument in `animateScroll` function ([43](https://github.com/cferdinandi/smooth-scroll/issues/43)). * v4.1 - February 27, 2014 * Converted `_defaults` to a literal object * v4.0 - February 21, 2014 From d7caf03317dd53ac7e37b61a107e24d61162a85f Mon Sep 17 00:00:00 2001 From: Constant Meiring Date: Wed, 5 Mar 2014 00:08:08 +0200 Subject: [PATCH 053/285] Pass element that triggered smoothScroll to callbacks --- smooth-scroll.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/smooth-scroll.js b/smooth-scroll.js index 5e87c65..81b2518 100755 --- a/smooth-scroll.js +++ b/smooth-scroll.js @@ -145,7 +145,7 @@ window.smoothScroll = (function (window, document, undefined) { var currentLocation = window.pageYOffset; if ( position == endLocation || currentLocation == endLocation || ( (window.innerHeight + currentLocation) >= document.body.scrollHeight ) ) { clearInterval(animationInterval); - options.callbackAfter(); // Run callbacks after animation complete + options.callbackAfter(toggle); // Run callbacks after animation complete } }; @@ -165,7 +165,7 @@ window.smoothScroll = (function (window, document, undefined) { // Private method // Runs functions var _startAnimateScroll = function () { - options.callbackBefore(); // Run callbacks before animating scroll + options.callbackBefore(toggle); // Run callbacks before animating scroll animationInterval = setInterval(_loopAnimateScroll, 16); }; From afa6e2eca4c4a8cafa9244b60d59ea98acce392d Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Thu, 6 Mar 2014 12:55:15 -0500 Subject: [PATCH 054/285] Added arguments to callback functions for greater versatility. --- README.md | 7 +++++-- index.html | 4 ++-- smooth-scroll.js | 6 +++--- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 6666974..a6dc473 100755 --- a/README.md +++ b/README.md @@ -56,8 +56,8 @@ smoothScroll.init({ speed: 500, // How fast to complete the scroll in milliseconds easing: 'easeInOutCubic', // Easing pattern to use updateURL: false, // Boolean. Whether or not to update the URL with the anchor hash on scroll - callbackBefore: function () {}, // Function to run before scrolling - callbackAfter: function () {} // Function to run after scrolling + callbackBefore: function ( toggle, anchor ) {}, // Function to run before scrolling + callbackAfter: function ( toggle, anchor ) {} // Function to run after scrolling }); ``` @@ -166,6 +166,7 @@ Smooth Scroll is built with modern JavaScript APIs, and uses progressive enhance * Fixed header support contributed by [Arndt von Lucadou](https://github.com/a-v-l). * Infinite loop bugs in iOS and Chrome (when zoomed) by [Alex Guzman](https://github.com/alexguzman). * IE10 rounding error fixed by [Luke Siedle](https://github.com/luke-siedle). +* Enhanced callback functions by [Constant Meiring](https://github.com/constantm). @@ -175,6 +176,8 @@ Smooth Scroll is licensed under the [MIT License](http://gomakethings.com/mit/). ## Changelog +* v4.3 - March 5, 2014 + * Added arguments to callback functions for greater versatility. [44](https://github.com/cferdinandi/smooth-scroll/pull/44) * v4.2 - February 27, 2014 * Fixed error for null `toggle` argument in `animateScroll` function ([43](https://github.com/cferdinandi/smooth-scroll/issues/43)). * v4.1 - February 27, 2014 diff --git a/index.html b/index.html index bb54f69..b9dbea2 100644 --- a/index.html +++ b/index.html @@ -72,8 +72,8 @@

Smooth Scroll

speed: 500, easing: 'easeInOutCubic', updateURL: false, - callbackBefore: function () {}, - callbackAfter: function () {} + callbackBefore: function ( toggle, anchor ) {}, + callbackAfter: function ( toggle, anchor ) {} }); diff --git a/smooth-scroll.js b/smooth-scroll.js index 81b2518..b035d08 100755 --- a/smooth-scroll.js +++ b/smooth-scroll.js @@ -1,6 +1,6 @@ /* ============================================================= - Smooth Scroll v4.2 + Smooth Scroll v4.3 Animate scrolling to anchor links, by Chris Ferdinandi. http://gomakethings.com @@ -145,7 +145,7 @@ window.smoothScroll = (function (window, document, undefined) { var currentLocation = window.pageYOffset; if ( position == endLocation || currentLocation == endLocation || ( (window.innerHeight + currentLocation) >= document.body.scrollHeight ) ) { clearInterval(animationInterval); - options.callbackAfter(toggle); // Run callbacks after animation complete + options.callbackAfter( toggle, anchor ); // Run callbacks after animation complete } }; @@ -165,7 +165,7 @@ window.smoothScroll = (function (window, document, undefined) { // Private method // Runs functions var _startAnimateScroll = function () { - options.callbackBefore(toggle); // Run callbacks before animating scroll + options.callbackBefore( toggle, anchor ); // Run callbacks before animating scroll animationInterval = setInterval(_loopAnimateScroll, 16); }; From 4833424d8845f69598a2bdce78c620cdeec25724 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Sat, 15 Mar 2014 19:27:38 -0400 Subject: [PATCH 055/285] Fixed iOS scroll-to-top bug https://github.com/cferdinandi/smooth-scroll/issues/45 --- README.md | 2 ++ smooth-scroll.js | 10 ++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a6dc473..df1c07c 100755 --- a/README.md +++ b/README.md @@ -176,6 +176,8 @@ Smooth Scroll is licensed under the [MIT License](http://gomakethings.com/mit/). ## Changelog +* v4.4 - March 15, 2014 + * [Fixed iOS scroll-to-top bug](https://github.com/cferdinandi/smooth-scroll/issues/45). * v4.3 - March 5, 2014 * Added arguments to callback functions for greater versatility. [44](https://github.com/cferdinandi/smooth-scroll/pull/44) * v4.2 - February 27, 2014 diff --git a/smooth-scroll.js b/smooth-scroll.js index b035d08..4aace38 100755 --- a/smooth-scroll.js +++ b/smooth-scroll.js @@ -1,6 +1,6 @@ /* ============================================================= - Smooth Scroll v4.3 + Smooth Scroll v4.4 Animate scrolling to anchor links, by Chris Ferdinandi. http://gomakethings.com @@ -141,7 +141,7 @@ window.smoothScroll = (function (window, document, undefined) { // Stop the scroll animation when it reaches its target (or the bottom/top of page) // Private method // Runs functions - var _stopAnimateScroll = function () { + var _stopAnimateScroll = function (position, endLocation, animationInterval) { var currentLocation = window.pageYOffset; if ( position == endLocation || currentLocation == endLocation || ( (window.innerHeight + currentLocation) >= document.body.scrollHeight ) ) { clearInterval(animationInterval); @@ -169,6 +169,12 @@ window.smoothScroll = (function (window, document, undefined) { animationInterval = setInterval(_loopAnimateScroll, 16); }; + // Reset position to fix weird iOS bug + // https://github.com/cferdinandi/smooth-scroll/issues/45 + if ( window.pageYOffset === 0 ) { + window.scrollTo( 0, 0 ); + } + // Start scrolling animation _startAnimateScroll(); From c02d1c1a255d1bac0a7d308cda39023430255085 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Thu, 20 Mar 2014 16:21:19 -0400 Subject: [PATCH 056/285] Updated docs --- README.md | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index df1c07c..19743b6 100755 --- a/README.md +++ b/README.md @@ -7,9 +7,10 @@ A lightweight script to animate scrolling to anchor links. [View the demo](http: 2. [Options & Settings](#options-and-settings) 3. [Browser Compatibility](#browser-compatibility) 4. [Contributors](#contributors) -5. [License](#license) -6. [Changelog](#changelog) -7. [Older Docs](#older-docs) +5. [How to Contribute](#how-to-contribute) +6. [License](#license) +7. [Changelog](#changelog) +8. [Older Docs](#older-docs) @@ -170,6 +171,12 @@ Smooth Scroll is built with modern JavaScript APIs, and uses progressive enhance +## How to Contribute + +In lieu of a formal style guide, take care to maintain the existing coding style. Don't forget to update the version number, the changelog (in the `readme.md` file), and when applicable, the documentation. + + + ## License Smooth Scroll is licensed under the [MIT License](http://gomakethings.com/mit/). From 1747f246def9886ac6998411ec18be7d97f4f127 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Thu, 20 Mar 2014 21:46:55 -0400 Subject: [PATCH 057/285] Added offset to options --- README.md | 6 +++++- index.html | 1 + smooth-scroll.js | 8 +++++--- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 19743b6..b684828 100755 --- a/README.md +++ b/README.md @@ -54,9 +54,10 @@ You can pass options and callbacks into Smooth Scroll through the `init()` funct ```javascript smoothScroll.init({ - speed: 500, // How fast to complete the scroll in milliseconds + speed: 500, // Integer. How fast to complete the scroll in milliseconds easing: 'easeInOutCubic', // Easing pattern to use updateURL: false, // Boolean. Whether or not to update the URL with the anchor hash on scroll + offset: 0, // Integer. How far to offset the scrolling anchor location in pixels callbackBefore: function ( toggle, anchor ) {}, // Function to run before scrolling callbackAfter: function ( toggle, anchor ) {} // Function to run after scrolling }); @@ -107,6 +108,7 @@ Smooth Scroll also lets you override global settings on a link-by-link basis usi Anchor Link @@ -183,6 +185,8 @@ Smooth Scroll is licensed under the [MIT License](http://gomakethings.com/mit/). ## Changelog +* v4.5 - March 20, 2014 + * Added `offset` to `options` * v4.4 - March 15, 2014 * [Fixed iOS scroll-to-top bug](https://github.com/cferdinandi/smooth-scroll/issues/45). * v4.3 - March 5, 2014 diff --git a/index.html b/index.html index b9dbea2..1b0a40c 100644 --- a/index.html +++ b/index.html @@ -71,6 +71,7 @@

Smooth Scroll

smoothScroll.init({ speed: 500, easing: 'easeInOutCubic', + offset: 0, updateURL: false, callbackBefore: function ( toggle, anchor ) {}, callbackAfter: function ( toggle, anchor ) {} diff --git a/smooth-scroll.js b/smooth-scroll.js index 4aace38..f372e2b 100755 --- a/smooth-scroll.js +++ b/smooth-scroll.js @@ -1,6 +1,6 @@ /* ============================================================= - Smooth Scroll v4.4 + Smooth Scroll v4.5 Animate scrolling to anchor links, by Chris Ferdinandi. http://gomakethings.com @@ -21,6 +21,7 @@ window.smoothScroll = (function (window, document, undefined) { var _defaults = { speed: 500, easing: 'easeInOutCubic', + offset: 0, updateURL: false, callbackBefore: function () {}, callbackAfter: function () {} @@ -116,15 +117,16 @@ window.smoothScroll = (function (window, document, undefined) { // Options and overrides options = _mergeObjects( _defaults, options || {} ); // Merge user options with defaults var overrides = _getDataOptions( toggle ? toggle.getAttribute('data-options') : null ); - var speed = overrides.speed || options.speed; + var speed = parseInt(overrides.speed || options.speed, 10); var easing = overrides.easing || options.easing; + var offset = parseInt(overrides.offset || options.offset, 10); var updateURL = overrides.updateURL || options.updateURL; // Selectors and variables var fixedHeader = document.querySelector('[data-scroll-header]'); // Get the fixed header var headerHeight = fixedHeader === null ? 0 : (fixedHeader.offsetHeight + fixedHeader.offsetTop); // Get the height of a fixed header if one exists var startLocation = window.pageYOffset; // Current location on the page - var endLocation = _getEndLocation( document.querySelector(anchor), headerHeight ); // Scroll to location + var endLocation = _getEndLocation( document.querySelector(anchor), headerHeight + offset ); // Scroll to location var animationInterval; // interval timer var distance = endLocation - startLocation; // distance to travel var timeLapsed = 0; From c7587dffd21a77ac82510da42e5e8e074e2d5dc0 Mon Sep 17 00:00:00 2001 From: Jonas Havers Date: Fri, 21 Mar 2014 03:55:25 +0100 Subject: [PATCH 058/285] Fix for issue 49: determining the document's height (cross-browser) --- smooth-scroll.js | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/smooth-scroll.js b/smooth-scroll.js index f372e2b..353f0c2 100755 --- a/smooth-scroll.js +++ b/smooth-scroll.js @@ -109,6 +109,17 @@ window.smoothScroll = (function (window, document, undefined) { } }; + // Determine the document's height (cross-browser) + // Fix for issue 49 (https://github.com/cferdinandi/smooth-scroll/issues/49) + // Private method + var _getDocumentHeight = function () { + return Math.max( + document.body.scrollHeight, document.documentElement.scrollHeight, + document.body.offsetHeight, document.documentElement.offsetHeight, + document.body.clientHeight, document.documentElement.clientHeight + ); + }; + // Start/stop the scrolling animation // Public method // Runs functions @@ -145,7 +156,7 @@ window.smoothScroll = (function (window, document, undefined) { // Runs functions var _stopAnimateScroll = function (position, endLocation, animationInterval) { var currentLocation = window.pageYOffset; - if ( position == endLocation || currentLocation == endLocation || ( (window.innerHeight + currentLocation) >= document.body.scrollHeight ) ) { + if ( position == endLocation || currentLocation == endLocation || ( (window.innerHeight + currentLocation) >= _getDocumentHeight() ) ) { clearInterval(animationInterval); options.callbackAfter( toggle, anchor ); // Run callbacks after animation complete } From 098628ed5bc63fce0e702bdd79e8453f9b80b72b Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Fri, 21 Mar 2014 02:46:01 -0400 Subject: [PATCH 059/285] Rewrote _getEndLocation function for better readability Added offset as argument in function itself rather than doing the math outside and passing in with headerHeight argument. --- smooth-scroll.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/smooth-scroll.js b/smooth-scroll.js index f372e2b..09f90cd 100755 --- a/smooth-scroll.js +++ b/smooth-scroll.js @@ -59,7 +59,7 @@ window.smoothScroll = (function (window, document, undefined) { // Calculate how far to scroll // Private method // Returns an integer - var _getEndLocation = function ( anchor, headerHeight ) { + var _getEndLocation = function ( anchor, headerHeight, offset ) { var location = 0; if (anchor.offsetParent) { do { @@ -67,7 +67,7 @@ window.smoothScroll = (function (window, document, undefined) { anchor = anchor.offsetParent; } while (anchor); } - location = location - headerHeight; + location = location - headerHeight - offset; if ( location >= 0 ) { return location; } else { @@ -126,7 +126,7 @@ window.smoothScroll = (function (window, document, undefined) { var fixedHeader = document.querySelector('[data-scroll-header]'); // Get the fixed header var headerHeight = fixedHeader === null ? 0 : (fixedHeader.offsetHeight + fixedHeader.offsetTop); // Get the height of a fixed header if one exists var startLocation = window.pageYOffset; // Current location on the page - var endLocation = _getEndLocation( document.querySelector(anchor), headerHeight + offset ); // Scroll to location + var endLocation = _getEndLocation( document.querySelector(anchor), headerHeight, offset ); // Scroll to location var animationInterval; // interval timer var distance = endLocation - startLocation; // distance to travel var timeLapsed = 0; @@ -209,4 +209,4 @@ window.smoothScroll = (function (window, document, undefined) { animateScroll: animateScroll }; -})(window, document); \ No newline at end of file +})(window, document); From c58b61861cd428c689940a82da2b8380d0b785d7 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Fri, 21 Mar 2014 17:03:20 -0400 Subject: [PATCH 060/285] Fixed scroll-to-top bug for links at the bottom of the page --- README.md | 2 ++ smooth-scroll.js | 25 +++++++++++++------------ 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index b684828..b87c070 100755 --- a/README.md +++ b/README.md @@ -185,6 +185,8 @@ Smooth Scroll is licensed under the [MIT License](http://gomakethings.com/mit/). ## Changelog +* v4.6 - March 21, 2014 + * [Fixed scroll-to-top bug for links at the bottom of the page](https://github.com/cferdinandi/smooth-scroll/issues/49). * v4.5 - March 20, 2014 * Added `offset` to `options` * v4.4 - March 15, 2014 diff --git a/smooth-scroll.js b/smooth-scroll.js index 353f0c2..b62cb64 100755 --- a/smooth-scroll.js +++ b/smooth-scroll.js @@ -75,6 +75,17 @@ window.smoothScroll = (function (window, document, undefined) { } }; + // Determine the document's height + // Private method + // Returns an integer + var _getDocumentHeight = function () { + return Math.max( + document.body.scrollHeight, document.documentElement.scrollHeight, + document.body.offsetHeight, document.documentElement.offsetHeight, + document.body.clientHeight, document.documentElement.clientHeight + ); + }; + // Convert data-options attribute into an object of key/value pairs // Private method // Returns an {object} @@ -109,17 +120,6 @@ window.smoothScroll = (function (window, document, undefined) { } }; - // Determine the document's height (cross-browser) - // Fix for issue 49 (https://github.com/cferdinandi/smooth-scroll/issues/49) - // Private method - var _getDocumentHeight = function () { - return Math.max( - document.body.scrollHeight, document.documentElement.scrollHeight, - document.body.offsetHeight, document.documentElement.offsetHeight, - document.body.clientHeight, document.documentElement.clientHeight - ); - }; - // Start/stop the scrolling animation // Public method // Runs functions @@ -140,6 +140,7 @@ window.smoothScroll = (function (window, document, undefined) { var endLocation = _getEndLocation( document.querySelector(anchor), headerHeight + offset ); // Scroll to location var animationInterval; // interval timer var distance = endLocation - startLocation; // distance to travel + var documentHeight = _getDocumentHeight(); var timeLapsed = 0; var percentage, position; @@ -156,7 +157,7 @@ window.smoothScroll = (function (window, document, undefined) { // Runs functions var _stopAnimateScroll = function (position, endLocation, animationInterval) { var currentLocation = window.pageYOffset; - if ( position == endLocation || currentLocation == endLocation || ( (window.innerHeight + currentLocation) >= _getDocumentHeight() ) ) { + if ( position == endLocation || currentLocation == endLocation || ( (window.innerHeight + currentLocation) >= documentHeight ) ) { clearInterval(animationInterval); options.callbackAfter( toggle, anchor ); // Run callbacks after animation complete } From b0aeb125e589f07912eae374dd3dce676f8e7d04 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Fri, 21 Mar 2014 20:27:11 -0400 Subject: [PATCH 061/285] Added Jonas Havers to list of contributers --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index b87c070..f3fcf48 100755 --- a/README.md +++ b/README.md @@ -170,6 +170,7 @@ Smooth Scroll is built with modern JavaScript APIs, and uses progressive enhance * Infinite loop bugs in iOS and Chrome (when zoomed) by [Alex Guzman](https://github.com/alexguzman). * IE10 rounding error fixed by [Luke Siedle](https://github.com/luke-siedle). * Enhanced callback functions by [Constant Meiring](https://github.com/constantm). +* Scroll-to-top bug for links at the bottom of the page by [Jonas Havers](https://github.com/JonasHavers). From f7ca83006276275b5c16d4e48cfadf738a31207d Mon Sep 17 00:00:00 2001 From: Joel Pittet Date: Sat, 22 Mar 2014 22:20:21 -0700 Subject: [PATCH 062/285] Attribute Typo Fix. --- index.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/index.html b/index.html index 1b0a40c..4e3523b 100644 --- a/index.html +++ b/index.html @@ -41,9 +41,9 @@

Smooth Scroll

Ease-Out
Quad
- Cubic
- Quart
- Quint + Cubic
+ Quart
+ Quint

@@ -79,4 +79,4 @@

Smooth Scroll

- \ No newline at end of file + From e3f8354a27fd7ba8d1a7ab3e5122b25a4f02bcd9 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Fri, 4 Apr 2014 17:31:46 -0400 Subject: [PATCH 063/285] Updated demo --- index.html | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/index.html b/index.html index 4e3523b..7dec8a6 100644 --- a/index.html +++ b/index.html @@ -2,7 +2,7 @@ - Smooth Scroll - A simple vanilla JS script to animate scrolling to anchor links. + Smooth Scroll @@ -14,8 +14,11 @@
-

Smooth Scroll

-

A lightweight script to animate scrolling to anchor links.

+

Smooth Scroll

+

A lightweight script to animate scrolling to anchor links.

+

Smooth Scroll on GitHub

+ +

Linear
From ae9b3bcc8f6df5d9ad2746f2c0a592a279abb31a Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Fri, 4 Apr 2014 22:19:40 -0400 Subject: [PATCH 064/285] Updated docs --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index f3fcf48..d95a745 100755 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # Smooth Scroll -A lightweight script to animate scrolling to anchor links. [View the demo](http://cferdinandi.github.io/smooth-scroll/). +A lightweight script to animate scrolling to anchor links. + +[Download Smooth Scroll 4](https://github.com/cferdinandi/smooth-scroll/archive/master.zip) / [View the demo](http://cferdinandi.github.io/smooth-scroll/) **In This Documentation** From 1b86aff6db898d2302f64fb0f94d0a6cde9fbd36 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Sat, 5 Apr 2014 17:43:37 -0400 Subject: [PATCH 065/285] Updated demo --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 7dec8a6..34f2873 100644 --- a/index.html +++ b/index.html @@ -72,7 +72,7 @@

Smooth Scroll< + ``` ### 2. Add the markup to your HTML. @@ -201,6 +203,10 @@ Smooth Scroll is licensed under the [MIT License](http://gomakethings.com/mit/). ## Changelog +* v4.8.0 - June 21, 2014 + * Converted to gulp.js workflow. + * Added unit testing. + * Added minified versions of files. * v4.7.2 - June 19, 2014 * Fixed typo that broke scroll. * v4.7.1 - June 19, 2014 diff --git a/smooth-scroll.js b/dist/js/smooth-scroll.js similarity index 98% rename from smooth-scroll.js rename to dist/js/smooth-scroll.js index a96036c..223ee9d 100755 --- a/smooth-scroll.js +++ b/dist/js/smooth-scroll.js @@ -1,11 +1,8 @@ /** - * Smooth Scroll v4.7.2 + * smooth-scroll v4.8.0 * Animate scrolling to anchor links, by Chris Ferdinandi. - * http://gomakethings.com - * - * Additional contributors: - * https://github.com/cferdinandi/smooth-scroll#contributors - * + * http://github.com/cferdinandi/smooth-scroll + * * Free to use under the MIT License. * http://gomakethings.com/mit/ */ diff --git a/dist/js/smooth-scroll.min.js b/dist/js/smooth-scroll.min.js new file mode 100755 index 0000000..c08fd5f --- /dev/null +++ b/dist/js/smooth-scroll.min.js @@ -0,0 +1,2 @@ +/** smooth-scroll v4.8.0, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ +!function(e,t){"function"==typeof define&&define.amd?define("smoothScroll",t(e)):"object"==typeof exports?module.smoothScroll=t(e):e.smoothScroll=t(e)}(this,function(e){"use strict";var t={},n=!!document.querySelector&&!!e.addEventListener,o={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!1,callbackBefore:function(){},callbackAfter:function(){}},r=function(e,t){for(var n in t)Object.prototype.hasOwnProperty.call(t,n)&&(e[n]=t[n]);return e},a=function(e,t,n){if("[object Object]"===Object.prototype.toString.call(e))for(var o in e)Object.prototype.hasOwnProperty.call(e,o)&&t.call(n,e[o],o,e);else for(var r=0,a=e.length;a>r;r++)t.call(n,e[r],r,e)},c=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},u=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=o-t-n,o>=0?o:0},l=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},i=function(e){return e.replace(/^\s+|\s+$/g,"")},f=function(e){var t={};return e&&(e=e.split(";"),e.forEach(function(e){e=i(e),""!==e&&(e=e.split(":"),t[e[0]]=i(e[1]))})),t},s=function(e,t){history.pushState&&(t||"true"===t)&&history.pushState({pos:e.id},"",e)};return t.animateScroll=function(t,n,a,i){var d=r(o,a||{}),p=f(t?t.getAttribute("data-options"):null);d=r(d,p);var h,m,b,g=document.querySelector("[data-scroll-header]"),O=null===g?0:g.offsetHeight+g.offsetTop,v=e.pageYOffset,y=u(document.querySelector(n),O,parseInt(d.offset,10)),I=y-v,S=l(),Q=0;t&&"a"===t.tagName.toLowerCase()&&i&&i.preventDefault(),s(n,d.updateURL);var H=function(o,r,a){var c=e.pageYOffset;(o==r||c==r||e.innerHeight+c>=S)&&(clearInterval(a),d.callbackAfter(t,n))},j=function(){Q+=16,m=Q/parseInt(d.speed,10),m=m>1?1:m,b=v+I*c(d.easing,m),e.scrollTo(0,Math.floor(b)),H(b,y,h)},E=function(){d.callbackBefore(t,n),h=setInterval(j,16)};0===e.pageYOffset&&e.scrollTo(0,0),E()},t.init=function(e){if(n){var c=r(o,e||{}),u=document.querySelectorAll("[data-scroll]");a(u,function(e){e.addEventListener("click",t.animateScroll.bind(null,e,e.getAttribute("href"),c),!1)})}},t}); \ No newline at end of file diff --git a/gulpfile.js b/gulpfile.js new file mode 100755 index 0000000..f8ef613 --- /dev/null +++ b/gulpfile.js @@ -0,0 +1,162 @@ +var gulp = require('gulp'); +var plumber = require('gulp-plumber'); +var clean = require('gulp-clean'); +var rename = require('gulp-rename'); +var flatten = require('gulp-flatten'); +var tap = require('gulp-tap'); +var header = require('gulp-header'); +var jshint = require('gulp-jshint'); +var stylish = require('jshint-stylish'); +var concat = require('gulp-concat'); +var uglify = require('gulp-uglify'); +var sass = require('gulp-sass'); +var prefix = require('gulp-autoprefixer'); +var minify = require('gulp-minify-css'); +var karma = require('gulp-karma'); +var package = require('./package.json'); + +var paths = { + output : 'dist/', + scripts : { + input : [ 'src/js/*' ], + output : 'dist/js/' + }, + styles : { + input : 'src/sass/**/*.scss', + output : 'dist/css/' + }, + sass : { + input : 'src/sass/*', + output : 'dist/sass/', + }, + static : 'src/static/**', + test : { + spec : [ 'test/spec/**/*.js' ], + coverage: 'test/coverage/', + results: 'test/results/' + } +}; + +var banner = { + full : + '/**\n' + + ' * <%= package.name %> v<%= package.version %>\n' + + ' * <%= package.description %>, by <%= package.author.name %>.\n' + + ' * <%= package.repository.url %>\n' + + ' * \n' + + ' * Free to use under the MIT License.\n' + + ' * http://gomakethings.com/mit/\n' + + ' */\n\n', + min : + '/**' + + ' <%= package.name %> v<%= package.version %>, by Chris Ferdinandi' + + ' | <%= package.repository.url %>' + + ' | Licensed under MIT: http://gomakethings.com/mit/' + + ' */\n' +}; + +gulp.task('scripts', ['clean'], function() { + return gulp.src(paths.scripts.input) + .pipe(plumber()) + .pipe(flatten()) + + .pipe(tap(function (file, t) { + if ( file.stat.isDirectory() ) { + var name = file.relative + '.js'; + return gulp.src(file.path + '/*.js') + .pipe(concat(name)) + .pipe(header(banner.full, { package : package })) + .pipe(gulp.dest(paths.scripts.output)) + .pipe(rename({ suffix: '.min' })) + .pipe(uglify()) + .pipe(header(banner.min, { package : package })) + .pipe(gulp.dest(paths.scripts.output)); + } + })) + + // Don't add headers to classList.js + .pipe(tap(function (file,t) { + if ( file.relative === 'classList.js' ) { + return gulp.src( file.path ) + .pipe(gulp.dest(paths.scripts.output)) + .pipe(rename({ suffix: '.min' })) + .pipe(uglify()) + .pipe(gulp.dest(paths.scripts.output)); + } + })) + + .pipe(header(banner.full, { package : package })) + .pipe(gulp.dest(paths.scripts.output)) + .pipe(rename({ suffix: '.min' })) + .pipe(uglify()) + .pipe(header(banner.min, { package : package })) + .pipe(gulp.dest(paths.scripts.output)); +}); + +gulp.task('styles', ['clean'], function() { + return gulp.src(paths.styles.input) + .pipe(plumber()) + .pipe(sass()) + .pipe(flatten()) + .pipe(prefix('last 2 version', '> 1%')) + .pipe(header(banner.full, { package : package })) + .pipe(gulp.dest(paths.styles.output)) + .pipe(rename({ suffix: '.min' })) + .pipe(minify()) + .pipe(header(banner.min, { package : package })) + .pipe(gulp.dest(paths.styles.output)); +}); + +gulp.task('sass', ['clean'], function() { + return gulp.src(paths.sass.input) + .pipe(plumber()) + .pipe(flatten()) + .pipe(tap(function (file, t) { + if ( file.stat.isDirectory() ) { + return gulp.src(file.path + '/*.scss') + .pipe(header(banner.full, { package : package })) + .pipe(gulp.dest(paths.sass.output + '/components')); + } + })) + .pipe(gulp.dest(paths.sass.output)); +}); + +gulp.task('static', ['clean'], function() { + return gulp.src(paths.static) + .pipe(plumber()) + .pipe(gulp.dest(paths.output)); +}); + +gulp.task('lint', function () { + return gulp.src(paths.scripts.input) + .pipe(plumber()) + .pipe(jshint()) + .pipe(jshint.reporter('jshint-stylish')); +}); + +gulp.task('clean', function () { + return gulp.src([ + paths.output, + paths.test.coverage, + paths.test.results + ], { read: false }) + .pipe(plumber()) + .pipe(clean()); +}); + +gulp.task('test', function() { + return gulp.src(paths.scripts.input.concat(paths.test.spec)) + .pipe(plumber()) + .pipe(karma({ configFile: 'test/karma.conf.js' })) + .on('error', function(err) { throw err; }); +}); + +gulp.task('default', [ + 'lint', + 'clean', + 'scripts', + 'styles', + 'sass', + 'static', + 'test' +]); \ No newline at end of file diff --git a/index.html b/index.html index 34f2873..dd71a25 100644 --- a/index.html +++ b/index.html @@ -69,7 +69,7 @@

Smooth Scroll< - + ``` +Drop requires `bind-polyfill.js`, a polyfill that extends ECMAScript 5 API support to more browsers. + ### 2. Add the markup to your HTML. ```html @@ -208,6 +211,9 @@ Smooth Scroll is licensed under the [MIT License](http://gomakethings.com/mit/). ## Changelog +* v5.0.1 - August 8, 2014 + * Added polyfill for `Functions.prototype.bind`. + * Removed Sass paths from `gulpfile.js`. * v5.0.0 - July 21, 2014 * Updated `data-options` functionality to JSON. * Fixed update URL bug. diff --git a/dist/js/bind-polyfill.js b/dist/js/bind-polyfill.js new file mode 100644 index 0000000..67aab8b --- /dev/null +++ b/dist/js/bind-polyfill.js @@ -0,0 +1,35 @@ +/** + * smooth-scroll v5.0.1 + * Animate scrolling to anchor links, by Chris Ferdinandi. + * http://github.com/cferdinandi/smooth-scroll + * + * Free to use under the MIT License. + * http://gomakethings.com/mit/ + */ + +/* + * Polyfill Function.prototype.bind support for otherwise ECMA Script 5 compliant browsers + * https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Function/bind#Compatibility + */ + +if (!Function.prototype.bind) { + Function.prototype.bind = function (oThis) { + if (typeof this !== "function") { + // closest thing possible to the ECMAScript 5 + // internal IsCallable function + throw new TypeError("Function.prototype.bind - what is trying to be bound is not callable"); + } + + var aArgs = Array.prototype.slice.call(arguments, 1); + var fToBind = this; + fNOP = function () {}; + fBound = function () { + return fToBind.apply(this instanceof fNOP && oThis ? this : oThis, aArgs.concat(Array.prototype.slice.call(arguments))); + }; + + fNOP.prototype = this.prototype; + fBound.prototype = new fNOP(); + + return fBound; + }; +} \ No newline at end of file diff --git a/dist/js/bind-polyfill.min.js b/dist/js/bind-polyfill.min.js new file mode 100644 index 0000000..6ff63df --- /dev/null +++ b/dist/js/bind-polyfill.min.js @@ -0,0 +1,2 @@ +/** smooth-scroll v5.0.1, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ +Function.prototype.bind||(Function.prototype.bind=function(t){if("function"!=typeof this)throw new TypeError("Function.prototype.bind - what is trying to be bound is not callable");var o=Array.prototype.slice.call(arguments,1),n=this;return fNOP=function(){},fBound=function(){return n.apply(this instanceof fNOP&&t?this:t,o.concat(Array.prototype.slice.call(arguments)))},fNOP.prototype=this.prototype,fBound.prototype=new fNOP,fBound}); \ No newline at end of file diff --git a/dist/js/smooth-scroll.js b/dist/js/smooth-scroll.js index a2f0d23..6d87770 100755 --- a/dist/js/smooth-scroll.js +++ b/dist/js/smooth-scroll.js @@ -1,5 +1,5 @@ /** - * smooth-scroll v5.0.0 + * smooth-scroll v5.0.1 * Animate scrolling to anchor links, by Chris Ferdinandi. * http://github.com/cferdinandi/smooth-scroll * diff --git a/dist/js/smooth-scroll.min.js b/dist/js/smooth-scroll.min.js index 6e49fe2..026a901 100755 --- a/dist/js/smooth-scroll.min.js +++ b/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ -/** smooth-scroll v5.0.0, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ +/** smooth-scroll v5.0.1, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ !function(e,t){"function"==typeof define&&define.amd?define("smoothScroll",t(e)):"object"==typeof exports?module.smoothScroll=t(e):e.smoothScroll=t(e)}(this,function(e){"use strict";var t,n={},o=!!document.querySelector&&!!e.addEventListener,a={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},c=function(e,t,n){if("[object Object]"===Object.prototype.toString.call(e))for(var o in e)Object.prototype.hasOwnProperty.call(e,o)&&t.call(n,e[o],o,e);else for(var a=0,c=e.length;c>a;a++)t.call(n,e[a],a,e)},r=function(e,t){var n={};return c(e,function(t,o){n[o]=e[o]}),c(t,function(e,o){n[o]=t[o]}),n},u=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},i=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=o-t-n,o>=0?o:0},l=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},f=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},s=function(e,t){history.pushState&&(t||"true"===t)&&history.pushState({pos:e.id},"",window.location.pathname+e)};return n.animateScroll=function(t,n,o,c){var d=r(d||a,o||{}),p=f(t?t.getAttribute("data-options"):null);d=r(d,p);var m,h,b,O=document.querySelector("[data-scroll-header]"),g=null===O?0:O.offsetHeight+O.offsetTop,v=e.pageYOffset,y=i(document.querySelector(n),g,parseInt(d.offset,10)),S=y-v,I=l(),Q=0;t&&"a"===t.tagName.toLowerCase()&&c&&c.preventDefault(),s(n,d.updateURL);var H=function(o,a,c){var r=e.pageYOffset;(o==a||r==a||e.innerHeight+r>=I)&&(clearInterval(c),d.callbackAfter(t,n))},j=function(){Q+=16,h=Q/parseInt(d.speed,10),h=h>1?1:h,b=v+S*u(d.easing,h),e.scrollTo(0,Math.floor(b)),H(b,y,m)},k=function(){d.callbackBefore(t,n),m=setInterval(j,16)};0===e.pageYOffset&&e.scrollTo(0,0),k()},n.init=function(e){if(o){t=r(a,e||{});var u=document.querySelectorAll("[data-scroll]");c(u,function(e){e.addEventListener("click",n.animateScroll.bind(null,e,e.hash,t),!1)})}},n}); \ No newline at end of file diff --git a/gulpfile.js b/gulpfile.js index 71aa9ac..1832f72 100755 --- a/gulpfile.js +++ b/gulpfile.js @@ -25,10 +25,6 @@ var paths = { input : 'src/sass/**/*.scss', output : 'dist/css/' }, - sass : { - input : 'src/sass/*', - output : 'dist/sass/', - }, static : 'src/static/**', test : { spec : [ 'test/spec/**/*.js' ], diff --git a/index.html b/index.html index 1f3e8eb..959dde6 100644 --- a/index.html +++ b/index.html @@ -69,6 +69,7 @@

Smooth Scroll< + ``` -Drop requires `bind-polyfill.js`, a polyfill that extends ECMAScript 5 API support to more browsers. +Smooth Scroll requires `bind-polyfill.js`, a polyfill that extends ECMAScript 5 API support to more browsers. ### 2. Add the markup to your HTML. From 11180ee0d0f47535e90e9fb1ee80aada2a0c86c3 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Tue, 12 Aug 2014 11:42:13 -0400 Subject: [PATCH 090/285] Added character escaping on anchor IDs Prevents script from breaking if first character in an anchor ID is a number. --- README.md | 2 ++ dist/js/bind-polyfill.js | 2 +- dist/js/bind-polyfill.min.js | 2 +- dist/js/smooth-scroll.js | 27 ++++++++++++++++++++++++++- dist/js/smooth-scroll.min.js | 4 ++-- index.html | 4 ++-- package.json | 2 +- src/js/smooth-scroll.js | 25 +++++++++++++++++++++++++ 8 files changed, 60 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index f4d9894..234b6f9 100755 --- a/README.md +++ b/README.md @@ -211,6 +211,8 @@ Smooth Scroll is licensed under the [MIT License](http://gomakethings.com/mit/). ## Changelog +* v5.0.2 - August 12, 2014 + * Added character escaping when first character in anchor ID is a number. * v5.0.1 - August 8, 2014 * Added polyfill for `Functions.prototype.bind`. * Removed Sass paths from `gulpfile.js`. diff --git a/dist/js/bind-polyfill.js b/dist/js/bind-polyfill.js index 67aab8b..b3c561e 100644 --- a/dist/js/bind-polyfill.js +++ b/dist/js/bind-polyfill.js @@ -1,5 +1,5 @@ /** - * smooth-scroll v5.0.1 + * smooth-scroll v5.0.2 * Animate scrolling to anchor links, by Chris Ferdinandi. * http://github.com/cferdinandi/smooth-scroll * diff --git a/dist/js/bind-polyfill.min.js b/dist/js/bind-polyfill.min.js index 6ff63df..e392f48 100644 --- a/dist/js/bind-polyfill.min.js +++ b/dist/js/bind-polyfill.min.js @@ -1,2 +1,2 @@ -/** smooth-scroll v5.0.1, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ +/** smooth-scroll v5.0.2, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ Function.prototype.bind||(Function.prototype.bind=function(t){if("function"!=typeof this)throw new TypeError("Function.prototype.bind - what is trying to be bound is not callable");var o=Array.prototype.slice.call(arguments,1),n=this;return fNOP=function(){},fBound=function(){return n.apply(this instanceof fNOP&&t?this:t,o.concat(Array.prototype.slice.call(arguments)))},fNOP.prototype=this.prototype,fBound.prototype=new fNOP,fBound}); \ No newline at end of file diff --git a/dist/js/smooth-scroll.js b/dist/js/smooth-scroll.js index 6d87770..077c3f8 100755 --- a/dist/js/smooth-scroll.js +++ b/dist/js/smooth-scroll.js @@ -1,5 +1,5 @@ /** - * smooth-scroll v5.0.1 + * smooth-scroll v5.0.2 * Animate scrolling to anchor links, by Chris Ferdinandi. * http://github.com/cferdinandi/smooth-scroll * @@ -81,6 +81,26 @@ return extended; }; + /** + * Check if anchor ID starts with a number + * @private + * @param {String} id The anchor ID to test + */ + var isNumber = function ( id ) { + return new RegExp('[0-9]').test( id.substr(1).charAt(0) ); + }; + + /** + * Escape numeric character for use with querySelector + * @private + * @param {String} id id The anchor ID to escape + */ + var escapeCharacter = function ( id ) { + var firstCharacter = id.substr(1).charAt(0); + var restOfString = id.substr(2); + return '#\\3' + firstCharacter + '\n' + restOfString; + }; + /** * Calculate the easing pattern * @private @@ -177,6 +197,11 @@ var overrides = getDataOptions( toggle ? toggle.getAttribute('data-options') : null ); settings = extend( settings, overrides ); + // If anchor ID starts with a number, escape characters + if ( isNumber(anchor) ) { + anchor = escapeCharacter(anchor); + } + // Selectors and variables var fixedHeader = document.querySelector('[data-scroll-header]'); // Get the fixed header var headerHeight = fixedHeader === null ? 0 : (fixedHeader.offsetHeight + fixedHeader.offsetTop); // Get the height of a fixed header if one exists diff --git a/dist/js/smooth-scroll.min.js b/dist/js/smooth-scroll.min.js index 026a901..550cbbd 100755 --- a/dist/js/smooth-scroll.min.js +++ b/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ -/** smooth-scroll v5.0.1, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ -!function(e,t){"function"==typeof define&&define.amd?define("smoothScroll",t(e)):"object"==typeof exports?module.smoothScroll=t(e):e.smoothScroll=t(e)}(this,function(e){"use strict";var t,n={},o=!!document.querySelector&&!!e.addEventListener,a={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},c=function(e,t,n){if("[object Object]"===Object.prototype.toString.call(e))for(var o in e)Object.prototype.hasOwnProperty.call(e,o)&&t.call(n,e[o],o,e);else for(var a=0,c=e.length;c>a;a++)t.call(n,e[a],a,e)},r=function(e,t){var n={};return c(e,function(t,o){n[o]=e[o]}),c(t,function(e,o){n[o]=t[o]}),n},u=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},i=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=o-t-n,o>=0?o:0},l=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},f=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},s=function(e,t){history.pushState&&(t||"true"===t)&&history.pushState({pos:e.id},"",window.location.pathname+e)};return n.animateScroll=function(t,n,o,c){var d=r(d||a,o||{}),p=f(t?t.getAttribute("data-options"):null);d=r(d,p);var m,h,b,O=document.querySelector("[data-scroll-header]"),g=null===O?0:O.offsetHeight+O.offsetTop,v=e.pageYOffset,y=i(document.querySelector(n),g,parseInt(d.offset,10)),S=y-v,I=l(),Q=0;t&&"a"===t.tagName.toLowerCase()&&c&&c.preventDefault(),s(n,d.updateURL);var H=function(o,a,c){var r=e.pageYOffset;(o==a||r==a||e.innerHeight+r>=I)&&(clearInterval(c),d.callbackAfter(t,n))},j=function(){Q+=16,h=Q/parseInt(d.speed,10),h=h>1?1:h,b=v+S*u(d.easing,h),e.scrollTo(0,Math.floor(b)),H(b,y,m)},k=function(){d.callbackBefore(t,n),m=setInterval(j,16)};0===e.pageYOffset&&e.scrollTo(0,0),k()},n.init=function(e){if(o){t=r(a,e||{});var u=document.querySelectorAll("[data-scroll]");c(u,function(e){e.addEventListener("click",n.animateScroll.bind(null,e,e.hash,t),!1)})}},n}); \ No newline at end of file +/** smooth-scroll v5.0.2, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ +!function(e,t){"function"==typeof define&&define.amd?define("smoothScroll",t(e)):"object"==typeof exports?module.smoothScroll=t(e):e.smoothScroll=t(e)}(this,function(e){"use strict";var t,n={},o=!!document.querySelector&&!!e.addEventListener,a={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},r=function(e,t,n){if("[object Object]"===Object.prototype.toString.call(e))for(var o in e)Object.prototype.hasOwnProperty.call(e,o)&&t.call(n,e[o],o,e);else for(var a=0,r=e.length;r>a;a++)t.call(n,e[a],a,e)},u=function(e,t){var n={};return r(e,function(t,o){n[o]=e[o]}),r(t,function(e,o){n[o]=t[o]}),n},c=function(e){return new RegExp("[0-9]").test(e.substr(1).charAt(0))},i=function(e){var t=e.substr(1).charAt(0),n=e.substr(2);return"#\\3"+t+"\n"+n},l=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},s=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=o-t-n,o>=0?o:0},f=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},d=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},p=function(e,t){history.pushState&&(t||"true"===t)&&history.pushState({pos:e.id},"",window.location.pathname+e)};return n.animateScroll=function(t,n,o,r){var h=u(h||a,o||{}),m=d(t?t.getAttribute("data-options"):null);h=u(h,m),c(n)&&(n=i(n));var b,O,g,v=document.querySelector("[data-scroll-header]"),y=null===v?0:v.offsetHeight+v.offsetTop,S=e.pageYOffset,I=s(document.querySelector(n),y,parseInt(h.offset,10)),Q=I-S,H=f(),j=0;t&&"a"===t.tagName.toLowerCase()&&r&&r.preventDefault(),p(n,h.updateURL);var w=function(o,a,r){var u=e.pageYOffset;(o==a||u==a||e.innerHeight+u>=H)&&(clearInterval(r),h.callbackAfter(t,n))},A=function(){j+=16,O=j/parseInt(h.speed,10),O=O>1?1:O,g=S+Q*l(h.easing,O),e.scrollTo(0,Math.floor(g)),w(g,I,b)},E=function(){h.callbackBefore(t,n),b=setInterval(A,16)};0===e.pageYOffset&&e.scrollTo(0,0),E()},n.init=function(e){if(o){t=u(a,e||{});var c=document.querySelectorAll("[data-scroll]");r(c,function(e){e.addEventListener("click",n.animateScroll.bind(null,e,e.hash,t),!1)})}},n}); \ No newline at end of file diff --git a/index.html b/index.html index 959dde6..49b216a 100644 --- a/index.html +++ b/index.html @@ -55,7 +55,7 @@

Smooth Scroll< .
.
.
.
.
.
.
.
.
.
.
.
.

-

Bazinga!

+

Bazinga!

.
.
.
.
.
.
.
.
.
.
.
.
.
@@ -63,7 +63,7 @@

Smooth Scroll< .
.
.
.
.
.
.
.
.
.
.
.
.

-

Back to the top

+

Back to the top

diff --git a/package.json b/package.json index 27a2917..e130124 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "smooth-scroll", - "version": "5.0.1", + "version": "5.0.2", "description": "Animate scrolling to anchor links", "author": { "name": "Chris Ferdinandi", diff --git a/src/js/smooth-scroll.js b/src/js/smooth-scroll.js index c8cf439..54cc256 100755 --- a/src/js/smooth-scroll.js +++ b/src/js/smooth-scroll.js @@ -72,6 +72,26 @@ return extended; }; + /** + * Check if anchor ID starts with a number + * @private + * @param {String} id The anchor ID to test + */ + var isNumber = function ( id ) { + return new RegExp('[0-9]').test( id.substr(1).charAt(0) ); + }; + + /** + * Escape numeric character for use with querySelector + * @private + * @param {String} id id The anchor ID to escape + */ + var escapeCharacter = function ( id ) { + var firstCharacter = id.substr(1).charAt(0); + var restOfString = id.substr(2); + return '#\\3' + firstCharacter + '\n' + restOfString; + }; + /** * Calculate the easing pattern * @private @@ -168,6 +188,11 @@ var overrides = getDataOptions( toggle ? toggle.getAttribute('data-options') : null ); settings = extend( settings, overrides ); + // If anchor ID starts with a number, escape characters + if ( isNumber(anchor) ) { + anchor = escapeCharacter(anchor); + } + // Selectors and variables var fixedHeader = document.querySelector('[data-scroll-header]'); // Get the fixed header var headerHeight = fixedHeader === null ? 0 : (fixedHeader.offsetHeight + fixedHeader.offsetTop); // Get the height of a fixed header if one exists From 076cecb65aa89bf7414e0c1bc1dbb3da33b58c45 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Wed, 13 Aug 2014 13:36:36 -0400 Subject: [PATCH 091/285] More robust character escaping Replaced character escaping method with [`CSS.escape`](https://github.com/mathiasbynens/CSS.escape) for more robust character escaping. --- README.md | 2 + dist/js/bind-polyfill.js | 2 +- dist/js/bind-polyfill.min.js | 2 +- dist/js/smooth-scroll.js | 88 ++++++++++++++++++++++++++++-------- dist/js/smooth-scroll.min.js | 4 +- index.html | 4 +- package.json | 2 +- src/js/smooth-scroll.js | 86 +++++++++++++++++++++++++++-------- 8 files changed, 144 insertions(+), 46 deletions(-) diff --git a/README.md b/README.md index 234b6f9..24f8e48 100755 --- a/README.md +++ b/README.md @@ -211,6 +211,8 @@ Smooth Scroll is licensed under the [MIT License](http://gomakethings.com/mit/). ## Changelog +* v5.0.3 - August 13, 2014 + * Replaced character escaping method with [`CSS.escape`](https://github.com/mathiasbynens/CSS.escape) for more robust character escaping. * v5.0.2 - August 12, 2014 * Added character escaping when first character in anchor ID is a number. * v5.0.1 - August 8, 2014 diff --git a/dist/js/bind-polyfill.js b/dist/js/bind-polyfill.js index b3c561e..a9b1285 100644 --- a/dist/js/bind-polyfill.js +++ b/dist/js/bind-polyfill.js @@ -1,5 +1,5 @@ /** - * smooth-scroll v5.0.2 + * smooth-scroll v5.0.3 * Animate scrolling to anchor links, by Chris Ferdinandi. * http://github.com/cferdinandi/smooth-scroll * diff --git a/dist/js/bind-polyfill.min.js b/dist/js/bind-polyfill.min.js index e392f48..a6d3d2a 100644 --- a/dist/js/bind-polyfill.min.js +++ b/dist/js/bind-polyfill.min.js @@ -1,2 +1,2 @@ -/** smooth-scroll v5.0.2, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ +/** smooth-scroll v5.0.3, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ Function.prototype.bind||(Function.prototype.bind=function(t){if("function"!=typeof this)throw new TypeError("Function.prototype.bind - what is trying to be bound is not callable");var o=Array.prototype.slice.call(arguments,1),n=this;return fNOP=function(){},fBound=function(){return n.apply(this instanceof fNOP&&t?this:t,o.concat(Array.prototype.slice.call(arguments)))},fNOP.prototype=this.prototype,fBound.prototype=new fNOP,fBound}); \ No newline at end of file diff --git a/dist/js/smooth-scroll.js b/dist/js/smooth-scroll.js index 077c3f8..9555b7c 100755 --- a/dist/js/smooth-scroll.js +++ b/dist/js/smooth-scroll.js @@ -1,5 +1,5 @@ /** - * smooth-scroll v5.0.2 + * smooth-scroll v5.0.3 * Animate scrolling to anchor links, by Chris Ferdinandi. * http://github.com/cferdinandi/smooth-scroll * @@ -82,23 +82,75 @@ }; /** - * Check if anchor ID starts with a number + * Escape special characters for use with querySelector * @private - * @param {String} id The anchor ID to test + * @param {String} id The anchor ID to escape + * @author Mathias Bynens + * @link https://github.com/mathiasbynens/CSS.escape */ - var isNumber = function ( id ) { - return new RegExp('[0-9]').test( id.substr(1).charAt(0) ); - }; + var escapeCharacters = function ( id ) { + var string = String(id); + var length = string.length; + var index = -1; + var codeUnit; + var result = ''; + var firstCodeUnit = string.charCodeAt(0); + while (++index < length) { + codeUnit = string.charCodeAt(index); + // Note: there’s no need to special-case astral symbols, surrogate + // pairs, or lone surrogates. + + // If the character is NULL (U+0000), then throw an + // `InvalidCharacterError` exception and terminate these steps. + if (codeUnit === 0x0000) { + throw new InvalidCharacterError( + 'Invalid character: the input contains U+0000.' + ); + } - /** - * Escape numeric character for use with querySelector - * @private - * @param {String} id id The anchor ID to escape - */ - var escapeCharacter = function ( id ) { - var firstCharacter = id.substr(1).charAt(0); - var restOfString = id.substr(2); - return '#\\3' + firstCharacter + '\n' + restOfString; + if ( + // If the character is in the range [\1-\1F] (U+0001 to U+001F) or is + // U+007F, […] + (codeUnit >= 0x0001 && codeUnit <= 0x001F) || codeUnit == 0x007F || + // If the character is the first character and is in the range [0-9] + // (U+0030 to U+0039), […] + (index === 0 && codeUnit >= 0x0030 && codeUnit <= 0x0039) || + // If the character is the second character and is in the range [0-9] + // (U+0030 to U+0039) and the first character is a `-` (U+002D), […] + ( + index === 1 && + codeUnit >= 0x0030 && codeUnit <= 0x0039 && + firstCodeUnit === 0x002D + ) + ) { + // http://dev.w3.org/csswg/cssom/#escape-a-character-as-code-point + result += '\\' + codeUnit.toString(16) + ' '; + continue; + } + + // If the character is not handled by one of the above rules and is + // greater than or equal to U+0080, is `-` (U+002D) or `_` (U+005F), or + // is in one of the ranges [0-9] (U+0030 to U+0039), [A-Z] (U+0041 to + // U+005A), or [a-z] (U+0061 to U+007A), […] + if ( + codeUnit >= 0x0080 || + codeUnit === 0x002D || + codeUnit === 0x005F || + codeUnit >= 0x0030 && codeUnit <= 0x0039 || + codeUnit >= 0x0041 && codeUnit <= 0x005A || + codeUnit >= 0x0061 && codeUnit <= 0x007A + ) { + // the character itself + result += string.charAt(index); + continue; + } + + // Otherwise, the escaped character. + // http://dev.w3.org/csswg/cssom/#escape-a-character + result += '\\' + string.charAt(index); + + } + return result; }; /** @@ -196,11 +248,7 @@ var settings = extend( settings || defaults, options || {} ); // Merge user options with defaults var overrides = getDataOptions( toggle ? toggle.getAttribute('data-options') : null ); settings = extend( settings, overrides ); - - // If anchor ID starts with a number, escape characters - if ( isNumber(anchor) ) { - anchor = escapeCharacter(anchor); - } + anchor = '#' + escapeCharacters(anchor.substr(1)); // Escape special characters and leading numbers // Selectors and variables var fixedHeader = document.querySelector('[data-scroll-header]'); // Get the fixed header diff --git a/dist/js/smooth-scroll.min.js b/dist/js/smooth-scroll.min.js index 550cbbd..3d3d5db 100755 --- a/dist/js/smooth-scroll.min.js +++ b/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ -/** smooth-scroll v5.0.2, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ -!function(e,t){"function"==typeof define&&define.amd?define("smoothScroll",t(e)):"object"==typeof exports?module.smoothScroll=t(e):e.smoothScroll=t(e)}(this,function(e){"use strict";var t,n={},o=!!document.querySelector&&!!e.addEventListener,a={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},r=function(e,t,n){if("[object Object]"===Object.prototype.toString.call(e))for(var o in e)Object.prototype.hasOwnProperty.call(e,o)&&t.call(n,e[o],o,e);else for(var a=0,r=e.length;r>a;a++)t.call(n,e[a],a,e)},u=function(e,t){var n={};return r(e,function(t,o){n[o]=e[o]}),r(t,function(e,o){n[o]=t[o]}),n},c=function(e){return new RegExp("[0-9]").test(e.substr(1).charAt(0))},i=function(e){var t=e.substr(1).charAt(0),n=e.substr(2);return"#\\3"+t+"\n"+n},l=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},s=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=o-t-n,o>=0?o:0},f=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},d=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},p=function(e,t){history.pushState&&(t||"true"===t)&&history.pushState({pos:e.id},"",window.location.pathname+e)};return n.animateScroll=function(t,n,o,r){var h=u(h||a,o||{}),m=d(t?t.getAttribute("data-options"):null);h=u(h,m),c(n)&&(n=i(n));var b,O,g,v=document.querySelector("[data-scroll-header]"),y=null===v?0:v.offsetHeight+v.offsetTop,S=e.pageYOffset,I=s(document.querySelector(n),y,parseInt(h.offset,10)),Q=I-S,H=f(),j=0;t&&"a"===t.tagName.toLowerCase()&&r&&r.preventDefault(),p(n,h.updateURL);var w=function(o,a,r){var u=e.pageYOffset;(o==a||u==a||e.innerHeight+u>=H)&&(clearInterval(r),h.callbackAfter(t,n))},A=function(){j+=16,O=j/parseInt(h.speed,10),O=O>1?1:O,g=S+Q*l(h.easing,O),e.scrollTo(0,Math.floor(g)),w(g,I,b)},E=function(){h.callbackBefore(t,n),b=setInterval(A,16)};0===e.pageYOffset&&e.scrollTo(0,0),E()},n.init=function(e){if(o){t=u(a,e||{});var c=document.querySelectorAll("[data-scroll]");r(c,function(e){e.addEventListener("click",n.animateScroll.bind(null,e,e.hash,t),!1)})}},n}); \ No newline at end of file +/** smooth-scroll v5.0.3, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ +!function(e,t){"function"==typeof define&&define.amd?define("smoothScroll",t(e)):"object"==typeof exports?module.smoothScroll=t(e):e.smoothScroll=t(e)}(this,function(e){"use strict";var t,n={},o=!!document.querySelector&&!!e.addEventListener,a={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},r=function(e,t,n){if("[object Object]"===Object.prototype.toString.call(e))for(var o in e)Object.prototype.hasOwnProperty.call(e,o)&&t.call(n,e[o],o,e);else for(var a=0,r=e.length;r>a;a++)t.call(n,e[a],a,e)},c=function(e,t){var n={};return r(e,function(t,o){n[o]=e[o]}),r(t,function(e,o){n[o]=t[o]}),n},u=function(e){for(var t,n=String(e),o=n.length,a=-1,r="",c=n.charCodeAt(0);++a=1&&31>=t||127==t||0===a&&t>=48&&57>=t||1===a&&t>=48&&57>=t&&45===c?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(a):"\\"+n.charAt(a)}return r},i=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},l=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=o-t-n,o>=0?o:0},f=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},s=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},d=function(e,t){history.pushState&&(t||"true"===t)&&history.pushState({pos:e.id},"",window.location.pathname+e)};return n.animateScroll=function(t,n,o,r){var h=c(h||a,o||{}),p=s(t?t.getAttribute("data-options"):null);h=c(h,p),n="#"+u(n.substr(1));var m,b,g,v=document.querySelector("[data-scroll-header]"),O=null===v?0:v.offsetHeight+v.offsetTop,S=e.pageYOffset,y=l(document.querySelector(n),O,parseInt(h.offset,10)),I=y-S,Q=f(),A=0;t&&"a"===t.tagName.toLowerCase()&&r&&r.preventDefault(),d(n,h.updateURL);var C=function(o,a,r){var c=e.pageYOffset;(o==a||c==a||e.innerHeight+c>=Q)&&(clearInterval(r),h.callbackAfter(t,n))},H=function(){A+=16,b=A/parseInt(h.speed,10),b=b>1?1:b,g=S+I*i(h.easing,b),e.scrollTo(0,Math.floor(g)),C(g,y,m)},w=function(){h.callbackBefore(t,n),m=setInterval(H,16)};0===e.pageYOffset&&e.scrollTo(0,0),w()},n.init=function(e){if(o){t=c(a,e||{});var u=document.querySelectorAll("[data-scroll]");r(u,function(e){e.addEventListener("click",n.animateScroll.bind(null,e,e.hash,t),!1)})}},n}); \ No newline at end of file diff --git a/index.html b/index.html index 49b216a..459ca3e 100644 --- a/index.html +++ b/index.html @@ -55,7 +55,7 @@

Smooth Scroll< .
.
.
.
.
.
.
.
.
.
.
.
.

-

Bazinga!

+

Bazinga!

.
.
.
.
.
.
.
.
.
.
.
.
.
@@ -63,7 +63,7 @@

Smooth Scroll< .
.
.
.
.
.
.
.
.
.
.
.
.

-

Back to the top

+

Back to the top

diff --git a/package.json b/package.json index e130124..e45328c 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "smooth-scroll", - "version": "5.0.2", + "version": "5.0.3", "description": "Animate scrolling to anchor links", "author": { "name": "Chris Ferdinandi", diff --git a/src/js/smooth-scroll.js b/src/js/smooth-scroll.js index 54cc256..9d1d74c 100755 --- a/src/js/smooth-scroll.js +++ b/src/js/smooth-scroll.js @@ -73,23 +73,75 @@ }; /** - * Check if anchor ID starts with a number + * Escape special characters for use with querySelector * @private - * @param {String} id The anchor ID to test + * @param {String} id The anchor ID to escape + * @author Mathias Bynens + * @link https://github.com/mathiasbynens/CSS.escape */ - var isNumber = function ( id ) { - return new RegExp('[0-9]').test( id.substr(1).charAt(0) ); - }; + var escapeCharacters = function ( id ) { + var string = String(id); + var length = string.length; + var index = -1; + var codeUnit; + var result = ''; + var firstCodeUnit = string.charCodeAt(0); + while (++index < length) { + codeUnit = string.charCodeAt(index); + // Note: there’s no need to special-case astral symbols, surrogate + // pairs, or lone surrogates. + + // If the character is NULL (U+0000), then throw an + // `InvalidCharacterError` exception and terminate these steps. + if (codeUnit === 0x0000) { + throw new InvalidCharacterError( + 'Invalid character: the input contains U+0000.' + ); + } - /** - * Escape numeric character for use with querySelector - * @private - * @param {String} id id The anchor ID to escape - */ - var escapeCharacter = function ( id ) { - var firstCharacter = id.substr(1).charAt(0); - var restOfString = id.substr(2); - return '#\\3' + firstCharacter + '\n' + restOfString; + if ( + // If the character is in the range [\1-\1F] (U+0001 to U+001F) or is + // U+007F, […] + (codeUnit >= 0x0001 && codeUnit <= 0x001F) || codeUnit == 0x007F || + // If the character is the first character and is in the range [0-9] + // (U+0030 to U+0039), […] + (index === 0 && codeUnit >= 0x0030 && codeUnit <= 0x0039) || + // If the character is the second character and is in the range [0-9] + // (U+0030 to U+0039) and the first character is a `-` (U+002D), […] + ( + index === 1 && + codeUnit >= 0x0030 && codeUnit <= 0x0039 && + firstCodeUnit === 0x002D + ) + ) { + // http://dev.w3.org/csswg/cssom/#escape-a-character-as-code-point + result += '\\' + codeUnit.toString(16) + ' '; + continue; + } + + // If the character is not handled by one of the above rules and is + // greater than or equal to U+0080, is `-` (U+002D) or `_` (U+005F), or + // is in one of the ranges [0-9] (U+0030 to U+0039), [A-Z] (U+0041 to + // U+005A), or [a-z] (U+0061 to U+007A), […] + if ( + codeUnit >= 0x0080 || + codeUnit === 0x002D || + codeUnit === 0x005F || + codeUnit >= 0x0030 && codeUnit <= 0x0039 || + codeUnit >= 0x0041 && codeUnit <= 0x005A || + codeUnit >= 0x0061 && codeUnit <= 0x007A + ) { + // the character itself + result += string.charAt(index); + continue; + } + + // Otherwise, the escaped character. + // http://dev.w3.org/csswg/cssom/#escape-a-character + result += '\\' + string.charAt(index); + + } + return result; }; /** @@ -187,11 +239,7 @@ var settings = extend( settings || defaults, options || {} ); // Merge user options with defaults var overrides = getDataOptions( toggle ? toggle.getAttribute('data-options') : null ); settings = extend( settings, overrides ); - - // If anchor ID starts with a number, escape characters - if ( isNumber(anchor) ) { - anchor = escapeCharacter(anchor); - } + anchor = '#' + escapeCharacters(anchor.substr(1)); // Escape special characters and leading numbers // Selectors and variables var fixedHeader = document.querySelector('[data-scroll-header]'); // Get the fixed header From d0fe4a10c680de6e28ade84701f42994a4628b79 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Fri, 15 Aug 2014 12:46:39 -0400 Subject: [PATCH 092/285] Added fix for UMD structure https://github.com/cferdinandi/kraken/issues/92 --- README.md | 2 ++ dist/js/bind-polyfill.js | 2 +- dist/js/bind-polyfill.min.js | 2 +- dist/js/smooth-scroll.js | 14 +++++++------- dist/js/smooth-scroll.min.js | 4 ++-- package.json | 2 +- src/js/smooth-scroll.js | 12 ++++++------ 7 files changed, 20 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 24f8e48..a6b552b 100755 --- a/README.md +++ b/README.md @@ -211,6 +211,8 @@ Smooth Scroll is licensed under the [MIT License](http://gomakethings.com/mit/). ## Changelog +* v5.0.4 - August 15, 2014 + * Added fix for UMD structure. * v5.0.3 - August 13, 2014 * Replaced character escaping method with [`CSS.escape`](https://github.com/mathiasbynens/CSS.escape) for more robust character escaping. * v5.0.2 - August 12, 2014 diff --git a/dist/js/bind-polyfill.js b/dist/js/bind-polyfill.js index a9b1285..7b66aec 100644 --- a/dist/js/bind-polyfill.js +++ b/dist/js/bind-polyfill.js @@ -1,5 +1,5 @@ /** - * smooth-scroll v5.0.3 + * smooth-scroll v5.0.4 * Animate scrolling to anchor links, by Chris Ferdinandi. * http://github.com/cferdinandi/smooth-scroll * diff --git a/dist/js/bind-polyfill.min.js b/dist/js/bind-polyfill.min.js index a6d3d2a..722fbe2 100644 --- a/dist/js/bind-polyfill.min.js +++ b/dist/js/bind-polyfill.min.js @@ -1,2 +1,2 @@ -/** smooth-scroll v5.0.3, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ +/** smooth-scroll v5.0.4, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ Function.prototype.bind||(Function.prototype.bind=function(t){if("function"!=typeof this)throw new TypeError("Function.prototype.bind - what is trying to be bound is not callable");var o=Array.prototype.slice.call(arguments,1),n=this;return fNOP=function(){},fBound=function(){return n.apply(this instanceof fNOP&&t?this:t,o.concat(Array.prototype.slice.call(arguments)))},fNOP.prototype=this.prototype,fBound.prototype=new fNOP,fBound}); \ No newline at end of file diff --git a/dist/js/smooth-scroll.js b/dist/js/smooth-scroll.js index 9555b7c..8ddfe1b 100755 --- a/dist/js/smooth-scroll.js +++ b/dist/js/smooth-scroll.js @@ -1,5 +1,5 @@ /** - * smooth-scroll v5.0.3 + * smooth-scroll v5.0.4 * Animate scrolling to anchor links, by Chris Ferdinandi. * http://github.com/cferdinandi/smooth-scroll * @@ -11,7 +11,7 @@ if ( typeof define === 'function' && define.amd ) { define('smoothScroll', factory(root)); } else if ( typeof exports === 'object' ) { - module.smoothScroll = factory(root); + module.exports = factory(root); } else { root.smoothScroll = factory(root); } @@ -23,7 +23,7 @@ // Variables // - var exports = {}; // Object for public APIs + var smoothScroll = {}; // Object for public APIs var supports = !!document.querySelector && !!root.addEventListener; // Feature test var settings; @@ -242,7 +242,7 @@ * @param {Object} settings * @param {Event} event */ - exports.animateScroll = function ( toggle, anchor, options, event ) { + smoothScroll.animateScroll = function ( toggle, anchor, options, event ) { // Options and overrides var settings = extend( settings || defaults, options || {} ); // Merge user options with defaults @@ -324,7 +324,7 @@ * @public * @param {Object} options User settings */ - exports.init = function ( options ) { + smoothScroll.init = function ( options ) { // feature test if ( !supports ) return; @@ -335,7 +335,7 @@ // When a toggle is clicked, run the click handler forEach(toggles, function (toggle) { - toggle.addEventListener('click', exports.animateScroll.bind( null, toggle, toggle.hash, settings ), false); + toggle.addEventListener('click', smoothScroll.animateScroll.bind( null, toggle, toggle.hash, settings ), false); }); }; @@ -345,6 +345,6 @@ // Public APIs // - return exports; + return smoothScroll; }); diff --git a/dist/js/smooth-scroll.min.js b/dist/js/smooth-scroll.min.js index 3d3d5db..22dc173 100755 --- a/dist/js/smooth-scroll.min.js +++ b/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ -/** smooth-scroll v5.0.3, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ -!function(e,t){"function"==typeof define&&define.amd?define("smoothScroll",t(e)):"object"==typeof exports?module.smoothScroll=t(e):e.smoothScroll=t(e)}(this,function(e){"use strict";var t,n={},o=!!document.querySelector&&!!e.addEventListener,a={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},r=function(e,t,n){if("[object Object]"===Object.prototype.toString.call(e))for(var o in e)Object.prototype.hasOwnProperty.call(e,o)&&t.call(n,e[o],o,e);else for(var a=0,r=e.length;r>a;a++)t.call(n,e[a],a,e)},c=function(e,t){var n={};return r(e,function(t,o){n[o]=e[o]}),r(t,function(e,o){n[o]=t[o]}),n},u=function(e){for(var t,n=String(e),o=n.length,a=-1,r="",c=n.charCodeAt(0);++a=1&&31>=t||127==t||0===a&&t>=48&&57>=t||1===a&&t>=48&&57>=t&&45===c?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(a):"\\"+n.charAt(a)}return r},i=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},l=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=o-t-n,o>=0?o:0},f=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},s=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},d=function(e,t){history.pushState&&(t||"true"===t)&&history.pushState({pos:e.id},"",window.location.pathname+e)};return n.animateScroll=function(t,n,o,r){var h=c(h||a,o||{}),p=s(t?t.getAttribute("data-options"):null);h=c(h,p),n="#"+u(n.substr(1));var m,b,g,v=document.querySelector("[data-scroll-header]"),O=null===v?0:v.offsetHeight+v.offsetTop,S=e.pageYOffset,y=l(document.querySelector(n),O,parseInt(h.offset,10)),I=y-S,Q=f(),A=0;t&&"a"===t.tagName.toLowerCase()&&r&&r.preventDefault(),d(n,h.updateURL);var C=function(o,a,r){var c=e.pageYOffset;(o==a||c==a||e.innerHeight+c>=Q)&&(clearInterval(r),h.callbackAfter(t,n))},H=function(){A+=16,b=A/parseInt(h.speed,10),b=b>1?1:b,g=S+I*i(h.easing,b),e.scrollTo(0,Math.floor(g)),C(g,y,m)},w=function(){h.callbackBefore(t,n),m=setInterval(H,16)};0===e.pageYOffset&&e.scrollTo(0,0),w()},n.init=function(e){if(o){t=c(a,e||{});var u=document.querySelectorAll("[data-scroll]");r(u,function(e){e.addEventListener("click",n.animateScroll.bind(null,e,e.hash,t),!1)})}},n}); \ No newline at end of file +/** smooth-scroll v5.0.4, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ +!function(e,t){"function"==typeof define&&define.amd?define("smoothScroll",t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)}(this,function(e){"use strict";var t,n={},o=!!document.querySelector&&!!e.addEventListener,a={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},r=function(e,t,n){if("[object Object]"===Object.prototype.toString.call(e))for(var o in e)Object.prototype.hasOwnProperty.call(e,o)&&t.call(n,e[o],o,e);else for(var a=0,r=e.length;r>a;a++)t.call(n,e[a],a,e)},c=function(e,t){var n={};return r(e,function(t,o){n[o]=e[o]}),r(t,function(e,o){n[o]=t[o]}),n},u=function(e){for(var t,n=String(e),o=n.length,a=-1,r="",c=n.charCodeAt(0);++a=1&&31>=t||127==t||0===a&&t>=48&&57>=t||1===a&&t>=48&&57>=t&&45===c?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(a):"\\"+n.charAt(a)}return r},i=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},l=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=o-t-n,o>=0?o:0},f=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},s=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},d=function(e,t){history.pushState&&(t||"true"===t)&&history.pushState({pos:e.id},"",window.location.pathname+e)};return n.animateScroll=function(t,n,o,r){var h=c(h||a,o||{}),p=s(t?t.getAttribute("data-options"):null);h=c(h,p),n="#"+u(n.substr(1));var m,b,g,v=document.querySelector("[data-scroll-header]"),O=null===v?0:v.offsetHeight+v.offsetTop,y=e.pageYOffset,S=l(document.querySelector(n),O,parseInt(h.offset,10)),I=S-y,Q=f(),A=0;t&&"a"===t.tagName.toLowerCase()&&r&&r.preventDefault(),d(n,h.updateURL);var C=function(o,a,r){var c=e.pageYOffset;(o==a||c==a||e.innerHeight+c>=Q)&&(clearInterval(r),h.callbackAfter(t,n))},H=function(){A+=16,b=A/parseInt(h.speed,10),b=b>1?1:b,g=y+I*i(h.easing,b),e.scrollTo(0,Math.floor(g)),C(g,S,m)},w=function(){h.callbackBefore(t,n),m=setInterval(H,16)};0===e.pageYOffset&&e.scrollTo(0,0),w()},n.init=function(e){if(o){t=c(a,e||{});var u=document.querySelectorAll("[data-scroll]");r(u,function(e){e.addEventListener("click",n.animateScroll.bind(null,e,e.hash,t),!1)})}},n}); \ No newline at end of file diff --git a/package.json b/package.json index e45328c..f539388 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "smooth-scroll", - "version": "5.0.3", + "version": "5.0.4", "description": "Animate scrolling to anchor links", "author": { "name": "Chris Ferdinandi", diff --git a/src/js/smooth-scroll.js b/src/js/smooth-scroll.js index 9d1d74c..ad994d7 100755 --- a/src/js/smooth-scroll.js +++ b/src/js/smooth-scroll.js @@ -2,7 +2,7 @@ if ( typeof define === 'function' && define.amd ) { define('smoothScroll', factory(root)); } else if ( typeof exports === 'object' ) { - module.smoothScroll = factory(root); + module.exports = factory(root); } else { root.smoothScroll = factory(root); } @@ -14,7 +14,7 @@ // Variables // - var exports = {}; // Object for public APIs + var smoothScroll = {}; // Object for public APIs var supports = !!document.querySelector && !!root.addEventListener; // Feature test var settings; @@ -233,7 +233,7 @@ * @param {Object} settings * @param {Event} event */ - exports.animateScroll = function ( toggle, anchor, options, event ) { + smoothScroll.animateScroll = function ( toggle, anchor, options, event ) { // Options and overrides var settings = extend( settings || defaults, options || {} ); // Merge user options with defaults @@ -315,7 +315,7 @@ * @public * @param {Object} options User settings */ - exports.init = function ( options ) { + smoothScroll.init = function ( options ) { // feature test if ( !supports ) return; @@ -326,7 +326,7 @@ // When a toggle is clicked, run the click handler forEach(toggles, function (toggle) { - toggle.addEventListener('click', exports.animateScroll.bind( null, toggle, toggle.hash, settings ), false); + toggle.addEventListener('click', smoothScroll.animateScroll.bind( null, toggle, toggle.hash, settings ), false); }); }; @@ -336,6 +336,6 @@ // Public APIs // - return exports; + return smoothScroll; }); From 618360261d51476813f487a090629dc08af5166f Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Fri, 15 Aug 2014 18:25:43 -0400 Subject: [PATCH 093/285] Updated readme --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index a6b552b..cbfa90c 100755 --- a/README.md +++ b/README.md @@ -211,6 +211,8 @@ Smooth Scroll is licensed under the [MIT License](http://gomakethings.com/mit/). ## Changelog +Smooth Scroll uses [semantic versioning](http://semver.org/). + * v5.0.4 - August 15, 2014 * Added fix for UMD structure. * v5.0.3 - August 13, 2014 From ab993f733ebda1d26aec7f15a4313e635a5c6cef Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Mon, 18 Aug 2014 16:41:57 -0400 Subject: [PATCH 094/285] Bug fixes and enhancements * Added `destroy` method. * Converted to event bubbling approach for better performance. * Switched to Ruby Sass. * Fixed test task bug. --- README.md | 5 +++++ dist/js/bind-polyfill.js | 2 +- dist/js/bind-polyfill.min.js | 2 +- dist/js/smooth-scroll.js | 37 ++++++++++++++++++++++++++---------- dist/js/smooth-scroll.min.js | 4 ++-- gulpfile.js | 4 ++-- package.json | 4 ++-- src/js/smooth-scroll.js | 35 +++++++++++++++++++++++++--------- 8 files changed, 66 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index cbfa90c..4c641c4 100755 --- a/README.md +++ b/README.md @@ -213,6 +213,11 @@ Smooth Scroll is licensed under the [MIT License](http://gomakethings.com/mit/). Smooth Scroll uses [semantic versioning](http://semver.org/). +* v5.1.0 - August 18, 2014 + * Added `destroy` method. + * Converted to event bubbling approach for better performance. + * Switched to Ruby Sass. + * Fixed test task bug. * v5.0.4 - August 15, 2014 * Added fix for UMD structure. * v5.0.3 - August 13, 2014 diff --git a/dist/js/bind-polyfill.js b/dist/js/bind-polyfill.js index 7b66aec..1ef54e0 100644 --- a/dist/js/bind-polyfill.js +++ b/dist/js/bind-polyfill.js @@ -1,5 +1,5 @@ /** - * smooth-scroll v5.0.4 + * smooth-scroll v5.1.0 * Animate scrolling to anchor links, by Chris Ferdinandi. * http://github.com/cferdinandi/smooth-scroll * diff --git a/dist/js/bind-polyfill.min.js b/dist/js/bind-polyfill.min.js index 722fbe2..5fc594b 100644 --- a/dist/js/bind-polyfill.min.js +++ b/dist/js/bind-polyfill.min.js @@ -1,2 +1,2 @@ -/** smooth-scroll v5.0.4, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ +/** smooth-scroll v5.1.0, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ Function.prototype.bind||(Function.prototype.bind=function(t){if("function"!=typeof this)throw new TypeError("Function.prototype.bind - what is trying to be bound is not callable");var o=Array.prototype.slice.call(arguments,1),n=this;return fNOP=function(){},fBound=function(){return n.apply(this instanceof fNOP&&t?this:t,o.concat(Array.prototype.slice.call(arguments)))},fNOP.prototype=this.prototype,fBound.prototype=new fNOP,fBound}); \ No newline at end of file diff --git a/dist/js/smooth-scroll.js b/dist/js/smooth-scroll.js index 8ddfe1b..5ee6858 100755 --- a/dist/js/smooth-scroll.js +++ b/dist/js/smooth-scroll.js @@ -1,5 +1,5 @@ /** - * smooth-scroll v5.0.4 + * smooth-scroll v5.1.0 * Animate scrolling to anchor links, by Chris Ferdinandi. * http://github.com/cferdinandi/smooth-scroll * @@ -261,11 +261,6 @@ var timeLapsed = 0; var percentage, position; - // Prevent default click event - if ( toggle && toggle.tagName.toLowerCase() === 'a' && event ) { - event.preventDefault(); - } - // Update URL updateUrl(anchor, settings.updateURL); @@ -319,6 +314,28 @@ }; + /** + * If smooth scroll element clicked, animate scroll + * @private + */ + var eventHandler = function () { + var toggle = event.target; + if ( toggle.hasAttribute('data-scroll') && toggle.tagName.toLowerCase() === 'a' ) { + event.preventDefault(); // Prevent default click event + smoothScroll.animateScroll( toggle, toggle.hash, settings, event ); // Animate scroll + } + }; + + /** + * Destroy the current initialization. + * @public + */ + smoothScroll.destroy = function () { + if ( !settings ) return; + document.removeEventListener( 'click', eventHandler, false ); + settings = null; + }; + /** * Initialize Smooth Scroll * @public @@ -329,14 +346,14 @@ // feature test if ( !supports ) return; + // Destroy any existing initializations + smoothScroll.destroy(); + // Selectors and variables settings = extend( defaults, options || {} ); // Merge user options with defaults - var toggles = document.querySelectorAll('[data-scroll]'); // Get smooth scroll toggles // When a toggle is clicked, run the click handler - forEach(toggles, function (toggle) { - toggle.addEventListener('click', smoothScroll.animateScroll.bind( null, toggle, toggle.hash, settings ), false); - }); + document.addEventListener('click', eventHandler, false); }; diff --git a/dist/js/smooth-scroll.min.js b/dist/js/smooth-scroll.min.js index 22dc173..4207b5e 100755 --- a/dist/js/smooth-scroll.min.js +++ b/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ -/** smooth-scroll v5.0.4, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ -!function(e,t){"function"==typeof define&&define.amd?define("smoothScroll",t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)}(this,function(e){"use strict";var t,n={},o=!!document.querySelector&&!!e.addEventListener,a={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},r=function(e,t,n){if("[object Object]"===Object.prototype.toString.call(e))for(var o in e)Object.prototype.hasOwnProperty.call(e,o)&&t.call(n,e[o],o,e);else for(var a=0,r=e.length;r>a;a++)t.call(n,e[a],a,e)},c=function(e,t){var n={};return r(e,function(t,o){n[o]=e[o]}),r(t,function(e,o){n[o]=t[o]}),n},u=function(e){for(var t,n=String(e),o=n.length,a=-1,r="",c=n.charCodeAt(0);++a=1&&31>=t||127==t||0===a&&t>=48&&57>=t||1===a&&t>=48&&57>=t&&45===c?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(a):"\\"+n.charAt(a)}return r},i=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},l=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=o-t-n,o>=0?o:0},f=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},s=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},d=function(e,t){history.pushState&&(t||"true"===t)&&history.pushState({pos:e.id},"",window.location.pathname+e)};return n.animateScroll=function(t,n,o,r){var h=c(h||a,o||{}),p=s(t?t.getAttribute("data-options"):null);h=c(h,p),n="#"+u(n.substr(1));var m,b,g,v=document.querySelector("[data-scroll-header]"),O=null===v?0:v.offsetHeight+v.offsetTop,y=e.pageYOffset,S=l(document.querySelector(n),O,parseInt(h.offset,10)),I=S-y,Q=f(),A=0;t&&"a"===t.tagName.toLowerCase()&&r&&r.preventDefault(),d(n,h.updateURL);var C=function(o,a,r){var c=e.pageYOffset;(o==a||c==a||e.innerHeight+c>=Q)&&(clearInterval(r),h.callbackAfter(t,n))},H=function(){A+=16,b=A/parseInt(h.speed,10),b=b>1?1:b,g=y+I*i(h.easing,b),e.scrollTo(0,Math.floor(g)),C(g,S,m)},w=function(){h.callbackBefore(t,n),m=setInterval(H,16)};0===e.pageYOffset&&e.scrollTo(0,0),w()},n.init=function(e){if(o){t=c(a,e||{});var u=document.querySelectorAll("[data-scroll]");r(u,function(e){e.addEventListener("click",n.animateScroll.bind(null,e,e.hash,t),!1)})}},n}); \ No newline at end of file +/** smooth-scroll v5.1.0, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ +!function(e,t){"function"==typeof define&&define.amd?define("smoothScroll",t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)}(this,function(e){"use strict";var t,n={},o=!!document.querySelector&&!!e.addEventListener,a={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},r=function(e,t,n){if("[object Object]"===Object.prototype.toString.call(e))for(var o in e)Object.prototype.hasOwnProperty.call(e,o)&&t.call(n,e[o],o,e);else for(var a=0,r=e.length;r>a;a++)t.call(n,e[a],a,e)},c=function(e,t){var n={};return r(e,function(t,o){n[o]=e[o]}),r(t,function(e,o){n[o]=t[o]}),n},u=function(e){for(var t,n=String(e),o=n.length,a=-1,r="",c=n.charCodeAt(0);++a=1&&31>=t||127==t||0===a&&t>=48&&57>=t||1===a&&t>=48&&57>=t&&45===c?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(a):"\\"+n.charAt(a)}return r},i=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},f=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=o-t-n,o>=0?o:0},s=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},l=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},d=function(e,t){history.pushState&&(t||"true"===t)&&history.pushState({pos:e.id},"",window.location.pathname+e)};n.animateScroll=function(t,n,o){var r=c(r||a,o||{}),h=l(t?t.getAttribute("data-options"):null);r=c(r,h),n="#"+u(n.substr(1));var p,m,v,g=document.querySelector("[data-scroll-header]"),b=null===g?0:g.offsetHeight+g.offsetTop,O=e.pageYOffset,y=f(document.querySelector(n),b,parseInt(r.offset,10)),I=y-O,S=s(),Q=0;d(n,r.updateURL);var A=function(o,a,c){var u=e.pageYOffset;(o==a||u==a||e.innerHeight+u>=S)&&(clearInterval(c),r.callbackAfter(t,n))},C=function(){Q+=16,m=Q/parseInt(r.speed,10),m=m>1?1:m,v=O+I*i(r.easing,m),e.scrollTo(0,Math.floor(v)),A(v,y,p)},H=function(){r.callbackBefore(t,n),p=setInterval(C,16)};0===e.pageYOffset&&e.scrollTo(0,0),H()};var h=function(){var e=event.target;e.hasAttribute("data-scroll")&&"a"===e.tagName.toLowerCase()&&(event.preventDefault(),n.animateScroll(e,e.hash,t,event))};return n.destroy=function(){t&&(document.removeEventListener("click",h,!1),t=null)},n.init=function(e){o&&(n.destroy(),t=c(a,e||{}),document.addEventListener("click",h,!1))},n}); \ No newline at end of file diff --git a/gulpfile.js b/gulpfile.js index 1832f72..95c0b23 100755 --- a/gulpfile.js +++ b/gulpfile.js @@ -92,7 +92,7 @@ gulp.task('scripts', ['clean'], function() { gulp.task('styles', ['clean'], function() { return gulp.src(paths.styles.input) .pipe(plumber()) - .pipe(sass()) + .pipe(sass({style: 'expanded', noCache: true})) .pipe(flatten()) .pipe(prefix('last 2 version', '> 1%')) .pipe(header(banner.full, { package : package })) @@ -127,7 +127,7 @@ gulp.task('clean', function () { }); gulp.task('test', function() { - return gulp.src(paths.scripts.input.concat(paths.test.spec)) + return gulp.src([paths.scripts.input + '**/*.js'].concat(paths.test.spec)) .pipe(plumber()) .pipe(karma({ configFile: 'test/karma.conf.js' })) .on('error', function(err) { throw err; }); diff --git a/package.json b/package.json index f539388..34866a9 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "smooth-scroll", - "version": "5.0.4", + "version": "5.1.0", "description": "Animate scrolling to anchor links", "author": { "name": "Chris Ferdinandi", @@ -24,7 +24,7 @@ "gulp-minify-css": "~0.3.4", "gulp-plumber": "~0.6.2", "gulp-rename": "~1.1.0", - "gulp-sass": "~0.7.2", + "gulp-ruby-sass": "~0.7.1", "gulp-uglify": "~0.3.0", "jshint-stylish": "^0.2.0", "karma": "^0.12.16", diff --git a/src/js/smooth-scroll.js b/src/js/smooth-scroll.js index ad994d7..3cd0520 100755 --- a/src/js/smooth-scroll.js +++ b/src/js/smooth-scroll.js @@ -252,11 +252,6 @@ var timeLapsed = 0; var percentage, position; - // Prevent default click event - if ( toggle && toggle.tagName.toLowerCase() === 'a' && event ) { - event.preventDefault(); - } - // Update URL updateUrl(anchor, settings.updateURL); @@ -310,6 +305,28 @@ }; + /** + * If smooth scroll element clicked, animate scroll + * @private + */ + var eventHandler = function () { + var toggle = event.target; + if ( toggle.hasAttribute('data-scroll') && toggle.tagName.toLowerCase() === 'a' ) { + event.preventDefault(); // Prevent default click event + smoothScroll.animateScroll( toggle, toggle.hash, settings, event ); // Animate scroll + } + }; + + /** + * Destroy the current initialization. + * @public + */ + smoothScroll.destroy = function () { + if ( !settings ) return; + document.removeEventListener( 'click', eventHandler, false ); + settings = null; + }; + /** * Initialize Smooth Scroll * @public @@ -320,14 +337,14 @@ // feature test if ( !supports ) return; + // Destroy any existing initializations + smoothScroll.destroy(); + // Selectors and variables settings = extend( defaults, options || {} ); // Merge user options with defaults - var toggles = document.querySelectorAll('[data-scroll]'); // Get smooth scroll toggles // When a toggle is clicked, run the click handler - forEach(toggles, function (toggle) { - toggle.addEventListener('click', smoothScroll.animateScroll.bind( null, toggle, toggle.hash, settings ), false); - }); + document.addEventListener('click', eventHandler, false); }; From bf53cc2b5fc43048fd0a7fac07ae24b9cded8817 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Mon, 18 Aug 2014 17:04:54 -0400 Subject: [PATCH 095/285] Fixed test bug --- README.md | 1 - gulpfile.js | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 4c641c4..52595d5 100755 --- a/README.md +++ b/README.md @@ -217,7 +217,6 @@ Smooth Scroll uses [semantic versioning](http://semver.org/). * Added `destroy` method. * Converted to event bubbling approach for better performance. * Switched to Ruby Sass. - * Fixed test task bug. * v5.0.4 - August 15, 2014 * Added fix for UMD structure. * v5.0.3 - August 13, 2014 diff --git a/gulpfile.js b/gulpfile.js index 95c0b23..8b71ede 100755 --- a/gulpfile.js +++ b/gulpfile.js @@ -9,7 +9,7 @@ var jshint = require('gulp-jshint'); var stylish = require('jshint-stylish'); var concat = require('gulp-concat'); var uglify = require('gulp-uglify'); -var sass = require('gulp-sass'); +var sass = require('gulp-ruby-sass'); var prefix = require('gulp-autoprefixer'); var minify = require('gulp-minify-css'); var karma = require('gulp-karma'); @@ -127,7 +127,7 @@ gulp.task('clean', function () { }); gulp.task('test', function() { - return gulp.src([paths.scripts.input + '**/*.js'].concat(paths.test.spec)) + return gulp.src(paths.scripts.input.concat(paths.test.spec)) .pipe(plumber()) .pipe(karma({ configFile: 'test/karma.conf.js' })) .on('error', function(err) { throw err; }); From 193cb1a3988fc3e3bb0813746ed58302d04eaa59 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Mon, 18 Aug 2014 17:30:41 -0400 Subject: [PATCH 096/285] Updated readme --- README.md | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 52595d5..f7b4a0a 100755 --- a/README.md +++ b/README.md @@ -139,7 +139,10 @@ Smooth Scroll also lets you override global settings on a link-by-link basis usi ### Use Smooth Scroll events in your own scripts -You can also call Smooth Scroll's scroll animation events in your own scripts: +You can also call Smooth Scroll's scroll animation events in your own scripts. + +#### animateScroll() +Animate scrolling to an anchor. ```javascript smoothScroll.animateScroll( @@ -164,6 +167,14 @@ var options = { speed: 1000, easing: 'easeOutCubic' }; smoothScroll.animateScroll( toggle, '#bazinga', options ); ``` +#### destroy() +Destroy the current `smoothScroll.init()`. + +```javascript +smoothScroll.destroy(); +``` + + ### Fixed Headers Add a `[data-scroll-header]` data attribute to fixed headers. Smooth Scroll will automatically offset scroll distances by the header height. If you have multiple fixed headers, add `[data-scroll-header]` to the last one in the markup. From 3c00bcdffdbcd57ccdbfbd2e0b115db6b1e73ab7 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Thu, 21 Aug 2014 13:50:32 -0400 Subject: [PATCH 097/285] Passed in `event` variable to `eventHandler` Fixes Firefox bug --- README.md | 2 ++ dist/js/smooth-scroll.js | 2 +- dist/js/smooth-scroll.min.js | 2 +- package.json | 2 +- src/js/smooth-scroll.js | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index f7b4a0a..fda4074 100755 --- a/README.md +++ b/README.md @@ -224,6 +224,8 @@ Smooth Scroll is licensed under the [MIT License](http://gomakethings.com/mit/). Smooth Scroll uses [semantic versioning](http://semver.org/). +* v5.1.1 - August 21, 2014 + * Passed in `event` variable to `eventHandler` method, fixing Firefox bug. * v5.1.0 - August 18, 2014 * Added `destroy` method. * Converted to event bubbling approach for better performance. diff --git a/dist/js/smooth-scroll.js b/dist/js/smooth-scroll.js index 5ee6858..df88090 100755 --- a/dist/js/smooth-scroll.js +++ b/dist/js/smooth-scroll.js @@ -318,7 +318,7 @@ * If smooth scroll element clicked, animate scroll * @private */ - var eventHandler = function () { + var eventHandler = function (event) { var toggle = event.target; if ( toggle.hasAttribute('data-scroll') && toggle.tagName.toLowerCase() === 'a' ) { event.preventDefault(); // Prevent default click event diff --git a/dist/js/smooth-scroll.min.js b/dist/js/smooth-scroll.min.js index 4207b5e..7f4f755 100755 --- a/dist/js/smooth-scroll.min.js +++ b/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ /** smooth-scroll v5.1.0, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ -!function(e,t){"function"==typeof define&&define.amd?define("smoothScroll",t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)}(this,function(e){"use strict";var t,n={},o=!!document.querySelector&&!!e.addEventListener,a={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},r=function(e,t,n){if("[object Object]"===Object.prototype.toString.call(e))for(var o in e)Object.prototype.hasOwnProperty.call(e,o)&&t.call(n,e[o],o,e);else for(var a=0,r=e.length;r>a;a++)t.call(n,e[a],a,e)},c=function(e,t){var n={};return r(e,function(t,o){n[o]=e[o]}),r(t,function(e,o){n[o]=t[o]}),n},u=function(e){for(var t,n=String(e),o=n.length,a=-1,r="",c=n.charCodeAt(0);++a=1&&31>=t||127==t||0===a&&t>=48&&57>=t||1===a&&t>=48&&57>=t&&45===c?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(a):"\\"+n.charAt(a)}return r},i=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},f=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=o-t-n,o>=0?o:0},s=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},l=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},d=function(e,t){history.pushState&&(t||"true"===t)&&history.pushState({pos:e.id},"",window.location.pathname+e)};n.animateScroll=function(t,n,o){var r=c(r||a,o||{}),h=l(t?t.getAttribute("data-options"):null);r=c(r,h),n="#"+u(n.substr(1));var p,m,v,g=document.querySelector("[data-scroll-header]"),b=null===g?0:g.offsetHeight+g.offsetTop,O=e.pageYOffset,y=f(document.querySelector(n),b,parseInt(r.offset,10)),I=y-O,S=s(),Q=0;d(n,r.updateURL);var A=function(o,a,c){var u=e.pageYOffset;(o==a||u==a||e.innerHeight+u>=S)&&(clearInterval(c),r.callbackAfter(t,n))},C=function(){Q+=16,m=Q/parseInt(r.speed,10),m=m>1?1:m,v=O+I*i(r.easing,m),e.scrollTo(0,Math.floor(v)),A(v,y,p)},H=function(){r.callbackBefore(t,n),p=setInterval(C,16)};0===e.pageYOffset&&e.scrollTo(0,0),H()};var h=function(){var e=event.target;e.hasAttribute("data-scroll")&&"a"===e.tagName.toLowerCase()&&(event.preventDefault(),n.animateScroll(e,e.hash,t,event))};return n.destroy=function(){t&&(document.removeEventListener("click",h,!1),t=null)},n.init=function(e){o&&(n.destroy(),t=c(a,e||{}),document.addEventListener("click",h,!1))},n}); \ No newline at end of file +!function(e,t){"function"==typeof define&&define.amd?define("smoothScroll",t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)}(this,function(e){"use strict";var t,n={},o=!!document.querySelector&&!!e.addEventListener,a={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},r=function(e,t,n){if("[object Object]"===Object.prototype.toString.call(e))for(var o in e)Object.prototype.hasOwnProperty.call(e,o)&&t.call(n,e[o],o,e);else for(var a=0,r=e.length;r>a;a++)t.call(n,e[a],a,e)},c=function(e,t){var n={};return r(e,function(t,o){n[o]=e[o]}),r(t,function(e,o){n[o]=t[o]}),n},u=function(e){for(var t,n=String(e),o=n.length,a=-1,r="",c=n.charCodeAt(0);++a=1&&31>=t||127==t||0===a&&t>=48&&57>=t||1===a&&t>=48&&57>=t&&45===c?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(a):"\\"+n.charAt(a)}return r},i=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},f=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=o-t-n,o>=0?o:0},s=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},l=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},d=function(e,t){history.pushState&&(t||"true"===t)&&history.pushState({pos:e.id},"",window.location.pathname+e)};n.animateScroll=function(t,n,o){var r=c(r||a,o||{}),h=l(t?t.getAttribute("data-options"):null);r=c(r,h),n="#"+u(n.substr(1));var p,m,v,g=document.querySelector("[data-scroll-header]"),b=null===g?0:g.offsetHeight+g.offsetTop,O=e.pageYOffset,y=f(document.querySelector(n),b,parseInt(r.offset,10)),I=y-O,S=s(),Q=0;d(n,r.updateURL);var A=function(o,a,c){var u=e.pageYOffset;(o==a||u==a||e.innerHeight+u>=S)&&(clearInterval(c),r.callbackAfter(t,n))},C=function(){Q+=16,m=Q/parseInt(r.speed,10),m=m>1?1:m,v=O+I*i(r.easing,m),e.scrollTo(0,Math.floor(v)),A(v,y,p)},H=function(){r.callbackBefore(t,n),p=setInterval(C,16)};0===e.pageYOffset&&e.scrollTo(0,0),H()};var h=function(e){var o=e.target;o.hasAttribute("data-scroll")&&"a"===o.tagName.toLowerCase()&&(e.preventDefault(),n.animateScroll(o,o.hash,t,e))};return n.destroy=function(){t&&(document.removeEventListener("click",h,!1),t=null)},n.init=function(e){o&&(n.destroy(),t=c(a,e||{}),document.addEventListener("click",h,!1))},n}); \ No newline at end of file diff --git a/package.json b/package.json index 34866a9..069d03d 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "smooth-scroll", - "version": "5.1.0", + "version": "5.1.1", "description": "Animate scrolling to anchor links", "author": { "name": "Chris Ferdinandi", diff --git a/src/js/smooth-scroll.js b/src/js/smooth-scroll.js index 3cd0520..74fb587 100755 --- a/src/js/smooth-scroll.js +++ b/src/js/smooth-scroll.js @@ -309,7 +309,7 @@ * If smooth scroll element clicked, animate scroll * @private */ - var eventHandler = function () { + var eventHandler = function (event) { var toggle = event.target; if ( toggle.hasAttribute('data-scroll') && toggle.tagName.toLowerCase() === 'a' ) { event.preventDefault(); // Prevent default click event From 9002ece083bfd44ab3f3d1b5eee2e91c0a923117 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Thu, 21 Aug 2014 13:50:43 -0400 Subject: [PATCH 098/285] Updated version number --- dist/js/bind-polyfill.js | 2 +- dist/js/bind-polyfill.min.js | 2 +- dist/js/smooth-scroll.js | 2 +- dist/js/smooth-scroll.min.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dist/js/bind-polyfill.js b/dist/js/bind-polyfill.js index 1ef54e0..e7620ea 100644 --- a/dist/js/bind-polyfill.js +++ b/dist/js/bind-polyfill.js @@ -1,5 +1,5 @@ /** - * smooth-scroll v5.1.0 + * smooth-scroll v5.1.1 * Animate scrolling to anchor links, by Chris Ferdinandi. * http://github.com/cferdinandi/smooth-scroll * diff --git a/dist/js/bind-polyfill.min.js b/dist/js/bind-polyfill.min.js index 5fc594b..f4783d2 100644 --- a/dist/js/bind-polyfill.min.js +++ b/dist/js/bind-polyfill.min.js @@ -1,2 +1,2 @@ -/** smooth-scroll v5.1.0, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ +/** smooth-scroll v5.1.1, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ Function.prototype.bind||(Function.prototype.bind=function(t){if("function"!=typeof this)throw new TypeError("Function.prototype.bind - what is trying to be bound is not callable");var o=Array.prototype.slice.call(arguments,1),n=this;return fNOP=function(){},fBound=function(){return n.apply(this instanceof fNOP&&t?this:t,o.concat(Array.prototype.slice.call(arguments)))},fNOP.prototype=this.prototype,fBound.prototype=new fNOP,fBound}); \ No newline at end of file diff --git a/dist/js/smooth-scroll.js b/dist/js/smooth-scroll.js index df88090..e0baa18 100755 --- a/dist/js/smooth-scroll.js +++ b/dist/js/smooth-scroll.js @@ -1,5 +1,5 @@ /** - * smooth-scroll v5.1.0 + * smooth-scroll v5.1.1 * Animate scrolling to anchor links, by Chris Ferdinandi. * http://github.com/cferdinandi/smooth-scroll * diff --git a/dist/js/smooth-scroll.min.js b/dist/js/smooth-scroll.min.js index 7f4f755..d004dcf 100755 --- a/dist/js/smooth-scroll.min.js +++ b/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ -/** smooth-scroll v5.1.0, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ +/** smooth-scroll v5.1.1, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ !function(e,t){"function"==typeof define&&define.amd?define("smoothScroll",t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)}(this,function(e){"use strict";var t,n={},o=!!document.querySelector&&!!e.addEventListener,a={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},r=function(e,t,n){if("[object Object]"===Object.prototype.toString.call(e))for(var o in e)Object.prototype.hasOwnProperty.call(e,o)&&t.call(n,e[o],o,e);else for(var a=0,r=e.length;r>a;a++)t.call(n,e[a],a,e)},c=function(e,t){var n={};return r(e,function(t,o){n[o]=e[o]}),r(t,function(e,o){n[o]=t[o]}),n},u=function(e){for(var t,n=String(e),o=n.length,a=-1,r="",c=n.charCodeAt(0);++a=1&&31>=t||127==t||0===a&&t>=48&&57>=t||1===a&&t>=48&&57>=t&&45===c?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(a):"\\"+n.charAt(a)}return r},i=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},f=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=o-t-n,o>=0?o:0},s=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},l=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},d=function(e,t){history.pushState&&(t||"true"===t)&&history.pushState({pos:e.id},"",window.location.pathname+e)};n.animateScroll=function(t,n,o){var r=c(r||a,o||{}),h=l(t?t.getAttribute("data-options"):null);r=c(r,h),n="#"+u(n.substr(1));var p,m,v,g=document.querySelector("[data-scroll-header]"),b=null===g?0:g.offsetHeight+g.offsetTop,O=e.pageYOffset,y=f(document.querySelector(n),b,parseInt(r.offset,10)),I=y-O,S=s(),Q=0;d(n,r.updateURL);var A=function(o,a,c){var u=e.pageYOffset;(o==a||u==a||e.innerHeight+u>=S)&&(clearInterval(c),r.callbackAfter(t,n))},C=function(){Q+=16,m=Q/parseInt(r.speed,10),m=m>1?1:m,v=O+I*i(r.easing,m),e.scrollTo(0,Math.floor(v)),A(v,y,p)},H=function(){r.callbackBefore(t,n),p=setInterval(C,16)};0===e.pageYOffset&&e.scrollTo(0,0),H()};var h=function(e){var o=e.target;o.hasAttribute("data-scroll")&&"a"===o.tagName.toLowerCase()&&(e.preventDefault(),n.animateScroll(o,o.hash,t,e))};return n.destroy=function(){t&&(document.removeEventListener("click",h,!1),t=null)},n.init=function(e){o&&(n.destroy(),t=c(a,e||{}),document.addEventListener("click",h,!1))},n}); \ No newline at end of file From c04908390e7a72f1a5e01872c9ce3b8d20e1f195 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Sat, 23 Aug 2014 22:42:21 -0400 Subject: [PATCH 099/285] Updated test path --- gulpfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gulpfile.js b/gulpfile.js index 8b71ede..6f97d65 100755 --- a/gulpfile.js +++ b/gulpfile.js @@ -127,7 +127,7 @@ gulp.task('clean', function () { }); gulp.task('test', function() { - return gulp.src(paths.scripts.input.concat(paths.test.spec)) + return gulp.src([paths.scripts.input + '/../**/*.js'].concat(paths.test.spec)) .pipe(plumber()) .pipe(karma({ configFile: 'test/karma.conf.js' })) .on('error', function(err) { throw err; }); From 3149d01bd534ff25000b26e71e09a40066056122 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Mon, 25 Aug 2014 16:57:28 -0400 Subject: [PATCH 100/285] Updated gulpfile.js --- gulpfile.js | 59 ++++++++++++++++++++++++++++++++--------------------- 1 file changed, 36 insertions(+), 23 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 6f97d65..2e47bd4 100755 --- a/gulpfile.js +++ b/gulpfile.js @@ -1,3 +1,4 @@ +// Gulp Packages var gulp = require('gulp'); var plumber = require('gulp-plumber'); var clean = require('gulp-clean'); @@ -15,8 +16,10 @@ var minify = require('gulp-minify-css'); var karma = require('gulp-karma'); var package = require('./package.json'); +// Paths to project folders var paths = { output : 'dist/', + temp: 'src/temp/', scripts : { input : [ 'src/js/*' ], output : 'dist/js/' @@ -33,6 +36,7 @@ var paths = { } }; +// Template for banner to add to file headers var banner = { full : '/**\n' + @@ -51,7 +55,8 @@ var banner = { ' */\n' }; -gulp.task('scripts', ['clean'], function() { +// Concatenate scripts in subfolders +gulp.task('concatenate', function() { return gulp.src(paths.scripts.input) .pipe(plumber()) .pipe(flatten()) @@ -61,26 +66,19 @@ gulp.task('scripts', ['clean'], function() { var name = file.relative + '.js'; return gulp.src(file.path + '/*.js') .pipe(concat(name)) - .pipe(header(banner.full, { package : package })) - .pipe(gulp.dest(paths.scripts.output)) - .pipe(rename({ suffix: '.min' })) - .pipe(uglify()) - .pipe(header(banner.min, { package : package })) - .pipe(gulp.dest(paths.scripts.output)); + .pipe(gulp.dest(paths.temp)); } - })) - - // Don't add headers to classList.js - .pipe(tap(function (file,t) { - if ( file.relative === 'classList.js' ) { - return gulp.src( file.path ) - .pipe(gulp.dest(paths.scripts.output)) - .pipe(rename({ suffix: '.min' })) - .pipe(uglify()) - .pipe(gulp.dest(paths.scripts.output)); - } - })) + })); +}); +// Lint and minify scripts +gulp.task('scripts', ['clean', 'concatenate'], function() { + return gulp.src([ + paths.scripts.input + '/../*.js', + paths.temp + '/*.js' + ]) + .pipe(plumber()) + .pipe(flatten()) .pipe(header(banner.full, { package : package })) .pipe(gulp.dest(paths.scripts.output)) .pipe(rename({ suffix: '.min' })) @@ -89,6 +87,7 @@ gulp.task('scripts', ['clean'], function() { .pipe(gulp.dest(paths.scripts.output)); }); +// Process, lint, and minify Sass files gulp.task('styles', ['clean'], function() { return gulp.src(paths.styles.input) .pipe(plumber()) @@ -103,12 +102,14 @@ gulp.task('styles', ['clean'], function() { .pipe(gulp.dest(paths.styles.output)); }); +// Copy static files into output folder gulp.task('static', ['clean'], function() { return gulp.src(paths.static) .pipe(plumber()) .pipe(gulp.dest(paths.output)); }); +// Lint scripts gulp.task('lint', function () { return gulp.src(paths.scripts.input) .pipe(plumber()) @@ -116,16 +117,25 @@ gulp.task('lint', function () { .pipe(jshint.reporter('jshint-stylish')); }); +// Remove prexisting content from output and test folders gulp.task('clean', function () { return gulp.src([ - paths.output, - paths.test.coverage, - paths.test.results + paths.output, + paths.test.coverage, + paths.test.results ], { read: false }) .pipe(plumber()) .pipe(clean()); }); +// Remove temporary files +gulp.task('cleanTemp', ['scripts'], function () { + return gulp.src(paths.temp, { read: false }) + .pipe(plumber()) + .pipe(clean()); +}); + +// Run unit tests gulp.task('test', function() { return gulp.src([paths.scripts.input + '/../**/*.js'].concat(paths.test.spec)) .pipe(plumber()) @@ -133,11 +143,14 @@ gulp.task('test', function() { .on('error', function(err) { throw err; }); }); +// Combine tasks into runner gulp.task('default', [ 'lint', 'clean', + 'static', + 'concatenate', 'scripts', 'styles', - 'static', + 'cleanTemp', 'test' ]); \ No newline at end of file From 86340a9905445edafb5ffed12b4d0ec75b05a6e4 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Sun, 31 Aug 2014 09:32:49 -0400 Subject: [PATCH 101/285] Fixed event listener bug --- README.md | 2 ++ dist/js/bind-polyfill.js | 2 +- dist/js/bind-polyfill.min.js | 2 +- dist/js/smooth-scroll.js | 32 +++++++++++++++++++++++++++++--- dist/js/smooth-scroll.min.js | 4 ++-- package.json | 2 +- src/js/smooth-scroll.js | 30 ++++++++++++++++++++++++++++-- 7 files changed, 64 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index fda4074..b8b34bc 100755 --- a/README.md +++ b/README.md @@ -224,6 +224,8 @@ Smooth Scroll is licensed under the [MIT License](http://gomakethings.com/mit/). Smooth Scroll uses [semantic versioning](http://semver.org/). +* v5.1.2 - August 31, 2014 + * Fixed event listener filter to account for sub elements. * v5.1.1 - August 21, 2014 * Passed in `event` variable to `eventHandler` method, fixing Firefox bug. * v5.1.0 - August 18, 2014 diff --git a/dist/js/bind-polyfill.js b/dist/js/bind-polyfill.js index e7620ea..c4b8193 100644 --- a/dist/js/bind-polyfill.js +++ b/dist/js/bind-polyfill.js @@ -1,5 +1,5 @@ /** - * smooth-scroll v5.1.1 + * smooth-scroll v5.1.2 * Animate scrolling to anchor links, by Chris Ferdinandi. * http://github.com/cferdinandi/smooth-scroll * diff --git a/dist/js/bind-polyfill.min.js b/dist/js/bind-polyfill.min.js index f4783d2..0b18dfd 100644 --- a/dist/js/bind-polyfill.min.js +++ b/dist/js/bind-polyfill.min.js @@ -1,2 +1,2 @@ -/** smooth-scroll v5.1.1, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ +/** smooth-scroll v5.1.2, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ Function.prototype.bind||(Function.prototype.bind=function(t){if("function"!=typeof this)throw new TypeError("Function.prototype.bind - what is trying to be bound is not callable");var o=Array.prototype.slice.call(arguments,1),n=this;return fNOP=function(){},fBound=function(){return n.apply(this instanceof fNOP&&t?this:t,o.concat(Array.prototype.slice.call(arguments)))},fNOP.prototype=this.prototype,fBound.prototype=new fNOP,fBound}); \ No newline at end of file diff --git a/dist/js/smooth-scroll.js b/dist/js/smooth-scroll.js index e0baa18..5dbb280 100755 --- a/dist/js/smooth-scroll.js +++ b/dist/js/smooth-scroll.js @@ -1,5 +1,5 @@ /** - * smooth-scroll v5.1.1 + * smooth-scroll v5.1.2 * Animate scrolling to anchor links, by Chris Ferdinandi. * http://github.com/cferdinandi/smooth-scroll * @@ -81,6 +81,32 @@ return extended; }; + /** + * Get the closest matching element up the DOM tree + * @param {Element} elem Starting element + * @param {String} selector Selector to match against (class, ID, or data attribute) + * @return {Boolean|Element} Returns false if not match found + */ + var getClosest = function (elem, selector) { + var firstChar = selector.charAt(0); + for ( ; elem && elem !== document; elem = elem.parentNode ) { + if ( firstChar === '.' ) { + if ( elem.classList.contains( selector.substr(1) ) ) { + return elem; + } + } else if ( firstChar === '#' ) { + if ( elem.id === selector.substr(1) ) { + return elem; + } + } else if ( firstChar === '[' ) { + if ( elem.hasAttribute( selector.substr(1, selector.length - 2) ) ) { + return elem; + } + } + } + return false; + }; + /** * Escape special characters for use with querySelector * @private @@ -319,8 +345,8 @@ * @private */ var eventHandler = function (event) { - var toggle = event.target; - if ( toggle.hasAttribute('data-scroll') && toggle.tagName.toLowerCase() === 'a' ) { + var toggle = getClosest(event.target, '[data-scroll]'); + if ( toggle && toggle.tagName.toLowerCase() === 'a' ) { event.preventDefault(); // Prevent default click event smoothScroll.animateScroll( toggle, toggle.hash, settings, event ); // Animate scroll } diff --git a/dist/js/smooth-scroll.min.js b/dist/js/smooth-scroll.min.js index d004dcf..9627a92 100755 --- a/dist/js/smooth-scroll.min.js +++ b/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ -/** smooth-scroll v5.1.1, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ -!function(e,t){"function"==typeof define&&define.amd?define("smoothScroll",t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)}(this,function(e){"use strict";var t,n={},o=!!document.querySelector&&!!e.addEventListener,a={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},r=function(e,t,n){if("[object Object]"===Object.prototype.toString.call(e))for(var o in e)Object.prototype.hasOwnProperty.call(e,o)&&t.call(n,e[o],o,e);else for(var a=0,r=e.length;r>a;a++)t.call(n,e[a],a,e)},c=function(e,t){var n={};return r(e,function(t,o){n[o]=e[o]}),r(t,function(e,o){n[o]=t[o]}),n},u=function(e){for(var t,n=String(e),o=n.length,a=-1,r="",c=n.charCodeAt(0);++a=1&&31>=t||127==t||0===a&&t>=48&&57>=t||1===a&&t>=48&&57>=t&&45===c?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(a):"\\"+n.charAt(a)}return r},i=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},f=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=o-t-n,o>=0?o:0},s=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},l=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},d=function(e,t){history.pushState&&(t||"true"===t)&&history.pushState({pos:e.id},"",window.location.pathname+e)};n.animateScroll=function(t,n,o){var r=c(r||a,o||{}),h=l(t?t.getAttribute("data-options"):null);r=c(r,h),n="#"+u(n.substr(1));var p,m,v,g=document.querySelector("[data-scroll-header]"),b=null===g?0:g.offsetHeight+g.offsetTop,O=e.pageYOffset,y=f(document.querySelector(n),b,parseInt(r.offset,10)),I=y-O,S=s(),Q=0;d(n,r.updateURL);var A=function(o,a,c){var u=e.pageYOffset;(o==a||u==a||e.innerHeight+u>=S)&&(clearInterval(c),r.callbackAfter(t,n))},C=function(){Q+=16,m=Q/parseInt(r.speed,10),m=m>1?1:m,v=O+I*i(r.easing,m),e.scrollTo(0,Math.floor(v)),A(v,y,p)},H=function(){r.callbackBefore(t,n),p=setInterval(C,16)};0===e.pageYOffset&&e.scrollTo(0,0),H()};var h=function(e){var o=e.target;o.hasAttribute("data-scroll")&&"a"===o.tagName.toLowerCase()&&(e.preventDefault(),n.animateScroll(o,o.hash,t,e))};return n.destroy=function(){t&&(document.removeEventListener("click",h,!1),t=null)},n.init=function(e){o&&(n.destroy(),t=c(a,e||{}),document.addEventListener("click",h,!1))},n}); \ No newline at end of file +/** smooth-scroll v5.1.2, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ +!function(t,e){"function"==typeof define&&define.amd?define("smoothScroll",e(t)):"object"==typeof exports?module.exports=e(t):t.smoothScroll=e(t)}(this,function(t){"use strict";var e,n={},o=!!document.querySelector&&!!t.addEventListener,r={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},a=function(t,e,n){if("[object Object]"===Object.prototype.toString.call(t))for(var o in t)Object.prototype.hasOwnProperty.call(t,o)&&e.call(n,t[o],o,t);else for(var r=0,a=t.length;a>r;r++)e.call(n,t[r],r,t)},c=function(t,e){var n={};return a(t,function(e,o){n[o]=t[o]}),a(e,function(t,o){n[o]=e[o]}),n},u=function(t,e){for(var n=e.charAt(0);t&&t!==document;t=t.parentNode)if("."===n){if(t.classList.contains(e.substr(1)))return t}else if("#"===n){if(t.id===e.substr(1))return t}else if("["===n&&t.hasAttribute(e.substr(1,e.length-2)))return t;return!1},i=function(t){for(var e,n=String(t),o=n.length,r=-1,a="",c=n.charCodeAt(0);++r=1&&31>=e||127==e||0===r&&e>=48&&57>=e||1===r&&e>=48&&57>=e&&45===c?"\\"+e.toString(16)+" ":e>=128||45===e||95===e||e>=48&&57>=e||e>=65&&90>=e||e>=97&&122>=e?n.charAt(r):"\\"+n.charAt(r)}return a},s=function(t,e){var n;return"easeInQuad"===t&&(n=e*e),"easeOutQuad"===t&&(n=e*(2-e)),"easeInOutQuad"===t&&(n=.5>e?2*e*e:-1+(4-2*e)*e),"easeInCubic"===t&&(n=e*e*e),"easeOutCubic"===t&&(n=--e*e*e+1),"easeInOutCubic"===t&&(n=.5>e?4*e*e*e:(e-1)*(2*e-2)*(2*e-2)+1),"easeInQuart"===t&&(n=e*e*e*e),"easeOutQuart"===t&&(n=1- --e*e*e*e),"easeInOutQuart"===t&&(n=.5>e?8*e*e*e*e:1-8*--e*e*e*e),"easeInQuint"===t&&(n=e*e*e*e*e),"easeOutQuint"===t&&(n=1+--e*e*e*e*e),"easeInOutQuint"===t&&(n=.5>e?16*e*e*e*e*e:1+16*--e*e*e*e*e),n||e},f=function(t,e,n){var o=0;if(t.offsetParent)do o+=t.offsetTop,t=t.offsetParent;while(t);return o=o-e-n,o>=0?o:0},l=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},d=function(t){return t&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(t):{}},h=function(t,e){history.pushState&&(e||"true"===e)&&history.pushState({pos:t.id},"",window.location.pathname+t)};n.animateScroll=function(e,n,o){var a=c(a||r,o||{}),u=d(e?e.getAttribute("data-options"):null);a=c(a,u),n="#"+i(n.substr(1));var p,m,b,v=document.querySelector("[data-scroll-header]"),g=null===v?0:v.offsetHeight+v.offsetTop,O=t.pageYOffset,y=f(document.querySelector(n),g,parseInt(a.offset,10)),I=y-O,S=l(),A=0;h(n,a.updateURL);var Q=function(o,r,c){var u=t.pageYOffset;(o==r||u==r||t.innerHeight+u>=S)&&(clearInterval(c),a.callbackAfter(e,n))},C=function(){A+=16,m=A/parseInt(a.speed,10),m=m>1?1:m,b=O+I*s(a.easing,m),t.scrollTo(0,Math.floor(b)),Q(b,y,p)},H=function(){a.callbackBefore(e,n),p=setInterval(C,16)};0===t.pageYOffset&&t.scrollTo(0,0),H()};var p=function(t){var o=u(t.target,"[data-scroll]");o&&"a"===o.tagName.toLowerCase()&&(t.preventDefault(),n.animateScroll(o,o.hash,e,t))};return n.destroy=function(){e&&(document.removeEventListener("click",p,!1),e=null)},n.init=function(t){o&&(n.destroy(),e=c(r,t||{}),document.addEventListener("click",p,!1))},n}); \ No newline at end of file diff --git a/package.json b/package.json index 069d03d..0372095 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "smooth-scroll", - "version": "5.1.1", + "version": "5.1.2", "description": "Animate scrolling to anchor links", "author": { "name": "Chris Ferdinandi", diff --git a/src/js/smooth-scroll.js b/src/js/smooth-scroll.js index 74fb587..23a8e5b 100755 --- a/src/js/smooth-scroll.js +++ b/src/js/smooth-scroll.js @@ -72,6 +72,32 @@ return extended; }; + /** + * Get the closest matching element up the DOM tree + * @param {Element} elem Starting element + * @param {String} selector Selector to match against (class, ID, or data attribute) + * @return {Boolean|Element} Returns false if not match found + */ + var getClosest = function (elem, selector) { + var firstChar = selector.charAt(0); + for ( ; elem && elem !== document; elem = elem.parentNode ) { + if ( firstChar === '.' ) { + if ( elem.classList.contains( selector.substr(1) ) ) { + return elem; + } + } else if ( firstChar === '#' ) { + if ( elem.id === selector.substr(1) ) { + return elem; + } + } else if ( firstChar === '[' ) { + if ( elem.hasAttribute( selector.substr(1, selector.length - 2) ) ) { + return elem; + } + } + } + return false; + }; + /** * Escape special characters for use with querySelector * @private @@ -310,8 +336,8 @@ * @private */ var eventHandler = function (event) { - var toggle = event.target; - if ( toggle.hasAttribute('data-scroll') && toggle.tagName.toLowerCase() === 'a' ) { + var toggle = getClosest(event.target, '[data-scroll]'); + if ( toggle && toggle.tagName.toLowerCase() === 'a' ) { event.preventDefault(); // Prevent default click event smoothScroll.animateScroll( toggle, toggle.hash, settings, event ); // Animate scroll } From d42e3b688cbe99f606e52aa64da45faa76cd3cd5 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Sun, 31 Aug 2014 09:34:13 -0400 Subject: [PATCH 102/285] Removed unused event argument --- README.md | 4 ++-- dist/js/smooth-scroll.js | 2 +- src/js/smooth-scroll.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index b8b34bc..4384373 100755 --- a/README.md +++ b/README.md @@ -148,8 +148,7 @@ Animate scrolling to an anchor. smoothScroll.animateScroll( toggle, // Node that toggles the animation. ex. document.querySelector('#toggle') anchor, // ID of the anchor to scroll to. ex. '#bazinga' - options, // Classes and callbacks. Same options as those passed into the init() function. - event // Optional, if a DOM event was triggered. + options // Classes and callbacks. Same options as those passed into the init() function. ); ``` @@ -226,6 +225,7 @@ Smooth Scroll uses [semantic versioning](http://semver.org/). * v5.1.2 - August 31, 2014 * Fixed event listener filter to account for sub elements. + * Removed unused `event` argument from `animateScroll` * v5.1.1 - August 21, 2014 * Passed in `event` variable to `eventHandler` method, fixing Firefox bug. * v5.1.0 - August 18, 2014 diff --git a/dist/js/smooth-scroll.js b/dist/js/smooth-scroll.js index 5dbb280..d3407d5 100755 --- a/dist/js/smooth-scroll.js +++ b/dist/js/smooth-scroll.js @@ -268,7 +268,7 @@ * @param {Object} settings * @param {Event} event */ - smoothScroll.animateScroll = function ( toggle, anchor, options, event ) { + smoothScroll.animateScroll = function ( toggle, anchor, options ) { // Options and overrides var settings = extend( settings || defaults, options || {} ); // Merge user options with defaults diff --git a/src/js/smooth-scroll.js b/src/js/smooth-scroll.js index 23a8e5b..d0424ad 100755 --- a/src/js/smooth-scroll.js +++ b/src/js/smooth-scroll.js @@ -259,7 +259,7 @@ * @param {Object} settings * @param {Event} event */ - smoothScroll.animateScroll = function ( toggle, anchor, options, event ) { + smoothScroll.animateScroll = function ( toggle, anchor, options ) { // Options and overrides var settings = extend( settings || defaults, options || {} ); // Merge user options with defaults From 27ae9125619bece8b86c4368d8f066744def38c7 Mon Sep 17 00:00:00 2001 From: Riku Rouvila Date: Wed, 24 Sep 2014 16:56:27 +0300 Subject: [PATCH 103/285] add main field to package.json so that module can be required --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 0372095..fbcee52 100755 --- a/package.json +++ b/package.json @@ -2,6 +2,7 @@ "name": "smooth-scroll", "version": "5.1.2", "description": "Animate scrolling to anchor links", + "main": "./dist/js/smooth-scroll.js", "author": { "name": "Chris Ferdinandi", "url": "http://gomakethings.com/" From caca631e6d90c94c647fa1dcea76de4b95926e4c Mon Sep 17 00:00:00 2001 From: Riku Rouvila Date: Wed, 24 Sep 2014 16:57:00 +0300 Subject: [PATCH 104/285] use 'this' as a root only if 'window' object isn't available --- src/js/smooth-scroll.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/smooth-scroll.js b/src/js/smooth-scroll.js index d0424ad..9a349e4 100755 --- a/src/js/smooth-scroll.js +++ b/src/js/smooth-scroll.js @@ -6,7 +6,7 @@ } else { root.smoothScroll = factory(root); } -})(this, function (root) { +})(window || this, function (root) { 'use strict'; From 8256d4f9de7eae4309aa5101637709aa79441363 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Mon, 29 Sep 2014 22:59:57 -0400 Subject: [PATCH 105/285] Fixed CommonJS module bug --- README.md | 2 ++ dist/js/bind-polyfill.js | 2 +- dist/js/bind-polyfill.min.js | 2 +- dist/js/smooth-scroll.js | 4 ++-- dist/js/smooth-scroll.min.js | 4 ++-- package.json | 2 +- 6 files changed, 9 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 4384373..f9b0647 100755 --- a/README.md +++ b/README.md @@ -223,6 +223,8 @@ Smooth Scroll is licensed under the [MIT License](http://gomakethings.com/mit/). Smooth Scroll uses [semantic versioning](http://semver.org/). +* v5.1.3 - September 29, 2014 + * Fixed CommonJS module bug. * v5.1.2 - August 31, 2014 * Fixed event listener filter to account for sub elements. * Removed unused `event` argument from `animateScroll` diff --git a/dist/js/bind-polyfill.js b/dist/js/bind-polyfill.js index c4b8193..29bed1d 100644 --- a/dist/js/bind-polyfill.js +++ b/dist/js/bind-polyfill.js @@ -1,5 +1,5 @@ /** - * smooth-scroll v5.1.2 + * smooth-scroll v5.1.3 * Animate scrolling to anchor links, by Chris Ferdinandi. * http://github.com/cferdinandi/smooth-scroll * diff --git a/dist/js/bind-polyfill.min.js b/dist/js/bind-polyfill.min.js index 0b18dfd..25b30dd 100644 --- a/dist/js/bind-polyfill.min.js +++ b/dist/js/bind-polyfill.min.js @@ -1,2 +1,2 @@ -/** smooth-scroll v5.1.2, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ +/** smooth-scroll v5.1.3, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ Function.prototype.bind||(Function.prototype.bind=function(t){if("function"!=typeof this)throw new TypeError("Function.prototype.bind - what is trying to be bound is not callable");var o=Array.prototype.slice.call(arguments,1),n=this;return fNOP=function(){},fBound=function(){return n.apply(this instanceof fNOP&&t?this:t,o.concat(Array.prototype.slice.call(arguments)))},fNOP.prototype=this.prototype,fBound.prototype=new fNOP,fBound}); \ No newline at end of file diff --git a/dist/js/smooth-scroll.js b/dist/js/smooth-scroll.js index d3407d5..81e96eb 100755 --- a/dist/js/smooth-scroll.js +++ b/dist/js/smooth-scroll.js @@ -1,5 +1,5 @@ /** - * smooth-scroll v5.1.2 + * smooth-scroll v5.1.3 * Animate scrolling to anchor links, by Chris Ferdinandi. * http://github.com/cferdinandi/smooth-scroll * @@ -15,7 +15,7 @@ } else { root.smoothScroll = factory(root); } -})(this, function (root) { +})(window || this, function (root) { 'use strict'; diff --git a/dist/js/smooth-scroll.min.js b/dist/js/smooth-scroll.min.js index 9627a92..c445e23 100755 --- a/dist/js/smooth-scroll.min.js +++ b/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ -/** smooth-scroll v5.1.2, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ -!function(t,e){"function"==typeof define&&define.amd?define("smoothScroll",e(t)):"object"==typeof exports?module.exports=e(t):t.smoothScroll=e(t)}(this,function(t){"use strict";var e,n={},o=!!document.querySelector&&!!t.addEventListener,r={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},a=function(t,e,n){if("[object Object]"===Object.prototype.toString.call(t))for(var o in t)Object.prototype.hasOwnProperty.call(t,o)&&e.call(n,t[o],o,t);else for(var r=0,a=t.length;a>r;r++)e.call(n,t[r],r,t)},c=function(t,e){var n={};return a(t,function(e,o){n[o]=t[o]}),a(e,function(t,o){n[o]=e[o]}),n},u=function(t,e){for(var n=e.charAt(0);t&&t!==document;t=t.parentNode)if("."===n){if(t.classList.contains(e.substr(1)))return t}else if("#"===n){if(t.id===e.substr(1))return t}else if("["===n&&t.hasAttribute(e.substr(1,e.length-2)))return t;return!1},i=function(t){for(var e,n=String(t),o=n.length,r=-1,a="",c=n.charCodeAt(0);++r=1&&31>=e||127==e||0===r&&e>=48&&57>=e||1===r&&e>=48&&57>=e&&45===c?"\\"+e.toString(16)+" ":e>=128||45===e||95===e||e>=48&&57>=e||e>=65&&90>=e||e>=97&&122>=e?n.charAt(r):"\\"+n.charAt(r)}return a},s=function(t,e){var n;return"easeInQuad"===t&&(n=e*e),"easeOutQuad"===t&&(n=e*(2-e)),"easeInOutQuad"===t&&(n=.5>e?2*e*e:-1+(4-2*e)*e),"easeInCubic"===t&&(n=e*e*e),"easeOutCubic"===t&&(n=--e*e*e+1),"easeInOutCubic"===t&&(n=.5>e?4*e*e*e:(e-1)*(2*e-2)*(2*e-2)+1),"easeInQuart"===t&&(n=e*e*e*e),"easeOutQuart"===t&&(n=1- --e*e*e*e),"easeInOutQuart"===t&&(n=.5>e?8*e*e*e*e:1-8*--e*e*e*e),"easeInQuint"===t&&(n=e*e*e*e*e),"easeOutQuint"===t&&(n=1+--e*e*e*e*e),"easeInOutQuint"===t&&(n=.5>e?16*e*e*e*e*e:1+16*--e*e*e*e*e),n||e},f=function(t,e,n){var o=0;if(t.offsetParent)do o+=t.offsetTop,t=t.offsetParent;while(t);return o=o-e-n,o>=0?o:0},l=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},d=function(t){return t&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(t):{}},h=function(t,e){history.pushState&&(e||"true"===e)&&history.pushState({pos:t.id},"",window.location.pathname+t)};n.animateScroll=function(e,n,o){var a=c(a||r,o||{}),u=d(e?e.getAttribute("data-options"):null);a=c(a,u),n="#"+i(n.substr(1));var p,m,b,v=document.querySelector("[data-scroll-header]"),g=null===v?0:v.offsetHeight+v.offsetTop,O=t.pageYOffset,y=f(document.querySelector(n),g,parseInt(a.offset,10)),I=y-O,S=l(),A=0;h(n,a.updateURL);var Q=function(o,r,c){var u=t.pageYOffset;(o==r||u==r||t.innerHeight+u>=S)&&(clearInterval(c),a.callbackAfter(e,n))},C=function(){A+=16,m=A/parseInt(a.speed,10),m=m>1?1:m,b=O+I*s(a.easing,m),t.scrollTo(0,Math.floor(b)),Q(b,y,p)},H=function(){a.callbackBefore(e,n),p=setInterval(C,16)};0===t.pageYOffset&&t.scrollTo(0,0),H()};var p=function(t){var o=u(t.target,"[data-scroll]");o&&"a"===o.tagName.toLowerCase()&&(t.preventDefault(),n.animateScroll(o,o.hash,e,t))};return n.destroy=function(){e&&(document.removeEventListener("click",p,!1),e=null)},n.init=function(t){o&&(n.destroy(),e=c(r,t||{}),document.addEventListener("click",p,!1))},n}); \ No newline at end of file +/** smooth-scroll v5.1.3, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ +!function(t,e){"function"==typeof define&&define.amd?define("smoothScroll",e(t)):"object"==typeof exports?module.exports=e(t):t.smoothScroll=e(t)}(window||this,function(t){"use strict";var e,n={},o=!!document.querySelector&&!!t.addEventListener,r={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},a=function(t,e,n){if("[object Object]"===Object.prototype.toString.call(t))for(var o in t)Object.prototype.hasOwnProperty.call(t,o)&&e.call(n,t[o],o,t);else for(var r=0,a=t.length;a>r;r++)e.call(n,t[r],r,t)},c=function(t,e){var n={};return a(t,function(e,o){n[o]=t[o]}),a(e,function(t,o){n[o]=e[o]}),n},u=function(t,e){for(var n=e.charAt(0);t&&t!==document;t=t.parentNode)if("."===n){if(t.classList.contains(e.substr(1)))return t}else if("#"===n){if(t.id===e.substr(1))return t}else if("["===n&&t.hasAttribute(e.substr(1,e.length-2)))return t;return!1},i=function(t){for(var e,n=String(t),o=n.length,r=-1,a="",c=n.charCodeAt(0);++r=1&&31>=e||127==e||0===r&&e>=48&&57>=e||1===r&&e>=48&&57>=e&&45===c?"\\"+e.toString(16)+" ":e>=128||45===e||95===e||e>=48&&57>=e||e>=65&&90>=e||e>=97&&122>=e?n.charAt(r):"\\"+n.charAt(r)}return a},s=function(t,e){var n;return"easeInQuad"===t&&(n=e*e),"easeOutQuad"===t&&(n=e*(2-e)),"easeInOutQuad"===t&&(n=.5>e?2*e*e:-1+(4-2*e)*e),"easeInCubic"===t&&(n=e*e*e),"easeOutCubic"===t&&(n=--e*e*e+1),"easeInOutCubic"===t&&(n=.5>e?4*e*e*e:(e-1)*(2*e-2)*(2*e-2)+1),"easeInQuart"===t&&(n=e*e*e*e),"easeOutQuart"===t&&(n=1- --e*e*e*e),"easeInOutQuart"===t&&(n=.5>e?8*e*e*e*e:1-8*--e*e*e*e),"easeInQuint"===t&&(n=e*e*e*e*e),"easeOutQuint"===t&&(n=1+--e*e*e*e*e),"easeInOutQuint"===t&&(n=.5>e?16*e*e*e*e*e:1+16*--e*e*e*e*e),n||e},f=function(t,e,n){var o=0;if(t.offsetParent)do o+=t.offsetTop,t=t.offsetParent;while(t);return o=o-e-n,o>=0?o:0},l=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},d=function(t){return t&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(t):{}},h=function(t,e){history.pushState&&(e||"true"===e)&&history.pushState({pos:t.id},"",window.location.pathname+t)};n.animateScroll=function(e,n,o){var a=c(a||r,o||{}),u=d(e?e.getAttribute("data-options"):null);a=c(a,u),n="#"+i(n.substr(1));var p,m,b,v=document.querySelector("[data-scroll-header]"),g=null===v?0:v.offsetHeight+v.offsetTop,O=t.pageYOffset,y=f(document.querySelector(n),g,parseInt(a.offset,10)),I=y-O,S=l(),w=0;h(n,a.updateURL);var A=function(o,r,c){var u=t.pageYOffset;(o==r||u==r||t.innerHeight+u>=S)&&(clearInterval(c),a.callbackAfter(e,n))},Q=function(){w+=16,m=w/parseInt(a.speed,10),m=m>1?1:m,b=O+I*s(a.easing,m),t.scrollTo(0,Math.floor(b)),A(b,y,p)},C=function(){a.callbackBefore(e,n),p=setInterval(Q,16)};0===t.pageYOffset&&t.scrollTo(0,0),C()};var p=function(t){var o=u(t.target,"[data-scroll]");o&&"a"===o.tagName.toLowerCase()&&(t.preventDefault(),n.animateScroll(o,o.hash,e,t))};return n.destroy=function(){e&&(document.removeEventListener("click",p,!1),e=null)},n.init=function(t){o&&(n.destroy(),e=c(r,t||{}),document.addEventListener("click",p,!1))},n}); \ No newline at end of file diff --git a/package.json b/package.json index fbcee52..aa529b1 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "smooth-scroll", - "version": "5.1.2", + "version": "5.1.3", "description": "Animate scrolling to anchor links", "main": "./dist/js/smooth-scroll.js", "author": { From aa6935c47a5dc8369d2edf2f836fd568e8d451da Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Mon, 29 Sep 2014 23:04:39 -0400 Subject: [PATCH 106/285] Updated travis file --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e373413..83be3c0 100755 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,5 @@ language: node_js node_js: - - "0.11" - "0.10" before_script: - npm install -g gulp From 2f7e46c5f276fb564c67421bee2aca359ed2c3c8 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Mon, 29 Sep 2014 23:48:48 -0400 Subject: [PATCH 107/285] Updated read me --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index f9b0647..6a8b750 100755 --- a/README.md +++ b/README.md @@ -205,6 +205,7 @@ Smooth Scroll is built with modern JavaScript APIs, and uses progressive enhance * Scroll-to-top bug for links at the bottom of the page by [Jonas Havers](https://github.com/JonasHavers). * AMD support and numerous code improvements by [Todd Motto](https://github.com/toddmotto). * Push State bug fix by [Yanick Witschi](https://github.com/Toflar). +* CommonJS module support by [Riku Rouvila](https://github.com/rikukissa). From 1191fc198d2d7357a719674e2c9bc6c348e1d982 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Thu, 2 Oct 2014 10:41:20 -0400 Subject: [PATCH 108/285] Updated readme.md --- README.md | 42 ++++++++++++++++++++++++++++++++++++------ 1 file changed, 36 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 6a8b750..5aad418 100755 --- a/README.md +++ b/README.md @@ -7,13 +7,15 @@ A lightweight script to animate scrolling to anchor links. 1. [Getting Started](#getting-started) 2. [Installing with Package Managers](#installing-with-package-managers) +3. [Working with the Source Files](#working-with-the-source-files) 3. [Options & Settings](#options-and-settings) 4. [Browser Compatibility](#browser-compatibility) -5. [Contributors](#contributors) -6. [How to Contribute](#how-to-contribute) -7. [License](#license) -8. [Changelog](#changelog) -9. [Older Docs](#older-docs) +5. [Known Issues](#known-issues) +6. [Contributors](#contributors) +7. [How to Contribute](#how-to-contribute) +8. [License](#license) +9. [Changelog](#changelog) +10. [Older Docs](#older-docs) @@ -62,6 +64,28 @@ You can install Smooth Scroll with your favorite package manager. +## Working with the Source Files + +If you would prefer, you can work with the development code in the `src` directory using the included [Gulp build system](http://gulpjs.com/). This compiles, lints, and minifies code, and runs unit tests. + +### Dependencies +Make sure these are installed first. + +* [Node.js](http://nodejs.org) +* [Ruby Sass](http://sass-lang.com/install) +* [Gulp](http://gulpjs.com) `sudo npm install -g gulp` +* [PhantomJS](http://phantomjs.org) + +### Quick Start + +1. In bash/terminal/command line, `cd` into your project directory. +2. Run `npm install` to install required files. +3. When it's done installing, run `gulp` to get going. + +Every time you want to run your tasks, run `gulp`. + + + ## Options and Settings Smooth Scroll includes smart defaults and works right out of the box. But if you want to customize things, it also has a robust API that provides multiple ways for you to adjust the default options and settings. @@ -167,7 +191,7 @@ smoothScroll.animateScroll( toggle, '#bazinga', options ); ``` #### destroy() -Destroy the current `smoothScroll.init()`. +Destroy the current `smoothScroll.init()`. This is called automatically during the `init` function to remove any existing initializations. ```javascript smoothScroll.destroy(); @@ -193,6 +217,12 @@ Smooth Scroll is built with modern JavaScript APIs, and uses progressive enhance +## Known Issues + +If the `` element has been assigned a height of `100%`, Smooth Scroll is unable to properly calculate page distances and will not scroll to the right location. The `` element can have a fixed, non-percentage based height (ex. `500px`), or a height of `auto`. + + + ## Contributors * Easing support contributed by [Willem Liu](https://github.com/willemliu). From 7d448dd4fe359afb91630c04fcbc3180da22d70e Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Thu, 2 Oct 2014 10:41:36 -0400 Subject: [PATCH 109/285] Updated readme --- README.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 5aad418..2df210f 100755 --- a/README.md +++ b/README.md @@ -8,14 +8,14 @@ A lightweight script to animate scrolling to anchor links. 1. [Getting Started](#getting-started) 2. [Installing with Package Managers](#installing-with-package-managers) 3. [Working with the Source Files](#working-with-the-source-files) -3. [Options & Settings](#options-and-settings) -4. [Browser Compatibility](#browser-compatibility) -5. [Known Issues](#known-issues) -6. [Contributors](#contributors) -7. [How to Contribute](#how-to-contribute) -8. [License](#license) -9. [Changelog](#changelog) -10. [Older Docs](#older-docs) +4. [Options & Settings](#options-and-settings) +5. [Browser Compatibility](#browser-compatibility) +6. [Known Issues](#known-issues) +7. [Contributors](#contributors) +8. [How to Contribute](#how-to-contribute) +9. [License](#license) +10. [Changelog](#changelog) +11. [Older Docs](#older-docs) From 33d46edaa1adbfb7f2a7e0eb7164341b85c0540c Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Thu, 2 Oct 2014 10:43:38 -0400 Subject: [PATCH 110/285] Updated readme --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2df210f..00e536f 100755 --- a/README.md +++ b/README.md @@ -68,7 +68,8 @@ You can install Smooth Scroll with your favorite package manager. If you would prefer, you can work with the development code in the `src` directory using the included [Gulp build system](http://gulpjs.com/). This compiles, lints, and minifies code, and runs unit tests. -### Dependencies +**Dependencies:** + Make sure these are installed first. * [Node.js](http://nodejs.org) @@ -76,7 +77,7 @@ Make sure these are installed first. * [Gulp](http://gulpjs.com) `sudo npm install -g gulp` * [PhantomJS](http://phantomjs.org) -### Quick Start +**Quick Start:** 1. In bash/terminal/command line, `cd` into your project directory. 2. Run `npm install` to install required files. From 67f68ba0b28c22d857f78b27fc23bda8083a108b Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Thu, 2 Oct 2014 10:44:18 -0400 Subject: [PATCH 111/285] Updated readme.md --- README.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 00e536f..2df210f 100755 --- a/README.md +++ b/README.md @@ -68,8 +68,7 @@ You can install Smooth Scroll with your favorite package manager. If you would prefer, you can work with the development code in the `src` directory using the included [Gulp build system](http://gulpjs.com/). This compiles, lints, and minifies code, and runs unit tests. -**Dependencies:** - +### Dependencies Make sure these are installed first. * [Node.js](http://nodejs.org) @@ -77,7 +76,7 @@ Make sure these are installed first. * [Gulp](http://gulpjs.com) `sudo npm install -g gulp` * [PhantomJS](http://phantomjs.org) -**Quick Start:** +### Quick Start 1. In bash/terminal/command line, `cd` into your project directory. 2. Run `npm install` to install required files. From 534356449a9aed959f407eed90652ebb6bc2a3b7 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Thu, 2 Oct 2014 11:17:14 -0400 Subject: [PATCH 112/285] Updated gulp files --- gulpfile.js | 46 +++++++++++++++------------------------------- package.json | 1 + 2 files changed, 16 insertions(+), 31 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 2e47bd4..bfa3eb9 100755 --- a/gulpfile.js +++ b/gulpfile.js @@ -2,6 +2,7 @@ var gulp = require('gulp'); var plumber = require('gulp-plumber'); var clean = require('gulp-clean'); +var lazypipe = require('lazypipe'); var rename = require('gulp-rename'); var flatten = require('gulp-flatten'); var tap = require('gulp-tap'); @@ -19,7 +20,6 @@ var package = require('./package.json'); // Paths to project folders var paths = { output : 'dist/', - temp: 'src/temp/', scripts : { input : [ 'src/js/*' ], output : 'dist/js/' @@ -55,36 +55,29 @@ var banner = { ' */\n' }; -// Concatenate scripts in subfolders -gulp.task('concatenate', function() { +// Lint, minify, and concatenate scripts +gulp.task('scripts', ['clean'], function() { + + var jsTasks = lazypipe() + .pipe(header, banner.full, { package : package }) + .pipe(gulp.dest, paths.scripts.output) + .pipe(rename, { suffix: '.min' }) + .pipe(uglify) + .pipe(header, banner.min, { package : package }) + .pipe(gulp.dest, paths.scripts.output); + return gulp.src(paths.scripts.input) .pipe(plumber()) .pipe(flatten()) - .pipe(tap(function (file, t) { if ( file.stat.isDirectory() ) { var name = file.relative + '.js'; return gulp.src(file.path + '/*.js') .pipe(concat(name)) - .pipe(gulp.dest(paths.temp)); + .pipe(jsTasks()); } - })); -}); - -// Lint and minify scripts -gulp.task('scripts', ['clean', 'concatenate'], function() { - return gulp.src([ - paths.scripts.input + '/../*.js', - paths.temp + '/*.js' - ]) - .pipe(plumber()) - .pipe(flatten()) - .pipe(header(banner.full, { package : package })) - .pipe(gulp.dest(paths.scripts.output)) - .pipe(rename({ suffix: '.min' })) - .pipe(uglify()) - .pipe(header(banner.min, { package : package })) - .pipe(gulp.dest(paths.scripts.output)); + })) + .pipe(jsTasks()); }); // Process, lint, and minify Sass files @@ -128,13 +121,6 @@ gulp.task('clean', function () { .pipe(clean()); }); -// Remove temporary files -gulp.task('cleanTemp', ['scripts'], function () { - return gulp.src(paths.temp, { read: false }) - .pipe(plumber()) - .pipe(clean()); -}); - // Run unit tests gulp.task('test', function() { return gulp.src([paths.scripts.input + '/../**/*.js'].concat(paths.test.spec)) @@ -148,9 +134,7 @@ gulp.task('default', [ 'lint', 'clean', 'static', - 'concatenate', 'scripts', 'styles', - 'cleanTemp', 'test' ]); \ No newline at end of file diff --git a/package.json b/package.json index aa529b1..3eeae53 100755 --- a/package.json +++ b/package.json @@ -28,6 +28,7 @@ "gulp-ruby-sass": "~0.7.1", "gulp-uglify": "~0.3.0", "jshint-stylish": "^0.2.0", + "lazypipe": "0.2.2", "karma": "^0.12.16", "karma-coverage": "^0.2.4", "karma-jasmine": "~0.2.0", From 9b329b6b50d06fba20f05de109f333aef943d790 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Fri, 10 Oct 2014 14:14:20 -0400 Subject: [PATCH 113/285] Added link to easing functions --- dist/js/smooth-scroll.js | 1 + src/js/smooth-scroll.js | 1 + 2 files changed, 2 insertions(+) diff --git a/dist/js/smooth-scroll.js b/dist/js/smooth-scroll.js index 81e96eb..e50f19d 100755 --- a/dist/js/smooth-scroll.js +++ b/dist/js/smooth-scroll.js @@ -182,6 +182,7 @@ /** * Calculate the easing pattern * @private + * @link https://gist.github.com/gre/1650294 * @param {String} type Easing pattern * @param {Number} time Time animation should take to complete * @returns {Number} diff --git a/src/js/smooth-scroll.js b/src/js/smooth-scroll.js index 9a349e4..851e9f3 100755 --- a/src/js/smooth-scroll.js +++ b/src/js/smooth-scroll.js @@ -173,6 +173,7 @@ /** * Calculate the easing pattern * @private + * @link https://gist.github.com/gre/1650294 * @param {String} type Easing pattern * @param {Number} time Time animation should take to complete * @returns {Number} From c0ccbd0dec3157bed1d84a79ccfdd119978a5023 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Sat, 18 Oct 2014 14:50:22 -0400 Subject: [PATCH 114/285] Removed bind dependency Also updated gulp workflow --- README.md | 16 +- dist/js/bind-polyfill.js | 2 +- dist/js/bind-polyfill.min.js | 2 +- dist/js/smooth-scroll.js | 2 +- dist/js/smooth-scroll.min.js | 2 +- docs/assets/css/custom.css | 20 ++ docs/dist/js/bind-polyfill.js | 35 +++ docs/dist/js/bind-polyfill.min.js | 2 + docs/dist/js/smooth-scroll.js | 394 ++++++++++++++++++++++++++++++ docs/dist/js/smooth-scroll.min.js | 2 + docs/index.html | 86 +++++++ gulpfile.js | 260 ++++++++++++++++---- package.json | 45 ++-- src/docs/_templates/_footer.html | 20 ++ src/docs/_templates/_header.html | 23 ++ src/docs/assets/css/custom.css | 20 ++ src/docs/index.html | 44 ++++ 17 files changed, 900 insertions(+), 75 deletions(-) create mode 100755 docs/assets/css/custom.css create mode 100644 docs/dist/js/bind-polyfill.js create mode 100644 docs/dist/js/bind-polyfill.min.js create mode 100755 docs/dist/js/smooth-scroll.js create mode 100755 docs/dist/js/smooth-scroll.min.js create mode 100644 docs/index.html create mode 100644 src/docs/_templates/_footer.html create mode 100644 src/docs/_templates/_header.html create mode 100755 src/docs/assets/css/custom.css create mode 100644 src/docs/index.html diff --git a/README.md b/README.md index 2df210f..b513440 100755 --- a/README.md +++ b/README.md @@ -26,12 +26,9 @@ Compiled and production-ready code can be found in the `dist` directory. The `sr ### 1. Include Smooth Scroll on your site. ```html - ``` -Smooth Scroll requires `bind-polyfill.js`, a polyfill that extends ECMAScript 5 API support to more browsers. - ### 2. Add the markup to your HTML. ```html @@ -66,7 +63,7 @@ You can install Smooth Scroll with your favorite package manager. ## Working with the Source Files -If you would prefer, you can work with the development code in the `src` directory using the included [Gulp build system](http://gulpjs.com/). This compiles, lints, and minifies code, and runs unit tests. +If you would prefer, you can work with the development code in the `src` directory using the included [Gulp build system](http://gulpjs.com/). This compiles, lints, and minifies code, and runs unit tests. It's the same build system that's used by [Kraken](http://cferdinandi.github.io/kraken/), so it includes some unnecessary tasks and Sass variables but can be dropped right in to the boilerplate without any configuration. ### Dependencies Make sure these are installed first. @@ -74,15 +71,15 @@ Make sure these are installed first. * [Node.js](http://nodejs.org) * [Ruby Sass](http://sass-lang.com/install) * [Gulp](http://gulpjs.com) `sudo npm install -g gulp` -* [PhantomJS](http://phantomjs.org) ### Quick Start 1. In bash/terminal/command line, `cd` into your project directory. 2. Run `npm install` to install required files. -3. When it's done installing, run `gulp` to get going. - -Every time you want to run your tasks, run `gulp`. +3. When it's done installing, run one of the task runners to get going: + * `gulp` manually compiles files. + * `gulp watch` automatically compiles files when changes are made. + * `gulp reload` automatically compiles files and applies changes using [LiveReload](http://livereload.com/). @@ -254,6 +251,9 @@ Smooth Scroll is licensed under the [MIT License](http://gomakethings.com/mit/). Smooth Scroll uses [semantic versioning](http://semver.org/). +* v5.1.4 - October 18, 2014 + * Removed `.bind` dependency and polyfill. + * Updated `gulpfile.js` tasks and namespacing. * v5.1.3 - September 29, 2014 * Fixed CommonJS module bug. * v5.1.2 - August 31, 2014 diff --git a/dist/js/bind-polyfill.js b/dist/js/bind-polyfill.js index 29bed1d..9362bd8 100644 --- a/dist/js/bind-polyfill.js +++ b/dist/js/bind-polyfill.js @@ -1,5 +1,5 @@ /** - * smooth-scroll v5.1.3 + * smooth-scroll v5.1.4 * Animate scrolling to anchor links, by Chris Ferdinandi. * http://github.com/cferdinandi/smooth-scroll * diff --git a/dist/js/bind-polyfill.min.js b/dist/js/bind-polyfill.min.js index 25b30dd..e3cf0df 100644 --- a/dist/js/bind-polyfill.min.js +++ b/dist/js/bind-polyfill.min.js @@ -1,2 +1,2 @@ -/** smooth-scroll v5.1.3, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ +/** smooth-scroll v5.1.4, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ Function.prototype.bind||(Function.prototype.bind=function(t){if("function"!=typeof this)throw new TypeError("Function.prototype.bind - what is trying to be bound is not callable");var o=Array.prototype.slice.call(arguments,1),n=this;return fNOP=function(){},fBound=function(){return n.apply(this instanceof fNOP&&t?this:t,o.concat(Array.prototype.slice.call(arguments)))},fNOP.prototype=this.prototype,fBound.prototype=new fNOP,fBound}); \ No newline at end of file diff --git a/dist/js/smooth-scroll.js b/dist/js/smooth-scroll.js index e50f19d..7fe8186 100755 --- a/dist/js/smooth-scroll.js +++ b/dist/js/smooth-scroll.js @@ -1,5 +1,5 @@ /** - * smooth-scroll v5.1.3 + * smooth-scroll v5.1.4 * Animate scrolling to anchor links, by Chris Ferdinandi. * http://github.com/cferdinandi/smooth-scroll * diff --git a/dist/js/smooth-scroll.min.js b/dist/js/smooth-scroll.min.js index c445e23..7ec1554 100755 --- a/dist/js/smooth-scroll.min.js +++ b/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ -/** smooth-scroll v5.1.3, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ +/** smooth-scroll v5.1.4, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ !function(t,e){"function"==typeof define&&define.amd?define("smoothScroll",e(t)):"object"==typeof exports?module.exports=e(t):t.smoothScroll=e(t)}(window||this,function(t){"use strict";var e,n={},o=!!document.querySelector&&!!t.addEventListener,r={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},a=function(t,e,n){if("[object Object]"===Object.prototype.toString.call(t))for(var o in t)Object.prototype.hasOwnProperty.call(t,o)&&e.call(n,t[o],o,t);else for(var r=0,a=t.length;a>r;r++)e.call(n,t[r],r,t)},c=function(t,e){var n={};return a(t,function(e,o){n[o]=t[o]}),a(e,function(t,o){n[o]=e[o]}),n},u=function(t,e){for(var n=e.charAt(0);t&&t!==document;t=t.parentNode)if("."===n){if(t.classList.contains(e.substr(1)))return t}else if("#"===n){if(t.id===e.substr(1))return t}else if("["===n&&t.hasAttribute(e.substr(1,e.length-2)))return t;return!1},i=function(t){for(var e,n=String(t),o=n.length,r=-1,a="",c=n.charCodeAt(0);++r=1&&31>=e||127==e||0===r&&e>=48&&57>=e||1===r&&e>=48&&57>=e&&45===c?"\\"+e.toString(16)+" ":e>=128||45===e||95===e||e>=48&&57>=e||e>=65&&90>=e||e>=97&&122>=e?n.charAt(r):"\\"+n.charAt(r)}return a},s=function(t,e){var n;return"easeInQuad"===t&&(n=e*e),"easeOutQuad"===t&&(n=e*(2-e)),"easeInOutQuad"===t&&(n=.5>e?2*e*e:-1+(4-2*e)*e),"easeInCubic"===t&&(n=e*e*e),"easeOutCubic"===t&&(n=--e*e*e+1),"easeInOutCubic"===t&&(n=.5>e?4*e*e*e:(e-1)*(2*e-2)*(2*e-2)+1),"easeInQuart"===t&&(n=e*e*e*e),"easeOutQuart"===t&&(n=1- --e*e*e*e),"easeInOutQuart"===t&&(n=.5>e?8*e*e*e*e:1-8*--e*e*e*e),"easeInQuint"===t&&(n=e*e*e*e*e),"easeOutQuint"===t&&(n=1+--e*e*e*e*e),"easeInOutQuint"===t&&(n=.5>e?16*e*e*e*e*e:1+16*--e*e*e*e*e),n||e},f=function(t,e,n){var o=0;if(t.offsetParent)do o+=t.offsetTop,t=t.offsetParent;while(t);return o=o-e-n,o>=0?o:0},l=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},d=function(t){return t&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(t):{}},h=function(t,e){history.pushState&&(e||"true"===e)&&history.pushState({pos:t.id},"",window.location.pathname+t)};n.animateScroll=function(e,n,o){var a=c(a||r,o||{}),u=d(e?e.getAttribute("data-options"):null);a=c(a,u),n="#"+i(n.substr(1));var p,m,b,v=document.querySelector("[data-scroll-header]"),g=null===v?0:v.offsetHeight+v.offsetTop,O=t.pageYOffset,y=f(document.querySelector(n),g,parseInt(a.offset,10)),I=y-O,S=l(),w=0;h(n,a.updateURL);var A=function(o,r,c){var u=t.pageYOffset;(o==r||u==r||t.innerHeight+u>=S)&&(clearInterval(c),a.callbackAfter(e,n))},Q=function(){w+=16,m=w/parseInt(a.speed,10),m=m>1?1:m,b=O+I*s(a.easing,m),t.scrollTo(0,Math.floor(b)),A(b,y,p)},C=function(){a.callbackBefore(e,n),p=setInterval(Q,16)};0===t.pageYOffset&&t.scrollTo(0,0),C()};var p=function(t){var o=u(t.target,"[data-scroll]");o&&"a"===o.tagName.toLowerCase()&&(t.preventDefault(),n.animateScroll(o,o.hash,e,t))};return n.destroy=function(){e&&(document.removeEventListener("click",p,!1),e=null)},n.init=function(t){o&&(n.destroy(),e=c(r,t||{}),document.addEventListener("click",p,!1))},n}); \ No newline at end of file diff --git a/docs/assets/css/custom.css b/docs/assets/css/custom.css new file mode 100755 index 0000000..653830a --- /dev/null +++ b/docs/assets/css/custom.css @@ -0,0 +1,20 @@ +@-webkit-viewport { width: device-width; zoom: 1.0; } +@-moz-viewport { width: device-width; zoom: 1.0; } +@-ms-viewport { width: device-width; zoom: 1.0; } +@-o-viewport { width: device-width; zoom: 1.0; } +@viewport { width: device-width; zoom: 1.0; } + +html { overflow-y: auto; } + +img, audio, video, canvas { + max-width: 100%; + height: auto; +} + +/* Sets body width */ +.container { + max-width: 40em; + width: 88%; + margin-left: auto; + margin-right: auto; +} \ No newline at end of file diff --git a/docs/dist/js/bind-polyfill.js b/docs/dist/js/bind-polyfill.js new file mode 100644 index 0000000..9362bd8 --- /dev/null +++ b/docs/dist/js/bind-polyfill.js @@ -0,0 +1,35 @@ +/** + * smooth-scroll v5.1.4 + * Animate scrolling to anchor links, by Chris Ferdinandi. + * http://github.com/cferdinandi/smooth-scroll + * + * Free to use under the MIT License. + * http://gomakethings.com/mit/ + */ + +/* + * Polyfill Function.prototype.bind support for otherwise ECMA Script 5 compliant browsers + * https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Function/bind#Compatibility + */ + +if (!Function.prototype.bind) { + Function.prototype.bind = function (oThis) { + if (typeof this !== "function") { + // closest thing possible to the ECMAScript 5 + // internal IsCallable function + throw new TypeError("Function.prototype.bind - what is trying to be bound is not callable"); + } + + var aArgs = Array.prototype.slice.call(arguments, 1); + var fToBind = this; + fNOP = function () {}; + fBound = function () { + return fToBind.apply(this instanceof fNOP && oThis ? this : oThis, aArgs.concat(Array.prototype.slice.call(arguments))); + }; + + fNOP.prototype = this.prototype; + fBound.prototype = new fNOP(); + + return fBound; + }; +} \ No newline at end of file diff --git a/docs/dist/js/bind-polyfill.min.js b/docs/dist/js/bind-polyfill.min.js new file mode 100644 index 0000000..e3cf0df --- /dev/null +++ b/docs/dist/js/bind-polyfill.min.js @@ -0,0 +1,2 @@ +/** smooth-scroll v5.1.4, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ +Function.prototype.bind||(Function.prototype.bind=function(t){if("function"!=typeof this)throw new TypeError("Function.prototype.bind - what is trying to be bound is not callable");var o=Array.prototype.slice.call(arguments,1),n=this;return fNOP=function(){},fBound=function(){return n.apply(this instanceof fNOP&&t?this:t,o.concat(Array.prototype.slice.call(arguments)))},fNOP.prototype=this.prototype,fBound.prototype=new fNOP,fBound}); \ No newline at end of file diff --git a/docs/dist/js/smooth-scroll.js b/docs/dist/js/smooth-scroll.js new file mode 100755 index 0000000..7fe8186 --- /dev/null +++ b/docs/dist/js/smooth-scroll.js @@ -0,0 +1,394 @@ +/** + * smooth-scroll v5.1.4 + * Animate scrolling to anchor links, by Chris Ferdinandi. + * http://github.com/cferdinandi/smooth-scroll + * + * Free to use under the MIT License. + * http://gomakethings.com/mit/ + */ + +(function (root, factory) { + if ( typeof define === 'function' && define.amd ) { + define('smoothScroll', factory(root)); + } else if ( typeof exports === 'object' ) { + module.exports = factory(root); + } else { + root.smoothScroll = factory(root); + } +})(window || this, function (root) { + + 'use strict'; + + // + // Variables + // + + var smoothScroll = {}; // Object for public APIs + var supports = !!document.querySelector && !!root.addEventListener; // Feature test + var settings; + + // Default settings + var defaults = { + speed: 500, + easing: 'easeInOutCubic', + offset: 0, + updateURL: true, + callbackBefore: function () {}, + callbackAfter: function () {} + }; + + + // + // Methods + // + + /** + * A simple forEach() implementation for Arrays, Objects and NodeLists + * @private + * @param {Array|Object|NodeList} collection Collection of items to iterate + * @param {Function} callback Callback function for each iteration + * @param {Array|Object|NodeList} scope Object/NodeList/Array that forEach is iterating over (aka `this`) + */ + var forEach = function (collection, callback, scope) { + if (Object.prototype.toString.call(collection) === '[object Object]') { + for (var prop in collection) { + if (Object.prototype.hasOwnProperty.call(collection, prop)) { + callback.call(scope, collection[prop], prop, collection); + } + } + } else { + for (var i = 0, len = collection.length; i < len; i++) { + callback.call(scope, collection[i], i, collection); + } + } + }; + + /** + * Merge defaults with user options + * @private + * @param {Object} defaults Default settings + * @param {Object} options User options + * @returns {Object} Merged values of defaults and options + */ + var extend = function ( defaults, options ) { + var extended = {}; + forEach(defaults, function (value, prop) { + extended[prop] = defaults[prop]; + }); + forEach(options, function (value, prop) { + extended[prop] = options[prop]; + }); + return extended; + }; + + /** + * Get the closest matching element up the DOM tree + * @param {Element} elem Starting element + * @param {String} selector Selector to match against (class, ID, or data attribute) + * @return {Boolean|Element} Returns false if not match found + */ + var getClosest = function (elem, selector) { + var firstChar = selector.charAt(0); + for ( ; elem && elem !== document; elem = elem.parentNode ) { + if ( firstChar === '.' ) { + if ( elem.classList.contains( selector.substr(1) ) ) { + return elem; + } + } else if ( firstChar === '#' ) { + if ( elem.id === selector.substr(1) ) { + return elem; + } + } else if ( firstChar === '[' ) { + if ( elem.hasAttribute( selector.substr(1, selector.length - 2) ) ) { + return elem; + } + } + } + return false; + }; + + /** + * Escape special characters for use with querySelector + * @private + * @param {String} id The anchor ID to escape + * @author Mathias Bynens + * @link https://github.com/mathiasbynens/CSS.escape + */ + var escapeCharacters = function ( id ) { + var string = String(id); + var length = string.length; + var index = -1; + var codeUnit; + var result = ''; + var firstCodeUnit = string.charCodeAt(0); + while (++index < length) { + codeUnit = string.charCodeAt(index); + // Note: there’s no need to special-case astral symbols, surrogate + // pairs, or lone surrogates. + + // If the character is NULL (U+0000), then throw an + // `InvalidCharacterError` exception and terminate these steps. + if (codeUnit === 0x0000) { + throw new InvalidCharacterError( + 'Invalid character: the input contains U+0000.' + ); + } + + if ( + // If the character is in the range [\1-\1F] (U+0001 to U+001F) or is + // U+007F, […] + (codeUnit >= 0x0001 && codeUnit <= 0x001F) || codeUnit == 0x007F || + // If the character is the first character and is in the range [0-9] + // (U+0030 to U+0039), […] + (index === 0 && codeUnit >= 0x0030 && codeUnit <= 0x0039) || + // If the character is the second character and is in the range [0-9] + // (U+0030 to U+0039) and the first character is a `-` (U+002D), […] + ( + index === 1 && + codeUnit >= 0x0030 && codeUnit <= 0x0039 && + firstCodeUnit === 0x002D + ) + ) { + // http://dev.w3.org/csswg/cssom/#escape-a-character-as-code-point + result += '\\' + codeUnit.toString(16) + ' '; + continue; + } + + // If the character is not handled by one of the above rules and is + // greater than or equal to U+0080, is `-` (U+002D) or `_` (U+005F), or + // is in one of the ranges [0-9] (U+0030 to U+0039), [A-Z] (U+0041 to + // U+005A), or [a-z] (U+0061 to U+007A), […] + if ( + codeUnit >= 0x0080 || + codeUnit === 0x002D || + codeUnit === 0x005F || + codeUnit >= 0x0030 && codeUnit <= 0x0039 || + codeUnit >= 0x0041 && codeUnit <= 0x005A || + codeUnit >= 0x0061 && codeUnit <= 0x007A + ) { + // the character itself + result += string.charAt(index); + continue; + } + + // Otherwise, the escaped character. + // http://dev.w3.org/csswg/cssom/#escape-a-character + result += '\\' + string.charAt(index); + + } + return result; + }; + + /** + * Calculate the easing pattern + * @private + * @link https://gist.github.com/gre/1650294 + * @param {String} type Easing pattern + * @param {Number} time Time animation should take to complete + * @returns {Number} + */ + var easingPattern = function ( type, time ) { + var pattern; + if ( type === 'easeInQuad' ) pattern = time * time; // accelerating from zero velocity + if ( type === 'easeOutQuad' ) pattern = time * (2 - time); // decelerating to zero velocity + if ( type === 'easeInOutQuad' ) pattern = time < 0.5 ? 2 * time * time : -1 + (4 - 2 * time) * time; // acceleration until halfway, then deceleration + if ( type === 'easeInCubic' ) pattern = time * time * time; // accelerating from zero velocity + if ( type === 'easeOutCubic' ) pattern = (--time) * time * time + 1; // decelerating to zero velocity + if ( type === 'easeInOutCubic' ) pattern = time < 0.5 ? 4 * time * time * time : (time - 1) * (2 * time - 2) * (2 * time - 2) + 1; // acceleration until halfway, then deceleration + if ( type === 'easeInQuart' ) pattern = time * time * time * time; // accelerating from zero velocity + if ( type === 'easeOutQuart' ) pattern = 1 - (--time) * time * time * time; // decelerating to zero velocity + if ( type === 'easeInOutQuart' ) pattern = time < 0.5 ? 8 * time * time * time * time : 1 - 8 * (--time) * time * time * time; // acceleration until halfway, then deceleration + if ( type === 'easeInQuint' ) pattern = time * time * time * time * time; // accelerating from zero velocity + if ( type === 'easeOutQuint' ) pattern = 1 + (--time) * time * time * time * time; // decelerating to zero velocity + if ( type === 'easeInOutQuint' ) pattern = time < 0.5 ? 16 * time * time * time * time * time : 1 + 16 * (--time) * time * time * time * time; // acceleration until halfway, then deceleration + return pattern || time; // no easing, no acceleration + }; + + /** + * Calculate how far to scroll + * @private + * @param {Element} anchor The anchor element to scroll to + * @param {Number} headerHeight Height of a fixed header, if any + * @param {Number} offset Number of pixels by which to offset scroll + * @returns {Number} + */ + var getEndLocation = function ( anchor, headerHeight, offset ) { + var location = 0; + if (anchor.offsetParent) { + do { + location += anchor.offsetTop; + anchor = anchor.offsetParent; + } while (anchor); + } + location = location - headerHeight - offset; + return location >= 0 ? location : 0; + }; + + /** + * Determine the document's height + * @private + * @returns {Number} + */ + var getDocumentHeight = function () { + return Math.max( + document.body.scrollHeight, document.documentElement.scrollHeight, + document.body.offsetHeight, document.documentElement.offsetHeight, + document.body.clientHeight, document.documentElement.clientHeight + ); + }; + + /** + * Convert data-options attribute into an object of key/value pairs + * @private + * @param {String} options Link-specific options as a data attribute string + * @returns {Object} + */ + var getDataOptions = function ( options ) { + return !options || !(typeof JSON === 'object' && typeof JSON.parse === 'function') ? {} : JSON.parse( options ); + }; + + /** + * Update the URL + * @private + * @param {Element} anchor The element to scroll to + * @param {Boolean} url Whether or not to update the URL history + */ + var updateUrl = function ( anchor, url ) { + if ( history.pushState && (url || url === 'true') ) { + history.pushState( { + pos: anchor.id + }, '', window.location.pathname + anchor ); + } + }; + + /** + * Start/stop the scrolling animation + * @public + * @param {Element} toggle The element that toggled the scroll event + * @param {Element} anchor The element to scroll to + * @param {Object} settings + * @param {Event} event + */ + smoothScroll.animateScroll = function ( toggle, anchor, options ) { + + // Options and overrides + var settings = extend( settings || defaults, options || {} ); // Merge user options with defaults + var overrides = getDataOptions( toggle ? toggle.getAttribute('data-options') : null ); + settings = extend( settings, overrides ); + anchor = '#' + escapeCharacters(anchor.substr(1)); // Escape special characters and leading numbers + + // Selectors and variables + var fixedHeader = document.querySelector('[data-scroll-header]'); // Get the fixed header + var headerHeight = fixedHeader === null ? 0 : (fixedHeader.offsetHeight + fixedHeader.offsetTop); // Get the height of a fixed header if one exists + var startLocation = root.pageYOffset; // Current location on the page + var endLocation = getEndLocation( document.querySelector(anchor), headerHeight, parseInt(settings.offset, 10) ); // Scroll to location + var animationInterval; // interval timer + var distance = endLocation - startLocation; // distance to travel + var documentHeight = getDocumentHeight(); + var timeLapsed = 0; + var percentage, position; + + // Update URL + updateUrl(anchor, settings.updateURL); + + /** + * Stop the scroll animation when it reaches its target (or the bottom/top of page) + * @private + * @param {Number} position Current position on the page + * @param {Number} endLocation Scroll to location + * @param {Number} animationInterval How much to scroll on this loop + */ + var stopAnimateScroll = function (position, endLocation, animationInterval) { + var currentLocation = root.pageYOffset; + if ( position == endLocation || currentLocation == endLocation || ( (root.innerHeight + currentLocation) >= documentHeight ) ) { + clearInterval(animationInterval); + settings.callbackAfter( toggle, anchor ); // Run callbacks after animation complete + } + }; + + /** + * Loop scrolling animation + * @private + */ + var loopAnimateScroll = function () { + timeLapsed += 16; + percentage = ( timeLapsed / parseInt(settings.speed, 10) ); + percentage = ( percentage > 1 ) ? 1 : percentage; + position = startLocation + ( distance * easingPattern(settings.easing, percentage) ); + root.scrollTo( 0, Math.floor(position) ); + stopAnimateScroll(position, endLocation, animationInterval); + }; + + /** + * Set interval timer + * @private + */ + var startAnimateScroll = function () { + settings.callbackBefore( toggle, anchor ); // Run callbacks before animating scroll + animationInterval = setInterval(loopAnimateScroll, 16); + }; + + /** + * Reset position to fix weird iOS bug + * @link https://github.com/cferdinandi/smooth-scroll/issues/45 + */ + if ( root.pageYOffset === 0 ) { + root.scrollTo( 0, 0 ); + } + + // Start scrolling animation + startAnimateScroll(); + + }; + + /** + * If smooth scroll element clicked, animate scroll + * @private + */ + var eventHandler = function (event) { + var toggle = getClosest(event.target, '[data-scroll]'); + if ( toggle && toggle.tagName.toLowerCase() === 'a' ) { + event.preventDefault(); // Prevent default click event + smoothScroll.animateScroll( toggle, toggle.hash, settings, event ); // Animate scroll + } + }; + + /** + * Destroy the current initialization. + * @public + */ + smoothScroll.destroy = function () { + if ( !settings ) return; + document.removeEventListener( 'click', eventHandler, false ); + settings = null; + }; + + /** + * Initialize Smooth Scroll + * @public + * @param {Object} options User settings + */ + smoothScroll.init = function ( options ) { + + // feature test + if ( !supports ) return; + + // Destroy any existing initializations + smoothScroll.destroy(); + + // Selectors and variables + settings = extend( defaults, options || {} ); // Merge user options with defaults + + // When a toggle is clicked, run the click handler + document.addEventListener('click', eventHandler, false); + + }; + + + // + // Public APIs + // + + return smoothScroll; + +}); diff --git a/docs/dist/js/smooth-scroll.min.js b/docs/dist/js/smooth-scroll.min.js new file mode 100755 index 0000000..7ec1554 --- /dev/null +++ b/docs/dist/js/smooth-scroll.min.js @@ -0,0 +1,2 @@ +/** smooth-scroll v5.1.4, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ +!function(t,e){"function"==typeof define&&define.amd?define("smoothScroll",e(t)):"object"==typeof exports?module.exports=e(t):t.smoothScroll=e(t)}(window||this,function(t){"use strict";var e,n={},o=!!document.querySelector&&!!t.addEventListener,r={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},a=function(t,e,n){if("[object Object]"===Object.prototype.toString.call(t))for(var o in t)Object.prototype.hasOwnProperty.call(t,o)&&e.call(n,t[o],o,t);else for(var r=0,a=t.length;a>r;r++)e.call(n,t[r],r,t)},c=function(t,e){var n={};return a(t,function(e,o){n[o]=t[o]}),a(e,function(t,o){n[o]=e[o]}),n},u=function(t,e){for(var n=e.charAt(0);t&&t!==document;t=t.parentNode)if("."===n){if(t.classList.contains(e.substr(1)))return t}else if("#"===n){if(t.id===e.substr(1))return t}else if("["===n&&t.hasAttribute(e.substr(1,e.length-2)))return t;return!1},i=function(t){for(var e,n=String(t),o=n.length,r=-1,a="",c=n.charCodeAt(0);++r=1&&31>=e||127==e||0===r&&e>=48&&57>=e||1===r&&e>=48&&57>=e&&45===c?"\\"+e.toString(16)+" ":e>=128||45===e||95===e||e>=48&&57>=e||e>=65&&90>=e||e>=97&&122>=e?n.charAt(r):"\\"+n.charAt(r)}return a},s=function(t,e){var n;return"easeInQuad"===t&&(n=e*e),"easeOutQuad"===t&&(n=e*(2-e)),"easeInOutQuad"===t&&(n=.5>e?2*e*e:-1+(4-2*e)*e),"easeInCubic"===t&&(n=e*e*e),"easeOutCubic"===t&&(n=--e*e*e+1),"easeInOutCubic"===t&&(n=.5>e?4*e*e*e:(e-1)*(2*e-2)*(2*e-2)+1),"easeInQuart"===t&&(n=e*e*e*e),"easeOutQuart"===t&&(n=1- --e*e*e*e),"easeInOutQuart"===t&&(n=.5>e?8*e*e*e*e:1-8*--e*e*e*e),"easeInQuint"===t&&(n=e*e*e*e*e),"easeOutQuint"===t&&(n=1+--e*e*e*e*e),"easeInOutQuint"===t&&(n=.5>e?16*e*e*e*e*e:1+16*--e*e*e*e*e),n||e},f=function(t,e,n){var o=0;if(t.offsetParent)do o+=t.offsetTop,t=t.offsetParent;while(t);return o=o-e-n,o>=0?o:0},l=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},d=function(t){return t&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(t):{}},h=function(t,e){history.pushState&&(e||"true"===e)&&history.pushState({pos:t.id},"",window.location.pathname+t)};n.animateScroll=function(e,n,o){var a=c(a||r,o||{}),u=d(e?e.getAttribute("data-options"):null);a=c(a,u),n="#"+i(n.substr(1));var p,m,b,v=document.querySelector("[data-scroll-header]"),g=null===v?0:v.offsetHeight+v.offsetTop,O=t.pageYOffset,y=f(document.querySelector(n),g,parseInt(a.offset,10)),I=y-O,S=l(),w=0;h(n,a.updateURL);var A=function(o,r,c){var u=t.pageYOffset;(o==r||u==r||t.innerHeight+u>=S)&&(clearInterval(c),a.callbackAfter(e,n))},Q=function(){w+=16,m=w/parseInt(a.speed,10),m=m>1?1:m,b=O+I*s(a.easing,m),t.scrollTo(0,Math.floor(b)),A(b,y,p)},C=function(){a.callbackBefore(e,n),p=setInterval(Q,16)};0===t.pageYOffset&&t.scrollTo(0,0),C()};var p=function(t){var o=u(t.target,"[data-scroll]");o&&"a"===o.tagName.toLowerCase()&&(t.preventDefault(),n.animateScroll(o,o.hash,e,t))};return n.destroy=function(){e&&(document.removeEventListener("click",p,!1),e=null)},n.init=function(t){o&&(n.destroy(),e=c(r,t||{}),document.addEventListener("click",p,!1))},n}); \ No newline at end of file diff --git a/docs/index.html b/docs/index.html new file mode 100644 index 0000000..adc9e8e --- /dev/null +++ b/docs/index.html @@ -0,0 +1,86 @@ + + + + + + Smooth Scroll + + + + + + + + +
+ + + +
+

+ Linear
+ Linear (no other options)
+

+ +

+ Ease-In
+ Quad
+ Cubic
+ Quart
+ Quint +

+ +

+ Ease-In-Out
+ Quad
+ Cubic
+ Quart
+ Quint +

+ +

+ Ease-Out
+ Quad
+ Cubic
+ Quart
+ Quint +

+ +

+ .
.
.
.
.
.
.
.
.
.
.
.
.
+ .
.
.
.
.
.
.
.
.
.
.
.
.
+ .
.
.
.
.
.
.
.
.
.
.
.
. +

+ +

Bazinga!

+ +

+ .
.
.
.
.
.
.
.
.
.
.
.
.
+ .
.
.
.
.
.
.
.
.
.
.
.
.
+ .
.
.
.
.
.
.
.
.
.
.
.
. +

+ +

Back to the top

+
+
+ + + + + + + + \ No newline at end of file diff --git a/gulpfile.js b/gulpfile.js index bfa3eb9..afc05d7 100755 --- a/gulpfile.js +++ b/gulpfile.js @@ -1,42 +1,83 @@ -// Gulp Packages +/** + * Gulp Packages + */ + +// General var gulp = require('gulp'); -var plumber = require('gulp-plumber'); -var clean = require('gulp-clean'); +var fs = require('fs'); +var del = require('del'); var lazypipe = require('lazypipe'); -var rename = require('gulp-rename'); +var plumber = require('gulp-plumber'); var flatten = require('gulp-flatten'); var tap = require('gulp-tap'); +var rename = require('gulp-rename'); var header = require('gulp-header'); +var footer = require('gulp-footer'); +var watch = require('gulp-watch'); +var livereload = require('gulp-livereload'); +var package = require('./package.json'); + +// Scripts and tests var jshint = require('gulp-jshint'); var stylish = require('jshint-stylish'); var concat = require('gulp-concat'); var uglify = require('gulp-uglify'); +var karma = require('gulp-karma'); + +// Styles var sass = require('gulp-ruby-sass'); var prefix = require('gulp-autoprefixer'); var minify = require('gulp-minify-css'); -var karma = require('gulp-karma'); -var package = require('./package.json'); -// Paths to project folders +// SVGs +var svgmin = require('gulp-svgmin'); +var svgstore = require('gulp-svgstore'); + +// Docs +var markdown = require('gulp-markdown'); +var fileinclude = require('gulp-file-include'); + + +/** + * Paths to project folders + */ + var paths = { - output : 'dist/', - scripts : { - input : [ 'src/js/*' ], - output : 'dist/js/' + input: 'src/**/*', + output: 'dist/', + scripts: { + input: 'src/js/*', + output: 'dist/js/' + }, + styles: { + input: 'src/sass/**/*.{scss,sass}', + output: 'dist/css/' }, - styles : { - input : 'src/sass/**/*.scss', - output : 'dist/css/' + svgs: { + input: 'src/svg/**/*.svg', + output: 'dist/svg/' }, - static : 'src/static/**', - test : { - spec : [ 'test/spec/**/*.js' ], + static: 'src/static/**', + test: { + input: 'src/js/**/*.js', + karma: 'test/karma.conf.js', + spec: 'test/spec/**/*.js', coverage: 'test/coverage/', results: 'test/results/' + }, + docs: { + input: 'src/docs/*.{html,md,markdown}', + output: 'docs/', + templates: 'src/docs/_templates/', + assets: 'src/docs/assets/**' } }; -// Template for banner to add to file headers + +/** + * Template for banner to add to file headers + */ + var banner = { full : '/**\n' + @@ -55,9 +96,13 @@ var banner = { ' */\n' }; -// Lint, minify, and concatenate scripts -gulp.task('scripts', ['clean'], function() { +/** + * Gulp Taks + */ + +// Lint, minify, and concatenate scripts +gulp.task('build:scripts', ['clean:dist'], function() { var jsTasks = lazypipe() .pipe(header, banner.full, { package : package }) .pipe(gulp.dest, paths.scripts.output) @@ -68,9 +113,8 @@ gulp.task('scripts', ['clean'], function() { return gulp.src(paths.scripts.input) .pipe(plumber()) - .pipe(flatten()) .pipe(tap(function (file, t) { - if ( file.stat.isDirectory() ) { + if ( file.isDirectory() ) { var name = file.relative + '.js'; return gulp.src(file.path + '/*.js') .pipe(concat(name)) @@ -81,10 +125,10 @@ gulp.task('scripts', ['clean'], function() { }); // Process, lint, and minify Sass files -gulp.task('styles', ['clean'], function() { +gulp.task('build:styles', ['clean:dist'], function() { return gulp.src(paths.styles.input) .pipe(plumber()) - .pipe(sass({style: 'expanded', noCache: true})) + .pipe(sass({style: 'expanded', noCache: true, 'sourcemap=none': true})) .pipe(flatten()) .pipe(prefix('last 2 version', '> 1%')) .pipe(header(banner.full, { package : package })) @@ -95,15 +139,27 @@ gulp.task('styles', ['clean'], function() { .pipe(gulp.dest(paths.styles.output)); }); +// Generate SVG sprites +gulp.task('build:svgs', ['clean:dist'], function () { + return gulp.src(paths.svgs.input) + .pipe(svgmin()) + .pipe(svgstore({ + fileName: 'icons.svg', + prefix: 'icon-', + inlineSvg: true + })) + .pipe(gulp.dest(paths.svgs.output)); +}); + // Copy static files into output folder -gulp.task('static', ['clean'], function() { +gulp.task('copy:static', ['clean:dist'], function() { return gulp.src(paths.static) .pipe(plumber()) .pipe(gulp.dest(paths.output)); }); // Lint scripts -gulp.task('lint', function () { +gulp.task('lint:scripts', function () { return gulp.src(paths.scripts.input) .pipe(plumber()) .pipe(jshint()) @@ -111,30 +167,146 @@ gulp.task('lint', function () { }); // Remove prexisting content from output and test folders -gulp.task('clean', function () { - return gulp.src([ - paths.output, - paths.test.coverage, - paths.test.results - ], { read: false }) - .pipe(plumber()) - .pipe(clean()); +gulp.task('clean:dist', function () { + del.sync([ + paths.output, + paths.test.coverage, + paths.test.results + ]); }); // Run unit tests -gulp.task('test', function() { - return gulp.src([paths.scripts.input + '/../**/*.js'].concat(paths.test.spec)) +gulp.task('test:scripts', function() { + return gulp.src([paths.test.input].concat([paths.test.spec])) .pipe(plumber()) - .pipe(karma({ configFile: 'test/karma.conf.js' })) + .pipe(karma({ configFile: paths.test.karma })) .on('error', function(err) { throw err; }); }); -// Combine tasks into runner +// Generate documentation +gulp.task('build:docs', ['default', 'clean:docs'], function() { + return gulp.src(paths.docs.input) + .pipe(plumber()) + .pipe(fileinclude({ + prefix: '@@', + basepath: '@file' + })) + .pipe(tap(function (file, t) { + if ( /\.md|\.markdown/.test(file.path) ) { + return t.through(markdown); + } + })) + .pipe(header(fs.readFileSync(paths.docs.templates + '/_header.html', 'utf8'))) + .pipe(footer(fs.readFileSync(paths.docs.templates + '/_footer.html', 'utf8'))) + .pipe(gulp.dest(paths.docs.output)); +}); + +// Copy distribution files to docs +gulp.task('copy:dist', ['default', 'clean:docs'], function() { + return gulp.src(paths.output + '/**') + .pipe(plumber()) + .pipe(gulp.dest(paths.docs.output + '/dist')); +}); + +// Copy documentation assets to docs +gulp.task('copy:assets', ['clean:docs'], function() { + return gulp.src(paths.docs.assets) + .pipe(plumber()) + .pipe(gulp.dest(paths.docs.output + '/assets')); +}); + +// Remove prexisting content from docs folder +gulp.task('clean:docs', function () { + return del.sync(paths.docs.output); +}); + +// Watch for changes to files +gulp.task('listen', function () { + watch(paths.input, function (files) { + gulp.start('default'); + }); +}); + +// Watch for changes to files and docs +gulp.task('listen:docs', function () { + watch(paths.input, function (files) { + gulp.start('docs'); + }); +}); + +// Spin up livereload server and listen for file changes +gulp.task('server', function () { + livereload.listen(); + watch(paths.input, function (files) { + gulp.start('default'); + gulp.start('refresh'); + }); +}); + +// Spin up livereload server and listen for file and documentation changes +gulp.task('server:docs', function () { + livereload.listen(); + watch(paths.input, function (files) { + gulp.start('docs'); + gulp.start('refresh:docs'); + }); +}); + +// Run livereload after file change +gulp.task('refresh', ['default'], function () { + livereload.changed(); +}); + +// Run livereload after file or documentation change +gulp.task('refresh:docs', ['docs'], function () { + livereload.changed(); +}); + + +/** + * Task Runners + */ + +// Compile files (default) gulp.task('default', [ - 'lint', - 'clean', - 'static', - 'scripts', - 'styles', - 'test' + 'lint:scripts', + 'clean:dist', + 'copy:static', + 'build:scripts', + 'build:svgs', + 'build:styles', + 'test:scripts' +]); + +// Compile files and generate documentation +gulp.task('docs', [ + 'default', + 'clean:docs', + 'build:docs', + 'copy:dist', + 'copy:assets' +]); + +// Compile files when something changes +gulp.task('watch', [ + 'listen', + 'default' +]); + +// Compile files and generate docs when something changes +gulp.task('watch:docs', [ + 'listen:docs', + 'docs' +]); + +// Compile files and livereload pages when something changes +gulp.task('reload', [ + 'server', + 'default' +]); + +// Compile files, generate docs, and livereload pages when something changes +gulp.task('reload:docs', [ + 'server:docs', + 'docs' ]); \ No newline at end of file diff --git a/package.json b/package.json index 3eeae53..410130b 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "smooth-scroll", - "version": "5.1.3", + "version": "5.1.4", "description": "Animate scrolling to anchor links", "main": "./dist/js/smooth-scroll.js", "author": { @@ -13,27 +13,34 @@ "url": "http://github.com/cferdinandi/smooth-scroll" }, "devDependencies": { - "gulp": "~3.8.0", - "gulp-autoprefixer": "0.0.7", - "gulp-clean": "^0.2.4", - "gulp-concat": "~2.2.0", - "gulp-flatten": "~0.0.2", - "gulp-tap": "~0.1.1", - "gulp-header": "^1.0.2", + "gulp": "^3.8.0", + "node-fs": "^0.1.7", + "del": "^0.1.3", + "lazypipe": "^0.2.2", + "gulp-plumber": "^0.6.2", + "gulp-flatten": "^0.0.2", + "gulp-tap": "^0.1.1", + "gulp-rename": "^1.1.0", + "gulp-header": "^1.1.1", + "gulp-footer": "^1.0.5", + "gulp-watch": "^1.1.0", + "gulp-livereload": "^2.1.1", "gulp-jshint": "^1.6.1", - "gulp-karma": "0.0.4", - "gulp-minify-css": "~0.3.4", - "gulp-plumber": "~0.6.2", - "gulp-rename": "~1.1.0", - "gulp-ruby-sass": "~0.7.1", - "gulp-uglify": "~0.3.0", "jshint-stylish": "^0.2.0", - "lazypipe": "0.2.2", - "karma": "^0.12.16", + "gulp-concat": "^2.2.0", + "gulp-uglify": "^0.3.0", + "gulp-karma": "^0.0.4", "karma-coverage": "^0.2.4", - "karma-jasmine": "~0.2.0", + "karma-jasmine": "^0.2.0", "karma-phantomjs-launcher": "^0.1.4", - "karma-spec-reporter": "0.0.13", - "karma-htmlfile-reporter": "~0.1" + "karma-spec-reporter": "^0.0.13", + "karma-htmlfile-reporter": "^0.1", + "gulp-ruby-sass": "^0.7.1", + "gulp-minify-css": "^0.3.4", + "gulp-autoprefixer": "^0.0.7", + "gulp-svgmin": "^0.4.6", + "gulp-svgstore": "^2.0.0", + "gulp-markdown": "^1.0.0", + "gulp-file-include": "^0.5.1" } } diff --git a/src/docs/_templates/_footer.html b/src/docs/_templates/_footer.html new file mode 100644 index 0000000..2a09fc0 --- /dev/null +++ b/src/docs/_templates/_footer.html @@ -0,0 +1,20 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/docs/_templates/_header.html b/src/docs/_templates/_header.html new file mode 100644 index 0000000..217d982 --- /dev/null +++ b/src/docs/_templates/_header.html @@ -0,0 +1,23 @@ + + + + + + Smooth Scroll + + + + + + + + +
+ + + +
diff --git a/src/docs/assets/css/custom.css b/src/docs/assets/css/custom.css new file mode 100755 index 0000000..653830a --- /dev/null +++ b/src/docs/assets/css/custom.css @@ -0,0 +1,20 @@ +@-webkit-viewport { width: device-width; zoom: 1.0; } +@-moz-viewport { width: device-width; zoom: 1.0; } +@-ms-viewport { width: device-width; zoom: 1.0; } +@-o-viewport { width: device-width; zoom: 1.0; } +@viewport { width: device-width; zoom: 1.0; } + +html { overflow-y: auto; } + +img, audio, video, canvas { + max-width: 100%; + height: auto; +} + +/* Sets body width */ +.container { + max-width: 40em; + width: 88%; + margin-left: auto; + margin-right: auto; +} \ No newline at end of file diff --git a/src/docs/index.html b/src/docs/index.html new file mode 100644 index 0000000..5925bb5 --- /dev/null +++ b/src/docs/index.html @@ -0,0 +1,44 @@ +

+ Linear
+ Linear (no other options)
+

+ +

+ Ease-In
+ Quad
+ Cubic
+ Quart
+ Quint +

+ +

+ Ease-In-Out
+ Quad
+ Cubic
+ Quart
+ Quint +

+ +

+ Ease-Out
+ Quad
+ Cubic
+ Quart
+ Quint +

+ +

+ .
.
.
.
.
.
.
.
.
.
.
.
.
+ .
.
.
.
.
.
.
.
.
.
.
.
.
+ .
.
.
.
.
.
.
.
.
.
.
.
. +

+ +

Bazinga!

+ +

+ .
.
.
.
.
.
.
.
.
.
.
.
.
+ .
.
.
.
.
.
.
.
.
.
.
.
.
+ .
.
.
.
.
.
.
.
.
.
.
.
. +

+ +

Back to the top

\ No newline at end of file From f38f5708c7684e9d62c69c76509dff76da73e43e Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Fri, 21 Nov 2014 21:19:11 -0500 Subject: [PATCH 115/285] Adds focus to anchor if it's a link --- README.md | 2 ++ dist/js/bind-polyfill.js | 35 ------------------------------- dist/js/bind-polyfill.min.js | 2 -- dist/js/smooth-scroll.js | 6 ++++-- dist/js/smooth-scroll.min.js | 4 ++-- docs/dist/js/bind-polyfill.js | 35 ------------------------------- docs/dist/js/bind-polyfill.min.js | 2 -- docs/dist/js/smooth-scroll.js | 6 ++++-- docs/dist/js/smooth-scroll.min.js | 4 ++-- package.json | 2 +- src/js/bind-polyfill.js | 26 ----------------------- src/js/smooth-scroll.js | 4 +++- 12 files changed, 18 insertions(+), 110 deletions(-) delete mode 100644 dist/js/bind-polyfill.js delete mode 100644 dist/js/bind-polyfill.min.js delete mode 100644 docs/dist/js/bind-polyfill.js delete mode 100644 docs/dist/js/bind-polyfill.min.js delete mode 100644 src/js/bind-polyfill.js diff --git a/README.md b/README.md index b513440..50c78e7 100755 --- a/README.md +++ b/README.md @@ -251,6 +251,8 @@ Smooth Scroll is licensed under the [MIT License](http://gomakethings.com/mit/). Smooth Scroll uses [semantic versioning](http://semver.org/). +* v5.2.0 - November 21, 2014 + * Add focus to scrolled to anchor if focusable. * v5.1.4 - October 18, 2014 * Removed `.bind` dependency and polyfill. * Updated `gulpfile.js` tasks and namespacing. diff --git a/dist/js/bind-polyfill.js b/dist/js/bind-polyfill.js deleted file mode 100644 index 9362bd8..0000000 --- a/dist/js/bind-polyfill.js +++ /dev/null @@ -1,35 +0,0 @@ -/** - * smooth-scroll v5.1.4 - * Animate scrolling to anchor links, by Chris Ferdinandi. - * http://github.com/cferdinandi/smooth-scroll - * - * Free to use under the MIT License. - * http://gomakethings.com/mit/ - */ - -/* - * Polyfill Function.prototype.bind support for otherwise ECMA Script 5 compliant browsers - * https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Function/bind#Compatibility - */ - -if (!Function.prototype.bind) { - Function.prototype.bind = function (oThis) { - if (typeof this !== "function") { - // closest thing possible to the ECMAScript 5 - // internal IsCallable function - throw new TypeError("Function.prototype.bind - what is trying to be bound is not callable"); - } - - var aArgs = Array.prototype.slice.call(arguments, 1); - var fToBind = this; - fNOP = function () {}; - fBound = function () { - return fToBind.apply(this instanceof fNOP && oThis ? this : oThis, aArgs.concat(Array.prototype.slice.call(arguments))); - }; - - fNOP.prototype = this.prototype; - fBound.prototype = new fNOP(); - - return fBound; - }; -} \ No newline at end of file diff --git a/dist/js/bind-polyfill.min.js b/dist/js/bind-polyfill.min.js deleted file mode 100644 index e3cf0df..0000000 --- a/dist/js/bind-polyfill.min.js +++ /dev/null @@ -1,2 +0,0 @@ -/** smooth-scroll v5.1.4, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ -Function.prototype.bind||(Function.prototype.bind=function(t){if("function"!=typeof this)throw new TypeError("Function.prototype.bind - what is trying to be bound is not callable");var o=Array.prototype.slice.call(arguments,1),n=this;return fNOP=function(){},fBound=function(){return n.apply(this instanceof fNOP&&t?this:t,o.concat(Array.prototype.slice.call(arguments)))},fNOP.prototype=this.prototype,fBound.prototype=new fNOP,fBound}); \ No newline at end of file diff --git a/dist/js/smooth-scroll.js b/dist/js/smooth-scroll.js index 7fe8186..a3cee52 100755 --- a/dist/js/smooth-scroll.js +++ b/dist/js/smooth-scroll.js @@ -1,5 +1,5 @@ /** - * smooth-scroll v5.1.4 + * smooth-scroll v5.2.0 * Animate scrolling to anchor links, by Chris Ferdinandi. * http://github.com/cferdinandi/smooth-scroll * @@ -278,10 +278,11 @@ anchor = '#' + escapeCharacters(anchor.substr(1)); // Escape special characters and leading numbers // Selectors and variables + var anchorElem = document.querySelector(anchor); var fixedHeader = document.querySelector('[data-scroll-header]'); // Get the fixed header var headerHeight = fixedHeader === null ? 0 : (fixedHeader.offsetHeight + fixedHeader.offsetTop); // Get the height of a fixed header if one exists var startLocation = root.pageYOffset; // Current location on the page - var endLocation = getEndLocation( document.querySelector(anchor), headerHeight, parseInt(settings.offset, 10) ); // Scroll to location + var endLocation = getEndLocation( anchorElem, headerHeight, parseInt(settings.offset, 10) ); // Scroll to location var animationInterval; // interval timer var distance = endLocation - startLocation; // distance to travel var documentHeight = getDocumentHeight(); @@ -302,6 +303,7 @@ var currentLocation = root.pageYOffset; if ( position == endLocation || currentLocation == endLocation || ( (root.innerHeight + currentLocation) >= documentHeight ) ) { clearInterval(animationInterval); + anchorElem.focus(); settings.callbackAfter( toggle, anchor ); // Run callbacks after animation complete } }; diff --git a/dist/js/smooth-scroll.min.js b/dist/js/smooth-scroll.min.js index 7ec1554..0917922 100755 --- a/dist/js/smooth-scroll.min.js +++ b/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ -/** smooth-scroll v5.1.4, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ -!function(t,e){"function"==typeof define&&define.amd?define("smoothScroll",e(t)):"object"==typeof exports?module.exports=e(t):t.smoothScroll=e(t)}(window||this,function(t){"use strict";var e,n={},o=!!document.querySelector&&!!t.addEventListener,r={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},a=function(t,e,n){if("[object Object]"===Object.prototype.toString.call(t))for(var o in t)Object.prototype.hasOwnProperty.call(t,o)&&e.call(n,t[o],o,t);else for(var r=0,a=t.length;a>r;r++)e.call(n,t[r],r,t)},c=function(t,e){var n={};return a(t,function(e,o){n[o]=t[o]}),a(e,function(t,o){n[o]=e[o]}),n},u=function(t,e){for(var n=e.charAt(0);t&&t!==document;t=t.parentNode)if("."===n){if(t.classList.contains(e.substr(1)))return t}else if("#"===n){if(t.id===e.substr(1))return t}else if("["===n&&t.hasAttribute(e.substr(1,e.length-2)))return t;return!1},i=function(t){for(var e,n=String(t),o=n.length,r=-1,a="",c=n.charCodeAt(0);++r=1&&31>=e||127==e||0===r&&e>=48&&57>=e||1===r&&e>=48&&57>=e&&45===c?"\\"+e.toString(16)+" ":e>=128||45===e||95===e||e>=48&&57>=e||e>=65&&90>=e||e>=97&&122>=e?n.charAt(r):"\\"+n.charAt(r)}return a},s=function(t,e){var n;return"easeInQuad"===t&&(n=e*e),"easeOutQuad"===t&&(n=e*(2-e)),"easeInOutQuad"===t&&(n=.5>e?2*e*e:-1+(4-2*e)*e),"easeInCubic"===t&&(n=e*e*e),"easeOutCubic"===t&&(n=--e*e*e+1),"easeInOutCubic"===t&&(n=.5>e?4*e*e*e:(e-1)*(2*e-2)*(2*e-2)+1),"easeInQuart"===t&&(n=e*e*e*e),"easeOutQuart"===t&&(n=1- --e*e*e*e),"easeInOutQuart"===t&&(n=.5>e?8*e*e*e*e:1-8*--e*e*e*e),"easeInQuint"===t&&(n=e*e*e*e*e),"easeOutQuint"===t&&(n=1+--e*e*e*e*e),"easeInOutQuint"===t&&(n=.5>e?16*e*e*e*e*e:1+16*--e*e*e*e*e),n||e},f=function(t,e,n){var o=0;if(t.offsetParent)do o+=t.offsetTop,t=t.offsetParent;while(t);return o=o-e-n,o>=0?o:0},l=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},d=function(t){return t&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(t):{}},h=function(t,e){history.pushState&&(e||"true"===e)&&history.pushState({pos:t.id},"",window.location.pathname+t)};n.animateScroll=function(e,n,o){var a=c(a||r,o||{}),u=d(e?e.getAttribute("data-options"):null);a=c(a,u),n="#"+i(n.substr(1));var p,m,b,v=document.querySelector("[data-scroll-header]"),g=null===v?0:v.offsetHeight+v.offsetTop,O=t.pageYOffset,y=f(document.querySelector(n),g,parseInt(a.offset,10)),I=y-O,S=l(),w=0;h(n,a.updateURL);var A=function(o,r,c){var u=t.pageYOffset;(o==r||u==r||t.innerHeight+u>=S)&&(clearInterval(c),a.callbackAfter(e,n))},Q=function(){w+=16,m=w/parseInt(a.speed,10),m=m>1?1:m,b=O+I*s(a.easing,m),t.scrollTo(0,Math.floor(b)),A(b,y,p)},C=function(){a.callbackBefore(e,n),p=setInterval(Q,16)};0===t.pageYOffset&&t.scrollTo(0,0),C()};var p=function(t){var o=u(t.target,"[data-scroll]");o&&"a"===o.tagName.toLowerCase()&&(t.preventDefault(),n.animateScroll(o,o.hash,e,t))};return n.destroy=function(){e&&(document.removeEventListener("click",p,!1),e=null)},n.init=function(t){o&&(n.destroy(),e=c(r,t||{}),document.addEventListener("click",p,!1))},n}); \ No newline at end of file +/** smooth-scroll v5.2.0, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ +!function(t,e){"function"==typeof define&&define.amd?define("smoothScroll",e(t)):"object"==typeof exports?module.exports=e(t):t.smoothScroll=e(t)}(window||this,function(t){"use strict";var e,n={},o=!!document.querySelector&&!!t.addEventListener,r={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},a=function(t,e,n){if("[object Object]"===Object.prototype.toString.call(t))for(var o in t)Object.prototype.hasOwnProperty.call(t,o)&&e.call(n,t[o],o,t);else for(var r=0,a=t.length;a>r;r++)e.call(n,t[r],r,t)},c=function(t,e){var n={};return a(t,function(e,o){n[o]=t[o]}),a(e,function(t,o){n[o]=e[o]}),n},u=function(t,e){for(var n=e.charAt(0);t&&t!==document;t=t.parentNode)if("."===n){if(t.classList.contains(e.substr(1)))return t}else if("#"===n){if(t.id===e.substr(1))return t}else if("["===n&&t.hasAttribute(e.substr(1,e.length-2)))return t;return!1},i=function(t){for(var e,n=String(t),o=n.length,r=-1,a="",c=n.charCodeAt(0);++r=1&&31>=e||127==e||0===r&&e>=48&&57>=e||1===r&&e>=48&&57>=e&&45===c?"\\"+e.toString(16)+" ":e>=128||45===e||95===e||e>=48&&57>=e||e>=65&&90>=e||e>=97&&122>=e?n.charAt(r):"\\"+n.charAt(r)}return a},s=function(t,e){var n;return"easeInQuad"===t&&(n=e*e),"easeOutQuad"===t&&(n=e*(2-e)),"easeInOutQuad"===t&&(n=.5>e?2*e*e:-1+(4-2*e)*e),"easeInCubic"===t&&(n=e*e*e),"easeOutCubic"===t&&(n=--e*e*e+1),"easeInOutCubic"===t&&(n=.5>e?4*e*e*e:(e-1)*(2*e-2)*(2*e-2)+1),"easeInQuart"===t&&(n=e*e*e*e),"easeOutQuart"===t&&(n=1- --e*e*e*e),"easeInOutQuart"===t&&(n=.5>e?8*e*e*e*e:1-8*--e*e*e*e),"easeInQuint"===t&&(n=e*e*e*e*e),"easeOutQuint"===t&&(n=1+--e*e*e*e*e),"easeInOutQuint"===t&&(n=.5>e?16*e*e*e*e*e:1+16*--e*e*e*e*e),n||e},f=function(t,e,n){var o=0;if(t.offsetParent)do o+=t.offsetTop,t=t.offsetParent;while(t);return o=o-e-n,o>=0?o:0},l=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},d=function(t){return t&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(t):{}},h=function(t,e){history.pushState&&(e||"true"===e)&&history.pushState({pos:t.id},"",window.location.pathname+t)};n.animateScroll=function(e,n,o){var a=c(a||r,o||{}),u=d(e?e.getAttribute("data-options"):null);a=c(a,u),n="#"+i(n.substr(1));var p,m,b,v=document.querySelector(n),g=document.querySelector("[data-scroll-header]"),O=null===g?0:g.offsetHeight+g.offsetTop,y=t.pageYOffset,I=f(v,O,parseInt(a.offset,10)),S=I-y,w=l(),A=0;h(n,a.updateURL);var Q=function(o,r,c){var u=t.pageYOffset;(o==r||u==r||t.innerHeight+u>=w)&&(clearInterval(c),v.focus(),a.callbackAfter(e,n))},C=function(){A+=16,m=A/parseInt(a.speed,10),m=m>1?1:m,b=y+S*s(a.easing,m),t.scrollTo(0,Math.floor(b)),Q(b,I,p)},H=function(){a.callbackBefore(e,n),p=setInterval(C,16)};0===t.pageYOffset&&t.scrollTo(0,0),H()};var p=function(t){var o=u(t.target,"[data-scroll]");o&&"a"===o.tagName.toLowerCase()&&(t.preventDefault(),n.animateScroll(o,o.hash,e,t))};return n.destroy=function(){e&&(document.removeEventListener("click",p,!1),e=null)},n.init=function(t){o&&(n.destroy(),e=c(r,t||{}),document.addEventListener("click",p,!1))},n}); \ No newline at end of file diff --git a/docs/dist/js/bind-polyfill.js b/docs/dist/js/bind-polyfill.js deleted file mode 100644 index 9362bd8..0000000 --- a/docs/dist/js/bind-polyfill.js +++ /dev/null @@ -1,35 +0,0 @@ -/** - * smooth-scroll v5.1.4 - * Animate scrolling to anchor links, by Chris Ferdinandi. - * http://github.com/cferdinandi/smooth-scroll - * - * Free to use under the MIT License. - * http://gomakethings.com/mit/ - */ - -/* - * Polyfill Function.prototype.bind support for otherwise ECMA Script 5 compliant browsers - * https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Function/bind#Compatibility - */ - -if (!Function.prototype.bind) { - Function.prototype.bind = function (oThis) { - if (typeof this !== "function") { - // closest thing possible to the ECMAScript 5 - // internal IsCallable function - throw new TypeError("Function.prototype.bind - what is trying to be bound is not callable"); - } - - var aArgs = Array.prototype.slice.call(arguments, 1); - var fToBind = this; - fNOP = function () {}; - fBound = function () { - return fToBind.apply(this instanceof fNOP && oThis ? this : oThis, aArgs.concat(Array.prototype.slice.call(arguments))); - }; - - fNOP.prototype = this.prototype; - fBound.prototype = new fNOP(); - - return fBound; - }; -} \ No newline at end of file diff --git a/docs/dist/js/bind-polyfill.min.js b/docs/dist/js/bind-polyfill.min.js deleted file mode 100644 index e3cf0df..0000000 --- a/docs/dist/js/bind-polyfill.min.js +++ /dev/null @@ -1,2 +0,0 @@ -/** smooth-scroll v5.1.4, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ -Function.prototype.bind||(Function.prototype.bind=function(t){if("function"!=typeof this)throw new TypeError("Function.prototype.bind - what is trying to be bound is not callable");var o=Array.prototype.slice.call(arguments,1),n=this;return fNOP=function(){},fBound=function(){return n.apply(this instanceof fNOP&&t?this:t,o.concat(Array.prototype.slice.call(arguments)))},fNOP.prototype=this.prototype,fBound.prototype=new fNOP,fBound}); \ No newline at end of file diff --git a/docs/dist/js/smooth-scroll.js b/docs/dist/js/smooth-scroll.js index 7fe8186..a3cee52 100755 --- a/docs/dist/js/smooth-scroll.js +++ b/docs/dist/js/smooth-scroll.js @@ -1,5 +1,5 @@ /** - * smooth-scroll v5.1.4 + * smooth-scroll v5.2.0 * Animate scrolling to anchor links, by Chris Ferdinandi. * http://github.com/cferdinandi/smooth-scroll * @@ -278,10 +278,11 @@ anchor = '#' + escapeCharacters(anchor.substr(1)); // Escape special characters and leading numbers // Selectors and variables + var anchorElem = document.querySelector(anchor); var fixedHeader = document.querySelector('[data-scroll-header]'); // Get the fixed header var headerHeight = fixedHeader === null ? 0 : (fixedHeader.offsetHeight + fixedHeader.offsetTop); // Get the height of a fixed header if one exists var startLocation = root.pageYOffset; // Current location on the page - var endLocation = getEndLocation( document.querySelector(anchor), headerHeight, parseInt(settings.offset, 10) ); // Scroll to location + var endLocation = getEndLocation( anchorElem, headerHeight, parseInt(settings.offset, 10) ); // Scroll to location var animationInterval; // interval timer var distance = endLocation - startLocation; // distance to travel var documentHeight = getDocumentHeight(); @@ -302,6 +303,7 @@ var currentLocation = root.pageYOffset; if ( position == endLocation || currentLocation == endLocation || ( (root.innerHeight + currentLocation) >= documentHeight ) ) { clearInterval(animationInterval); + anchorElem.focus(); settings.callbackAfter( toggle, anchor ); // Run callbacks after animation complete } }; diff --git a/docs/dist/js/smooth-scroll.min.js b/docs/dist/js/smooth-scroll.min.js index 7ec1554..0917922 100755 --- a/docs/dist/js/smooth-scroll.min.js +++ b/docs/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ -/** smooth-scroll v5.1.4, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ -!function(t,e){"function"==typeof define&&define.amd?define("smoothScroll",e(t)):"object"==typeof exports?module.exports=e(t):t.smoothScroll=e(t)}(window||this,function(t){"use strict";var e,n={},o=!!document.querySelector&&!!t.addEventListener,r={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},a=function(t,e,n){if("[object Object]"===Object.prototype.toString.call(t))for(var o in t)Object.prototype.hasOwnProperty.call(t,o)&&e.call(n,t[o],o,t);else for(var r=0,a=t.length;a>r;r++)e.call(n,t[r],r,t)},c=function(t,e){var n={};return a(t,function(e,o){n[o]=t[o]}),a(e,function(t,o){n[o]=e[o]}),n},u=function(t,e){for(var n=e.charAt(0);t&&t!==document;t=t.parentNode)if("."===n){if(t.classList.contains(e.substr(1)))return t}else if("#"===n){if(t.id===e.substr(1))return t}else if("["===n&&t.hasAttribute(e.substr(1,e.length-2)))return t;return!1},i=function(t){for(var e,n=String(t),o=n.length,r=-1,a="",c=n.charCodeAt(0);++r=1&&31>=e||127==e||0===r&&e>=48&&57>=e||1===r&&e>=48&&57>=e&&45===c?"\\"+e.toString(16)+" ":e>=128||45===e||95===e||e>=48&&57>=e||e>=65&&90>=e||e>=97&&122>=e?n.charAt(r):"\\"+n.charAt(r)}return a},s=function(t,e){var n;return"easeInQuad"===t&&(n=e*e),"easeOutQuad"===t&&(n=e*(2-e)),"easeInOutQuad"===t&&(n=.5>e?2*e*e:-1+(4-2*e)*e),"easeInCubic"===t&&(n=e*e*e),"easeOutCubic"===t&&(n=--e*e*e+1),"easeInOutCubic"===t&&(n=.5>e?4*e*e*e:(e-1)*(2*e-2)*(2*e-2)+1),"easeInQuart"===t&&(n=e*e*e*e),"easeOutQuart"===t&&(n=1- --e*e*e*e),"easeInOutQuart"===t&&(n=.5>e?8*e*e*e*e:1-8*--e*e*e*e),"easeInQuint"===t&&(n=e*e*e*e*e),"easeOutQuint"===t&&(n=1+--e*e*e*e*e),"easeInOutQuint"===t&&(n=.5>e?16*e*e*e*e*e:1+16*--e*e*e*e*e),n||e},f=function(t,e,n){var o=0;if(t.offsetParent)do o+=t.offsetTop,t=t.offsetParent;while(t);return o=o-e-n,o>=0?o:0},l=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},d=function(t){return t&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(t):{}},h=function(t,e){history.pushState&&(e||"true"===e)&&history.pushState({pos:t.id},"",window.location.pathname+t)};n.animateScroll=function(e,n,o){var a=c(a||r,o||{}),u=d(e?e.getAttribute("data-options"):null);a=c(a,u),n="#"+i(n.substr(1));var p,m,b,v=document.querySelector("[data-scroll-header]"),g=null===v?0:v.offsetHeight+v.offsetTop,O=t.pageYOffset,y=f(document.querySelector(n),g,parseInt(a.offset,10)),I=y-O,S=l(),w=0;h(n,a.updateURL);var A=function(o,r,c){var u=t.pageYOffset;(o==r||u==r||t.innerHeight+u>=S)&&(clearInterval(c),a.callbackAfter(e,n))},Q=function(){w+=16,m=w/parseInt(a.speed,10),m=m>1?1:m,b=O+I*s(a.easing,m),t.scrollTo(0,Math.floor(b)),A(b,y,p)},C=function(){a.callbackBefore(e,n),p=setInterval(Q,16)};0===t.pageYOffset&&t.scrollTo(0,0),C()};var p=function(t){var o=u(t.target,"[data-scroll]");o&&"a"===o.tagName.toLowerCase()&&(t.preventDefault(),n.animateScroll(o,o.hash,e,t))};return n.destroy=function(){e&&(document.removeEventListener("click",p,!1),e=null)},n.init=function(t){o&&(n.destroy(),e=c(r,t||{}),document.addEventListener("click",p,!1))},n}); \ No newline at end of file +/** smooth-scroll v5.2.0, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ +!function(t,e){"function"==typeof define&&define.amd?define("smoothScroll",e(t)):"object"==typeof exports?module.exports=e(t):t.smoothScroll=e(t)}(window||this,function(t){"use strict";var e,n={},o=!!document.querySelector&&!!t.addEventListener,r={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},a=function(t,e,n){if("[object Object]"===Object.prototype.toString.call(t))for(var o in t)Object.prototype.hasOwnProperty.call(t,o)&&e.call(n,t[o],o,t);else for(var r=0,a=t.length;a>r;r++)e.call(n,t[r],r,t)},c=function(t,e){var n={};return a(t,function(e,o){n[o]=t[o]}),a(e,function(t,o){n[o]=e[o]}),n},u=function(t,e){for(var n=e.charAt(0);t&&t!==document;t=t.parentNode)if("."===n){if(t.classList.contains(e.substr(1)))return t}else if("#"===n){if(t.id===e.substr(1))return t}else if("["===n&&t.hasAttribute(e.substr(1,e.length-2)))return t;return!1},i=function(t){for(var e,n=String(t),o=n.length,r=-1,a="",c=n.charCodeAt(0);++r=1&&31>=e||127==e||0===r&&e>=48&&57>=e||1===r&&e>=48&&57>=e&&45===c?"\\"+e.toString(16)+" ":e>=128||45===e||95===e||e>=48&&57>=e||e>=65&&90>=e||e>=97&&122>=e?n.charAt(r):"\\"+n.charAt(r)}return a},s=function(t,e){var n;return"easeInQuad"===t&&(n=e*e),"easeOutQuad"===t&&(n=e*(2-e)),"easeInOutQuad"===t&&(n=.5>e?2*e*e:-1+(4-2*e)*e),"easeInCubic"===t&&(n=e*e*e),"easeOutCubic"===t&&(n=--e*e*e+1),"easeInOutCubic"===t&&(n=.5>e?4*e*e*e:(e-1)*(2*e-2)*(2*e-2)+1),"easeInQuart"===t&&(n=e*e*e*e),"easeOutQuart"===t&&(n=1- --e*e*e*e),"easeInOutQuart"===t&&(n=.5>e?8*e*e*e*e:1-8*--e*e*e*e),"easeInQuint"===t&&(n=e*e*e*e*e),"easeOutQuint"===t&&(n=1+--e*e*e*e*e),"easeInOutQuint"===t&&(n=.5>e?16*e*e*e*e*e:1+16*--e*e*e*e*e),n||e},f=function(t,e,n){var o=0;if(t.offsetParent)do o+=t.offsetTop,t=t.offsetParent;while(t);return o=o-e-n,o>=0?o:0},l=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},d=function(t){return t&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(t):{}},h=function(t,e){history.pushState&&(e||"true"===e)&&history.pushState({pos:t.id},"",window.location.pathname+t)};n.animateScroll=function(e,n,o){var a=c(a||r,o||{}),u=d(e?e.getAttribute("data-options"):null);a=c(a,u),n="#"+i(n.substr(1));var p,m,b,v=document.querySelector(n),g=document.querySelector("[data-scroll-header]"),O=null===g?0:g.offsetHeight+g.offsetTop,y=t.pageYOffset,I=f(v,O,parseInt(a.offset,10)),S=I-y,w=l(),A=0;h(n,a.updateURL);var Q=function(o,r,c){var u=t.pageYOffset;(o==r||u==r||t.innerHeight+u>=w)&&(clearInterval(c),v.focus(),a.callbackAfter(e,n))},C=function(){A+=16,m=A/parseInt(a.speed,10),m=m>1?1:m,b=y+S*s(a.easing,m),t.scrollTo(0,Math.floor(b)),Q(b,I,p)},H=function(){a.callbackBefore(e,n),p=setInterval(C,16)};0===t.pageYOffset&&t.scrollTo(0,0),H()};var p=function(t){var o=u(t.target,"[data-scroll]");o&&"a"===o.tagName.toLowerCase()&&(t.preventDefault(),n.animateScroll(o,o.hash,e,t))};return n.destroy=function(){e&&(document.removeEventListener("click",p,!1),e=null)},n.init=function(t){o&&(n.destroy(),e=c(r,t||{}),document.addEventListener("click",p,!1))},n}); \ No newline at end of file diff --git a/package.json b/package.json index 410130b..bf49b14 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "smooth-scroll", - "version": "5.1.4", + "version": "5.2.0", "description": "Animate scrolling to anchor links", "main": "./dist/js/smooth-scroll.js", "author": { diff --git a/src/js/bind-polyfill.js b/src/js/bind-polyfill.js deleted file mode 100644 index e6a8f6b..0000000 --- a/src/js/bind-polyfill.js +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Polyfill Function.prototype.bind support for otherwise ECMA Script 5 compliant browsers - * https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Function/bind#Compatibility - */ - -if (!Function.prototype.bind) { - Function.prototype.bind = function (oThis) { - if (typeof this !== "function") { - // closest thing possible to the ECMAScript 5 - // internal IsCallable function - throw new TypeError("Function.prototype.bind - what is trying to be bound is not callable"); - } - - var aArgs = Array.prototype.slice.call(arguments, 1); - var fToBind = this; - fNOP = function () {}; - fBound = function () { - return fToBind.apply(this instanceof fNOP && oThis ? this : oThis, aArgs.concat(Array.prototype.slice.call(arguments))); - }; - - fNOP.prototype = this.prototype; - fBound.prototype = new fNOP(); - - return fBound; - }; -} \ No newline at end of file diff --git a/src/js/smooth-scroll.js b/src/js/smooth-scroll.js index 851e9f3..aa748ec 100755 --- a/src/js/smooth-scroll.js +++ b/src/js/smooth-scroll.js @@ -269,10 +269,11 @@ anchor = '#' + escapeCharacters(anchor.substr(1)); // Escape special characters and leading numbers // Selectors and variables + var anchorElem = document.querySelector(anchor); var fixedHeader = document.querySelector('[data-scroll-header]'); // Get the fixed header var headerHeight = fixedHeader === null ? 0 : (fixedHeader.offsetHeight + fixedHeader.offsetTop); // Get the height of a fixed header if one exists var startLocation = root.pageYOffset; // Current location on the page - var endLocation = getEndLocation( document.querySelector(anchor), headerHeight, parseInt(settings.offset, 10) ); // Scroll to location + var endLocation = getEndLocation( anchorElem, headerHeight, parseInt(settings.offset, 10) ); // Scroll to location var animationInterval; // interval timer var distance = endLocation - startLocation; // distance to travel var documentHeight = getDocumentHeight(); @@ -293,6 +294,7 @@ var currentLocation = root.pageYOffset; if ( position == endLocation || currentLocation == endLocation || ( (root.innerHeight + currentLocation) >= documentHeight ) ) { clearInterval(animationInterval); + anchorElem.focus(); settings.callbackAfter( toggle, anchor ); // Run callbacks after animation complete } }; From bbc737c7bfbfb3d0fe2a0d27455368ba21275e08 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Fri, 21 Nov 2014 22:23:51 -0500 Subject: [PATCH 116/285] updated gulpfile --- gulpfile.js | 104 +++++++++++++++++++++------------------------------- 1 file changed, 41 insertions(+), 63 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index afc05d7..2e03dbe 100755 --- a/gulpfile.js +++ b/gulpfile.js @@ -54,7 +54,7 @@ var paths = { output: 'dist/css/' }, svgs: { - input: 'src/svg/**/*.svg', + input: 'src/svg/*', output: 'dist/svg/' }, static: 'src/static/**', @@ -142,6 +142,20 @@ gulp.task('build:styles', ['clean:dist'], function() { // Generate SVG sprites gulp.task('build:svgs', ['clean:dist'], function () { return gulp.src(paths.svgs.input) + .pipe(plumber()) + .pipe(tap(function (file, t) { + if ( file.isDirectory() ) { + var name = file.relative + '.svg'; + return gulp.src(file.path + '/*.svg') + .pipe(svgmin()) + .pipe(svgstore({ + fileName: name, + prefix: 'icon-', + inlineSvg: true + })) + .pipe(gulp.dest(paths.svgs.output)); + } + })) .pipe(svgmin()) .pipe(svgstore({ fileName: 'icons.svg', @@ -184,7 +198,7 @@ gulp.task('test:scripts', function() { }); // Generate documentation -gulp.task('build:docs', ['default', 'clean:docs'], function() { +gulp.task('build:docs', ['compile', 'clean:docs'], function() { return gulp.src(paths.docs.input) .pipe(plumber()) .pipe(fileinclude({ @@ -202,7 +216,7 @@ gulp.task('build:docs', ['default', 'clean:docs'], function() { }); // Copy distribution files to docs -gulp.task('copy:dist', ['default', 'clean:docs'], function() { +gulp.task('copy:dist', ['compile', 'clean:docs'], function() { return gulp.src(paths.output + '/**') .pipe(plumber()) .pipe(gulp.dest(paths.docs.output + '/dist')); @@ -220,46 +234,18 @@ gulp.task('clean:docs', function () { return del.sync(paths.docs.output); }); -// Watch for changes to files -gulp.task('listen', function () { - watch(paths.input, function (files) { - gulp.start('default'); - }); -}); - -// Watch for changes to files and docs -gulp.task('listen:docs', function () { - watch(paths.input, function (files) { - gulp.start('docs'); - }); -}); - // Spin up livereload server and listen for file changes -gulp.task('server', function () { - livereload.listen(); - watch(paths.input, function (files) { - gulp.start('default'); - gulp.start('refresh'); - }); -}); - -// Spin up livereload server and listen for file and documentation changes -gulp.task('server:docs', function () { - livereload.listen(); - watch(paths.input, function (files) { - gulp.start('docs'); - gulp.start('refresh:docs'); - }); +gulp.task('listen', function () { + livereload.listen(); + gulp.watch(paths.input).on('change', function(file) { + gulp.start('default'); + gulp.start('refresh'); + }); }); // Run livereload after file change -gulp.task('refresh', ['default'], function () { - livereload.changed(); -}); - -// Run livereload after file or documentation change -gulp.task('refresh:docs', ['docs'], function () { - livereload.changed(); +gulp.task('refresh', ['compile', 'docs'], function () { + livereload.changed(); }); @@ -267,46 +253,38 @@ gulp.task('refresh:docs', ['docs'], function () { * Task Runners */ -// Compile files (default) -gulp.task('default', [ +// Compile files +gulp.task('compile', [ 'lint:scripts', 'clean:dist', 'copy:static', 'build:scripts', 'build:svgs', - 'build:styles', - 'test:scripts' + 'build:styles' ]); -// Compile files and generate documentation +// Generate documentation gulp.task('docs', [ - 'default', 'clean:docs', 'build:docs', 'copy:dist', 'copy:assets' ]); -// Compile files when something changes -gulp.task('watch', [ - 'listen', - 'default' -]); - -// Compile files and generate docs when something changes -gulp.task('watch:docs', [ - 'listen:docs', - 'docs' +// Generate documentation +gulp.task('tests', [ + 'test:scripts' ]); -// Compile files and livereload pages when something changes -gulp.task('reload', [ - 'server', - 'default' +// Compile files, generate docs, and run unit tests (default) +gulp.task('default', [ + 'compile', + 'docs', + 'tests' ]); -// Compile files, generate docs, and livereload pages when something changes -gulp.task('reload:docs', [ - 'server:docs', - 'docs' +// Compile files, generate docs, and run unit tests when something changes +gulp.task('watch', [ + 'listen', + 'default' ]); \ No newline at end of file From baeab0710167c764e98f180e15ec3687ad59f4eb Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Mon, 24 Nov 2014 12:07:54 -0500 Subject: [PATCH 117/285] Updated readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 50c78e7..db1f31d 100755 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # Smooth Scroll [![Build Status](https://travis-ci.org/cferdinandi/smooth-scroll.svg)](https://travis-ci.org/cferdinandi/smooth-scroll) -A lightweight script to animate scrolling to anchor links. +A lightweight script to animate scrolling to anchor links. Smooth Scroll works great with [Gumshoe](https://github.com/cferdinandi/gumshoe). [Download Smooth Scroll](https://github.com/cferdinandi/smooth-scroll/archive/master.zip) / [View the demo](http://cferdinandi.github.io/smooth-scroll/) From defea915e6bc0c42837e8ea57e8c526651a3f0e4 Mon Sep 17 00:00:00 2001 From: Thibaud Colas Date: Sun, 14 Dec 2014 01:06:42 +1300 Subject: [PATCH 118/285] Finish removal of unused event argument from animateScroll --- dist/js/smooth-scroll.js | 5 ++--- dist/js/smooth-scroll.min.js | 2 +- docs/dist/js/smooth-scroll.js | 5 ++--- docs/dist/js/smooth-scroll.min.js | 2 +- src/js/smooth-scroll.js | 5 ++--- 5 files changed, 8 insertions(+), 11 deletions(-) diff --git a/dist/js/smooth-scroll.js b/dist/js/smooth-scroll.js index a3cee52..1f3d9e4 100755 --- a/dist/js/smooth-scroll.js +++ b/dist/js/smooth-scroll.js @@ -266,8 +266,7 @@ * @public * @param {Element} toggle The element that toggled the scroll event * @param {Element} anchor The element to scroll to - * @param {Object} settings - * @param {Event} event + * @param {Object} options */ smoothScroll.animateScroll = function ( toggle, anchor, options ) { @@ -351,7 +350,7 @@ var toggle = getClosest(event.target, '[data-scroll]'); if ( toggle && toggle.tagName.toLowerCase() === 'a' ) { event.preventDefault(); // Prevent default click event - smoothScroll.animateScroll( toggle, toggle.hash, settings, event ); // Animate scroll + smoothScroll.animateScroll( toggle, toggle.hash, settings); // Animate scroll } }; diff --git a/dist/js/smooth-scroll.min.js b/dist/js/smooth-scroll.min.js index 0917922..608ca53 100755 --- a/dist/js/smooth-scroll.min.js +++ b/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ /** smooth-scroll v5.2.0, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ -!function(t,e){"function"==typeof define&&define.amd?define("smoothScroll",e(t)):"object"==typeof exports?module.exports=e(t):t.smoothScroll=e(t)}(window||this,function(t){"use strict";var e,n={},o=!!document.querySelector&&!!t.addEventListener,r={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},a=function(t,e,n){if("[object Object]"===Object.prototype.toString.call(t))for(var o in t)Object.prototype.hasOwnProperty.call(t,o)&&e.call(n,t[o],o,t);else for(var r=0,a=t.length;a>r;r++)e.call(n,t[r],r,t)},c=function(t,e){var n={};return a(t,function(e,o){n[o]=t[o]}),a(e,function(t,o){n[o]=e[o]}),n},u=function(t,e){for(var n=e.charAt(0);t&&t!==document;t=t.parentNode)if("."===n){if(t.classList.contains(e.substr(1)))return t}else if("#"===n){if(t.id===e.substr(1))return t}else if("["===n&&t.hasAttribute(e.substr(1,e.length-2)))return t;return!1},i=function(t){for(var e,n=String(t),o=n.length,r=-1,a="",c=n.charCodeAt(0);++r=1&&31>=e||127==e||0===r&&e>=48&&57>=e||1===r&&e>=48&&57>=e&&45===c?"\\"+e.toString(16)+" ":e>=128||45===e||95===e||e>=48&&57>=e||e>=65&&90>=e||e>=97&&122>=e?n.charAt(r):"\\"+n.charAt(r)}return a},s=function(t,e){var n;return"easeInQuad"===t&&(n=e*e),"easeOutQuad"===t&&(n=e*(2-e)),"easeInOutQuad"===t&&(n=.5>e?2*e*e:-1+(4-2*e)*e),"easeInCubic"===t&&(n=e*e*e),"easeOutCubic"===t&&(n=--e*e*e+1),"easeInOutCubic"===t&&(n=.5>e?4*e*e*e:(e-1)*(2*e-2)*(2*e-2)+1),"easeInQuart"===t&&(n=e*e*e*e),"easeOutQuart"===t&&(n=1- --e*e*e*e),"easeInOutQuart"===t&&(n=.5>e?8*e*e*e*e:1-8*--e*e*e*e),"easeInQuint"===t&&(n=e*e*e*e*e),"easeOutQuint"===t&&(n=1+--e*e*e*e*e),"easeInOutQuint"===t&&(n=.5>e?16*e*e*e*e*e:1+16*--e*e*e*e*e),n||e},f=function(t,e,n){var o=0;if(t.offsetParent)do o+=t.offsetTop,t=t.offsetParent;while(t);return o=o-e-n,o>=0?o:0},l=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},d=function(t){return t&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(t):{}},h=function(t,e){history.pushState&&(e||"true"===e)&&history.pushState({pos:t.id},"",window.location.pathname+t)};n.animateScroll=function(e,n,o){var a=c(a||r,o||{}),u=d(e?e.getAttribute("data-options"):null);a=c(a,u),n="#"+i(n.substr(1));var p,m,b,v=document.querySelector(n),g=document.querySelector("[data-scroll-header]"),O=null===g?0:g.offsetHeight+g.offsetTop,y=t.pageYOffset,I=f(v,O,parseInt(a.offset,10)),S=I-y,w=l(),A=0;h(n,a.updateURL);var Q=function(o,r,c){var u=t.pageYOffset;(o==r||u==r||t.innerHeight+u>=w)&&(clearInterval(c),v.focus(),a.callbackAfter(e,n))},C=function(){A+=16,m=A/parseInt(a.speed,10),m=m>1?1:m,b=y+S*s(a.easing,m),t.scrollTo(0,Math.floor(b)),Q(b,I,p)},H=function(){a.callbackBefore(e,n),p=setInterval(C,16)};0===t.pageYOffset&&t.scrollTo(0,0),H()};var p=function(t){var o=u(t.target,"[data-scroll]");o&&"a"===o.tagName.toLowerCase()&&(t.preventDefault(),n.animateScroll(o,o.hash,e,t))};return n.destroy=function(){e&&(document.removeEventListener("click",p,!1),e=null)},n.init=function(t){o&&(n.destroy(),e=c(r,t||{}),document.addEventListener("click",p,!1))},n}); \ No newline at end of file +!function(t,e){"function"==typeof define&&define.amd?define("smoothScroll",e(t)):"object"==typeof exports?module.exports=e(t):t.smoothScroll=e(t)}(window||this,function(t){"use strict";var e,n={},o=!!document.querySelector&&!!t.addEventListener,r={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},a=function(t,e,n){if("[object Object]"===Object.prototype.toString.call(t))for(var o in t)Object.prototype.hasOwnProperty.call(t,o)&&e.call(n,t[o],o,t);else for(var r=0,a=t.length;a>r;r++)e.call(n,t[r],r,t)},c=function(t,e){var n={};return a(t,function(e,o){n[o]=t[o]}),a(e,function(t,o){n[o]=e[o]}),n},u=function(t,e){for(var n=e.charAt(0);t&&t!==document;t=t.parentNode)if("."===n){if(t.classList.contains(e.substr(1)))return t}else if("#"===n){if(t.id===e.substr(1))return t}else if("["===n&&t.hasAttribute(e.substr(1,e.length-2)))return t;return!1},i=function(t){for(var e,n=String(t),o=n.length,r=-1,a="",c=n.charCodeAt(0);++r=1&&31>=e||127==e||0===r&&e>=48&&57>=e||1===r&&e>=48&&57>=e&&45===c?"\\"+e.toString(16)+" ":e>=128||45===e||95===e||e>=48&&57>=e||e>=65&&90>=e||e>=97&&122>=e?n.charAt(r):"\\"+n.charAt(r)}return a},s=function(t,e){var n;return"easeInQuad"===t&&(n=e*e),"easeOutQuad"===t&&(n=e*(2-e)),"easeInOutQuad"===t&&(n=.5>e?2*e*e:-1+(4-2*e)*e),"easeInCubic"===t&&(n=e*e*e),"easeOutCubic"===t&&(n=--e*e*e+1),"easeInOutCubic"===t&&(n=.5>e?4*e*e*e:(e-1)*(2*e-2)*(2*e-2)+1),"easeInQuart"===t&&(n=e*e*e*e),"easeOutQuart"===t&&(n=1- --e*e*e*e),"easeInOutQuart"===t&&(n=.5>e?8*e*e*e*e:1-8*--e*e*e*e),"easeInQuint"===t&&(n=e*e*e*e*e),"easeOutQuint"===t&&(n=1+--e*e*e*e*e),"easeInOutQuint"===t&&(n=.5>e?16*e*e*e*e*e:1+16*--e*e*e*e*e),n||e},f=function(t,e,n){var o=0;if(t.offsetParent)do o+=t.offsetTop,t=t.offsetParent;while(t);return o=o-e-n,o>=0?o:0},l=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},d=function(t){return t&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(t):{}},h=function(t,e){history.pushState&&(e||"true"===e)&&history.pushState({pos:t.id},"",window.location.pathname+t)};n.animateScroll=function(e,n,o){var a=c(a||r,o||{}),u=d(e?e.getAttribute("data-options"):null);a=c(a,u),n="#"+i(n.substr(1));var p,m,b,v=document.querySelector(n),g=document.querySelector("[data-scroll-header]"),O=null===g?0:g.offsetHeight+g.offsetTop,y=t.pageYOffset,I=f(v,O,parseInt(a.offset,10)),S=I-y,w=l(),A=0;h(n,a.updateURL);var Q=function(o,r,c){var u=t.pageYOffset;(o==r||u==r||t.innerHeight+u>=w)&&(clearInterval(c),v.focus(),a.callbackAfter(e,n))},C=function(){A+=16,m=A/parseInt(a.speed,10),m=m>1?1:m,b=y+S*s(a.easing,m),t.scrollTo(0,Math.floor(b)),Q(b,I,p)},H=function(){a.callbackBefore(e,n),p=setInterval(C,16)};0===t.pageYOffset&&t.scrollTo(0,0),H()};var p=function(t){var o=u(t.target,"[data-scroll]");o&&"a"===o.tagName.toLowerCase()&&(t.preventDefault(),n.animateScroll(o,o.hash,e))};return n.destroy=function(){e&&(document.removeEventListener("click",p,!1),e=null)},n.init=function(t){o&&(n.destroy(),e=c(r,t||{}),document.addEventListener("click",p,!1))},n}); \ No newline at end of file diff --git a/docs/dist/js/smooth-scroll.js b/docs/dist/js/smooth-scroll.js index a3cee52..1f3d9e4 100755 --- a/docs/dist/js/smooth-scroll.js +++ b/docs/dist/js/smooth-scroll.js @@ -266,8 +266,7 @@ * @public * @param {Element} toggle The element that toggled the scroll event * @param {Element} anchor The element to scroll to - * @param {Object} settings - * @param {Event} event + * @param {Object} options */ smoothScroll.animateScroll = function ( toggle, anchor, options ) { @@ -351,7 +350,7 @@ var toggle = getClosest(event.target, '[data-scroll]'); if ( toggle && toggle.tagName.toLowerCase() === 'a' ) { event.preventDefault(); // Prevent default click event - smoothScroll.animateScroll( toggle, toggle.hash, settings, event ); // Animate scroll + smoothScroll.animateScroll( toggle, toggle.hash, settings); // Animate scroll } }; diff --git a/docs/dist/js/smooth-scroll.min.js b/docs/dist/js/smooth-scroll.min.js index 0917922..608ca53 100755 --- a/docs/dist/js/smooth-scroll.min.js +++ b/docs/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ /** smooth-scroll v5.2.0, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ -!function(t,e){"function"==typeof define&&define.amd?define("smoothScroll",e(t)):"object"==typeof exports?module.exports=e(t):t.smoothScroll=e(t)}(window||this,function(t){"use strict";var e,n={},o=!!document.querySelector&&!!t.addEventListener,r={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},a=function(t,e,n){if("[object Object]"===Object.prototype.toString.call(t))for(var o in t)Object.prototype.hasOwnProperty.call(t,o)&&e.call(n,t[o],o,t);else for(var r=0,a=t.length;a>r;r++)e.call(n,t[r],r,t)},c=function(t,e){var n={};return a(t,function(e,o){n[o]=t[o]}),a(e,function(t,o){n[o]=e[o]}),n},u=function(t,e){for(var n=e.charAt(0);t&&t!==document;t=t.parentNode)if("."===n){if(t.classList.contains(e.substr(1)))return t}else if("#"===n){if(t.id===e.substr(1))return t}else if("["===n&&t.hasAttribute(e.substr(1,e.length-2)))return t;return!1},i=function(t){for(var e,n=String(t),o=n.length,r=-1,a="",c=n.charCodeAt(0);++r=1&&31>=e||127==e||0===r&&e>=48&&57>=e||1===r&&e>=48&&57>=e&&45===c?"\\"+e.toString(16)+" ":e>=128||45===e||95===e||e>=48&&57>=e||e>=65&&90>=e||e>=97&&122>=e?n.charAt(r):"\\"+n.charAt(r)}return a},s=function(t,e){var n;return"easeInQuad"===t&&(n=e*e),"easeOutQuad"===t&&(n=e*(2-e)),"easeInOutQuad"===t&&(n=.5>e?2*e*e:-1+(4-2*e)*e),"easeInCubic"===t&&(n=e*e*e),"easeOutCubic"===t&&(n=--e*e*e+1),"easeInOutCubic"===t&&(n=.5>e?4*e*e*e:(e-1)*(2*e-2)*(2*e-2)+1),"easeInQuart"===t&&(n=e*e*e*e),"easeOutQuart"===t&&(n=1- --e*e*e*e),"easeInOutQuart"===t&&(n=.5>e?8*e*e*e*e:1-8*--e*e*e*e),"easeInQuint"===t&&(n=e*e*e*e*e),"easeOutQuint"===t&&(n=1+--e*e*e*e*e),"easeInOutQuint"===t&&(n=.5>e?16*e*e*e*e*e:1+16*--e*e*e*e*e),n||e},f=function(t,e,n){var o=0;if(t.offsetParent)do o+=t.offsetTop,t=t.offsetParent;while(t);return o=o-e-n,o>=0?o:0},l=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},d=function(t){return t&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(t):{}},h=function(t,e){history.pushState&&(e||"true"===e)&&history.pushState({pos:t.id},"",window.location.pathname+t)};n.animateScroll=function(e,n,o){var a=c(a||r,o||{}),u=d(e?e.getAttribute("data-options"):null);a=c(a,u),n="#"+i(n.substr(1));var p,m,b,v=document.querySelector(n),g=document.querySelector("[data-scroll-header]"),O=null===g?0:g.offsetHeight+g.offsetTop,y=t.pageYOffset,I=f(v,O,parseInt(a.offset,10)),S=I-y,w=l(),A=0;h(n,a.updateURL);var Q=function(o,r,c){var u=t.pageYOffset;(o==r||u==r||t.innerHeight+u>=w)&&(clearInterval(c),v.focus(),a.callbackAfter(e,n))},C=function(){A+=16,m=A/parseInt(a.speed,10),m=m>1?1:m,b=y+S*s(a.easing,m),t.scrollTo(0,Math.floor(b)),Q(b,I,p)},H=function(){a.callbackBefore(e,n),p=setInterval(C,16)};0===t.pageYOffset&&t.scrollTo(0,0),H()};var p=function(t){var o=u(t.target,"[data-scroll]");o&&"a"===o.tagName.toLowerCase()&&(t.preventDefault(),n.animateScroll(o,o.hash,e,t))};return n.destroy=function(){e&&(document.removeEventListener("click",p,!1),e=null)},n.init=function(t){o&&(n.destroy(),e=c(r,t||{}),document.addEventListener("click",p,!1))},n}); \ No newline at end of file +!function(t,e){"function"==typeof define&&define.amd?define("smoothScroll",e(t)):"object"==typeof exports?module.exports=e(t):t.smoothScroll=e(t)}(window||this,function(t){"use strict";var e,n={},o=!!document.querySelector&&!!t.addEventListener,r={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},a=function(t,e,n){if("[object Object]"===Object.prototype.toString.call(t))for(var o in t)Object.prototype.hasOwnProperty.call(t,o)&&e.call(n,t[o],o,t);else for(var r=0,a=t.length;a>r;r++)e.call(n,t[r],r,t)},c=function(t,e){var n={};return a(t,function(e,o){n[o]=t[o]}),a(e,function(t,o){n[o]=e[o]}),n},u=function(t,e){for(var n=e.charAt(0);t&&t!==document;t=t.parentNode)if("."===n){if(t.classList.contains(e.substr(1)))return t}else if("#"===n){if(t.id===e.substr(1))return t}else if("["===n&&t.hasAttribute(e.substr(1,e.length-2)))return t;return!1},i=function(t){for(var e,n=String(t),o=n.length,r=-1,a="",c=n.charCodeAt(0);++r=1&&31>=e||127==e||0===r&&e>=48&&57>=e||1===r&&e>=48&&57>=e&&45===c?"\\"+e.toString(16)+" ":e>=128||45===e||95===e||e>=48&&57>=e||e>=65&&90>=e||e>=97&&122>=e?n.charAt(r):"\\"+n.charAt(r)}return a},s=function(t,e){var n;return"easeInQuad"===t&&(n=e*e),"easeOutQuad"===t&&(n=e*(2-e)),"easeInOutQuad"===t&&(n=.5>e?2*e*e:-1+(4-2*e)*e),"easeInCubic"===t&&(n=e*e*e),"easeOutCubic"===t&&(n=--e*e*e+1),"easeInOutCubic"===t&&(n=.5>e?4*e*e*e:(e-1)*(2*e-2)*(2*e-2)+1),"easeInQuart"===t&&(n=e*e*e*e),"easeOutQuart"===t&&(n=1- --e*e*e*e),"easeInOutQuart"===t&&(n=.5>e?8*e*e*e*e:1-8*--e*e*e*e),"easeInQuint"===t&&(n=e*e*e*e*e),"easeOutQuint"===t&&(n=1+--e*e*e*e*e),"easeInOutQuint"===t&&(n=.5>e?16*e*e*e*e*e:1+16*--e*e*e*e*e),n||e},f=function(t,e,n){var o=0;if(t.offsetParent)do o+=t.offsetTop,t=t.offsetParent;while(t);return o=o-e-n,o>=0?o:0},l=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},d=function(t){return t&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(t):{}},h=function(t,e){history.pushState&&(e||"true"===e)&&history.pushState({pos:t.id},"",window.location.pathname+t)};n.animateScroll=function(e,n,o){var a=c(a||r,o||{}),u=d(e?e.getAttribute("data-options"):null);a=c(a,u),n="#"+i(n.substr(1));var p,m,b,v=document.querySelector(n),g=document.querySelector("[data-scroll-header]"),O=null===g?0:g.offsetHeight+g.offsetTop,y=t.pageYOffset,I=f(v,O,parseInt(a.offset,10)),S=I-y,w=l(),A=0;h(n,a.updateURL);var Q=function(o,r,c){var u=t.pageYOffset;(o==r||u==r||t.innerHeight+u>=w)&&(clearInterval(c),v.focus(),a.callbackAfter(e,n))},C=function(){A+=16,m=A/parseInt(a.speed,10),m=m>1?1:m,b=y+S*s(a.easing,m),t.scrollTo(0,Math.floor(b)),Q(b,I,p)},H=function(){a.callbackBefore(e,n),p=setInterval(C,16)};0===t.pageYOffset&&t.scrollTo(0,0),H()};var p=function(t){var o=u(t.target,"[data-scroll]");o&&"a"===o.tagName.toLowerCase()&&(t.preventDefault(),n.animateScroll(o,o.hash,e))};return n.destroy=function(){e&&(document.removeEventListener("click",p,!1),e=null)},n.init=function(t){o&&(n.destroy(),e=c(r,t||{}),document.addEventListener("click",p,!1))},n}); \ No newline at end of file diff --git a/src/js/smooth-scroll.js b/src/js/smooth-scroll.js index aa748ec..1bfd714 100755 --- a/src/js/smooth-scroll.js +++ b/src/js/smooth-scroll.js @@ -257,8 +257,7 @@ * @public * @param {Element} toggle The element that toggled the scroll event * @param {Element} anchor The element to scroll to - * @param {Object} settings - * @param {Event} event + * @param {Object} options */ smoothScroll.animateScroll = function ( toggle, anchor, options ) { @@ -342,7 +341,7 @@ var toggle = getClosest(event.target, '[data-scroll]'); if ( toggle && toggle.tagName.toLowerCase() === 'a' ) { event.preventDefault(); // Prevent default click event - smoothScroll.animateScroll( toggle, toggle.hash, settings, event ); // Animate scroll + smoothScroll.animateScroll( toggle, toggle.hash, settings); // Animate scroll } }; From a8374d7bc31e55ca865952e96087860ba7c08cf3 Mon Sep 17 00:00:00 2001 From: Thibaud Colas Date: Sat, 13 Dec 2014 21:21:59 +1300 Subject: [PATCH 119/285] Add simple public API tests --- test/spec/spec-smoothScroll.js | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/test/spec/spec-smoothScroll.js b/test/spec/spec-smoothScroll.js index 88569d2..85fbf4d 100755 --- a/test/spec/spec-smoothScroll.js +++ b/test/spec/spec-smoothScroll.js @@ -1,9 +1,14 @@ describe('Smooth Scroll', function () { - describe('init', function () { - it('should include the smoothScroll module', function () { - expect(!!smoothScroll).toBe(true); - }); - }); + describe('API', function () { + it('should export the smoothScroll module', function () { + expect(smoothScroll).toBeDefined(); + }); + it('should expose public functions', function () { + expect(smoothScroll.init).toEqual(jasmine.any(Function)); + expect(smoothScroll.destroy).toEqual(jasmine.any(Function)); + expect(smoothScroll.animateScroll).toEqual(jasmine.any(Function)); + }); + }); }); From d58c098bd0506ba4838d19903437b8837b567564 Mon Sep 17 00:00:00 2001 From: Thibaud Colas Date: Sat, 13 Dec 2014 22:53:48 +1300 Subject: [PATCH 120/285] Start testing click triggers --- test/spec/spec-smoothScroll.js | 81 ++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/test/spec/spec-smoothScroll.js b/test/spec/spec-smoothScroll.js index 85fbf4d..41c794c 100755 --- a/test/spec/spec-smoothScroll.js +++ b/test/spec/spec-smoothScroll.js @@ -10,5 +10,86 @@ describe('Smooth Scroll', function () { expect(smoothScroll.destroy).toEqual(jasmine.any(Function)); expect(smoothScroll.animateScroll).toEqual(jasmine.any(Function)); }); + + it('uses event listeners', function () { + spyOn(document, 'addEventListener'); + smoothScroll.init(); + expect(document.addEventListener).toHaveBeenCalledWith('click', jasmine.any(Function), false); + + spyOn(document, 'removeEventListener'); + smoothScroll.destroy(); + expect(document.removeEventListener).toHaveBeenCalledWith('click', jasmine.any(Function), false); + }); + }); + + /** + * Simulate a click event. + * @public + * @param {Element} the element to simulate a click on + */ + var simulateClick = function (elt) { + var click = document.createEvent('MouseEvents'); + click.initMouseEvent('click', true, true, window, 1, 0, 0, 0, 0, false, false, false, false, 0, null); + elt.dispatchEvent(click); + }; + + /** + * Create a link element, add it to the body. + * @public + * @param {String} the href attribute of the new link + * @param {Boolean} whether to add data-scroll to the link or not + * @returns {Element} + */ + var createTestLink = function (href, smooth) { + var elt = document.createElement('a'); + elt.href = href; + if (smooth) { + elt.setAttribute('data-scroll', true); + } + document.body.appendChild(elt); + return elt; + }; + + // A pattern for settings to validate their format. + var settingsStub = { + speed: jasmine.any(Number), + easing: jasmine.any(String), + offset: jasmine.any(Number), + updateURL: jasmine.any(Boolean), + callbackBefore: jasmine.any(Function), + callbackAfter: jasmine.any(Function) + }; + + describe('click on anchor', function () { + var elt = createTestLink('#anchor', true); + document.body.setAttribute('id', 'anchor'); + + afterEach(function () { + smoothScroll.destroy(); + }); + + it('triggers smooth scrolling', function () { + spyOn(smoothScroll, 'animateScroll'); + smoothScroll.init(); + simulateClick(elt); + // TODO: uncomment one, remove the other and .tohaveBeenCalled when the animateScroll signature bug is fixed. + // expect(smoothScroll.animateScroll).toHaveBeenCalledWith(elt, '#anchor', jasmine.objectContaining(settingsStub), jasmine.any(Object)); + // expect(smoothScroll.animateScroll).toHaveBeenCalledWith(elt, '#anchor', jasmine.objectContaining(settingsStub)); + expect(smoothScroll.animateScroll).toHaveBeenCalled(); + }); + + it('does nothing if not initialized', function () { + spyOn(smoothScroll, 'animateScroll'); + simulateClick(elt); + expect(smoothScroll.animateScroll).not.toHaveBeenCalled(); + }); + + it('does nothing if destructed', function () { + spyOn(smoothScroll, 'animateScroll'); + smoothScroll.init(); + smoothScroll.destroy(); + simulateClick(elt); + expect(smoothScroll.animateScroll).not.toHaveBeenCalled(); + }); }); }); From bf62ead1037d106d7b0a5b1af46fab863f8674e1 Mon Sep 17 00:00:00 2001 From: Thibaud Colas Date: Sun, 14 Dec 2014 00:21:03 +1300 Subject: [PATCH 121/285] Add unit tests for callbackBefore and callbackAfter --- test/spec/spec-smoothScroll.js | 44 ++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/test/spec/spec-smoothScroll.js b/test/spec/spec-smoothScroll.js index 41c794c..b5c190e 100755 --- a/test/spec/spec-smoothScroll.js +++ b/test/spec/spec-smoothScroll.js @@ -92,4 +92,48 @@ describe('Smooth Scroll', function () { expect(smoothScroll.animateScroll).not.toHaveBeenCalled(); }); }); + + describe('before and after callbacks', function () { + var elt = createTestLink('#anchor', true); + document.body.setAttribute('id', 'anchor'); + + // Generates a callback to test asynchronous calls. + var callback = function (eltVal, anchorVal, done) { + return function (toggle, anchor) { + expect(toggle).toBe(eltVal); + expect(anchor).toBe(anchorVal); + done(); + }; + }; + + afterEach(function () { + smoothScroll.destroy(); + }); + + it('calls the before callback', function (done) { + var settings = { + callbackBefore: callback(elt, '#anchor', done) + }; + smoothScroll.init(settings); + simulateClick(elt); + }); + + it('calls the after callback', function (done) { + var settings = { + callbackAfter: callback(elt, '#anchor', done) + }; + smoothScroll.init(settings); + simulateClick(elt); + }); + + it('calls before and after in the right order', function (done) { + var settings = { + // The before callback will not trigger done(). + callbackBefore: callback(elt, '#anchor', function () {}), + callbackAfter: callback(elt, '#anchor', done) + }; + smoothScroll.init(settings); + simulateClick(elt); + }); + }); }); From a893ba567e741565779581c56d7ff4eb61359623 Mon Sep 17 00:00:00 2001 From: Thibaud Colas Date: Sun, 14 Dec 2014 00:28:12 +1300 Subject: [PATCH 122/285] Add test cases to the files checked by JSHint --- gulpfile.js | 4 ++-- test/spec/spec-smoothScroll.js | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 2e03dbe..bc600d6 100755 --- a/gulpfile.js +++ b/gulpfile.js @@ -174,7 +174,7 @@ gulp.task('copy:static', ['clean:dist'], function() { // Lint scripts gulp.task('lint:scripts', function () { - return gulp.src(paths.scripts.input) + return gulp.src([paths.test.input, paths.test.spec]) .pipe(plumber()) .pipe(jshint()) .pipe(jshint.reporter('jshint-stylish')); @@ -287,4 +287,4 @@ gulp.task('default', [ gulp.task('watch', [ 'listen', 'default' -]); \ No newline at end of file +]); diff --git a/test/spec/spec-smoothScroll.js b/test/spec/spec-smoothScroll.js index b5c190e..f6dcc69 100755 --- a/test/spec/spec-smoothScroll.js +++ b/test/spec/spec-smoothScroll.js @@ -1,4 +1,5 @@ describe('Smooth Scroll', function () { + 'use strict'; describe('API', function () { it('should export the smoothScroll module', function () { From a77a97968bd693a5cb2b28c4ef9a163c4356f57b Mon Sep 17 00:00:00 2001 From: Thibaud Colas Date: Sun, 14 Dec 2014 09:51:24 +1300 Subject: [PATCH 123/285] Update animateScroll call signature (#129) --- test/spec/spec-smoothScroll.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/test/spec/spec-smoothScroll.js b/test/spec/spec-smoothScroll.js index f6dcc69..f365b2d 100755 --- a/test/spec/spec-smoothScroll.js +++ b/test/spec/spec-smoothScroll.js @@ -73,10 +73,7 @@ describe('Smooth Scroll', function () { spyOn(smoothScroll, 'animateScroll'); smoothScroll.init(); simulateClick(elt); - // TODO: uncomment one, remove the other and .tohaveBeenCalled when the animateScroll signature bug is fixed. - // expect(smoothScroll.animateScroll).toHaveBeenCalledWith(elt, '#anchor', jasmine.objectContaining(settingsStub), jasmine.any(Object)); - // expect(smoothScroll.animateScroll).toHaveBeenCalledWith(elt, '#anchor', jasmine.objectContaining(settingsStub)); - expect(smoothScroll.animateScroll).toHaveBeenCalled(); + expect(smoothScroll.animateScroll).toHaveBeenCalledWith(elt, '#anchor', jasmine.objectContaining(settingsStub)); }); it('does nothing if not initialized', function () { From 444b2d9365b5ab08a131835fd1555725db8cb85e Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Sat, 13 Dec 2014 21:16:13 -0500 Subject: [PATCH 124/285] Added unit tests --- README.md | 3 + dist/js/smooth-scroll.js | 2 +- dist/js/smooth-scroll.min.js | 2 +- docs/dist/js/smooth-scroll.js | 2 +- docs/dist/js/smooth-scroll.min.js | 2 +- gulpfile.js | 2 +- package.json | 2 +- test/spec/spec-smoothScroll.js | 283 ++++++++++++++++-------------- 8 files changed, 157 insertions(+), 141 deletions(-) diff --git a/README.md b/README.md index db1f31d..b4e0211 100755 --- a/README.md +++ b/README.md @@ -233,6 +233,7 @@ If the `` element has been assigned a height of `100%`, Smooth Scroll is u * AMD support and numerous code improvements by [Todd Motto](https://github.com/toddmotto). * Push State bug fix by [Yanick Witschi](https://github.com/Toflar). * CommonJS module support by [Riku Rouvila](https://github.com/rikukissa). +* Unit tests by [Thibaud Colas](https://github.com/ThibWeb). @@ -251,6 +252,8 @@ Smooth Scroll is licensed under the [MIT License](http://gomakethings.com/mit/). Smooth Scroll uses [semantic versioning](http://semver.org/). +* v5.2.1 - December 13, 2014 + * Added unit tests. * v5.2.0 - November 21, 2014 * Add focus to scrolled to anchor if focusable. * v5.1.4 - October 18, 2014 diff --git a/dist/js/smooth-scroll.js b/dist/js/smooth-scroll.js index 1f3d9e4..050104c 100755 --- a/dist/js/smooth-scroll.js +++ b/dist/js/smooth-scroll.js @@ -1,5 +1,5 @@ /** - * smooth-scroll v5.2.0 + * smooth-scroll v5.2.1 * Animate scrolling to anchor links, by Chris Ferdinandi. * http://github.com/cferdinandi/smooth-scroll * diff --git a/dist/js/smooth-scroll.min.js b/dist/js/smooth-scroll.min.js index 608ca53..d9de796 100755 --- a/dist/js/smooth-scroll.min.js +++ b/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ -/** smooth-scroll v5.2.0, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ +/** smooth-scroll v5.2.1, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ !function(t,e){"function"==typeof define&&define.amd?define("smoothScroll",e(t)):"object"==typeof exports?module.exports=e(t):t.smoothScroll=e(t)}(window||this,function(t){"use strict";var e,n={},o=!!document.querySelector&&!!t.addEventListener,r={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},a=function(t,e,n){if("[object Object]"===Object.prototype.toString.call(t))for(var o in t)Object.prototype.hasOwnProperty.call(t,o)&&e.call(n,t[o],o,t);else for(var r=0,a=t.length;a>r;r++)e.call(n,t[r],r,t)},c=function(t,e){var n={};return a(t,function(e,o){n[o]=t[o]}),a(e,function(t,o){n[o]=e[o]}),n},u=function(t,e){for(var n=e.charAt(0);t&&t!==document;t=t.parentNode)if("."===n){if(t.classList.contains(e.substr(1)))return t}else if("#"===n){if(t.id===e.substr(1))return t}else if("["===n&&t.hasAttribute(e.substr(1,e.length-2)))return t;return!1},i=function(t){for(var e,n=String(t),o=n.length,r=-1,a="",c=n.charCodeAt(0);++r=1&&31>=e||127==e||0===r&&e>=48&&57>=e||1===r&&e>=48&&57>=e&&45===c?"\\"+e.toString(16)+" ":e>=128||45===e||95===e||e>=48&&57>=e||e>=65&&90>=e||e>=97&&122>=e?n.charAt(r):"\\"+n.charAt(r)}return a},s=function(t,e){var n;return"easeInQuad"===t&&(n=e*e),"easeOutQuad"===t&&(n=e*(2-e)),"easeInOutQuad"===t&&(n=.5>e?2*e*e:-1+(4-2*e)*e),"easeInCubic"===t&&(n=e*e*e),"easeOutCubic"===t&&(n=--e*e*e+1),"easeInOutCubic"===t&&(n=.5>e?4*e*e*e:(e-1)*(2*e-2)*(2*e-2)+1),"easeInQuart"===t&&(n=e*e*e*e),"easeOutQuart"===t&&(n=1- --e*e*e*e),"easeInOutQuart"===t&&(n=.5>e?8*e*e*e*e:1-8*--e*e*e*e),"easeInQuint"===t&&(n=e*e*e*e*e),"easeOutQuint"===t&&(n=1+--e*e*e*e*e),"easeInOutQuint"===t&&(n=.5>e?16*e*e*e*e*e:1+16*--e*e*e*e*e),n||e},f=function(t,e,n){var o=0;if(t.offsetParent)do o+=t.offsetTop,t=t.offsetParent;while(t);return o=o-e-n,o>=0?o:0},l=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},d=function(t){return t&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(t):{}},h=function(t,e){history.pushState&&(e||"true"===e)&&history.pushState({pos:t.id},"",window.location.pathname+t)};n.animateScroll=function(e,n,o){var a=c(a||r,o||{}),u=d(e?e.getAttribute("data-options"):null);a=c(a,u),n="#"+i(n.substr(1));var p,m,b,v=document.querySelector(n),g=document.querySelector("[data-scroll-header]"),O=null===g?0:g.offsetHeight+g.offsetTop,y=t.pageYOffset,I=f(v,O,parseInt(a.offset,10)),S=I-y,w=l(),A=0;h(n,a.updateURL);var Q=function(o,r,c){var u=t.pageYOffset;(o==r||u==r||t.innerHeight+u>=w)&&(clearInterval(c),v.focus(),a.callbackAfter(e,n))},C=function(){A+=16,m=A/parseInt(a.speed,10),m=m>1?1:m,b=y+S*s(a.easing,m),t.scrollTo(0,Math.floor(b)),Q(b,I,p)},H=function(){a.callbackBefore(e,n),p=setInterval(C,16)};0===t.pageYOffset&&t.scrollTo(0,0),H()};var p=function(t){var o=u(t.target,"[data-scroll]");o&&"a"===o.tagName.toLowerCase()&&(t.preventDefault(),n.animateScroll(o,o.hash,e))};return n.destroy=function(){e&&(document.removeEventListener("click",p,!1),e=null)},n.init=function(t){o&&(n.destroy(),e=c(r,t||{}),document.addEventListener("click",p,!1))},n}); \ No newline at end of file diff --git a/docs/dist/js/smooth-scroll.js b/docs/dist/js/smooth-scroll.js index 1f3d9e4..050104c 100755 --- a/docs/dist/js/smooth-scroll.js +++ b/docs/dist/js/smooth-scroll.js @@ -1,5 +1,5 @@ /** - * smooth-scroll v5.2.0 + * smooth-scroll v5.2.1 * Animate scrolling to anchor links, by Chris Ferdinandi. * http://github.com/cferdinandi/smooth-scroll * diff --git a/docs/dist/js/smooth-scroll.min.js b/docs/dist/js/smooth-scroll.min.js index 608ca53..d9de796 100755 --- a/docs/dist/js/smooth-scroll.min.js +++ b/docs/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ -/** smooth-scroll v5.2.0, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ +/** smooth-scroll v5.2.1, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ !function(t,e){"function"==typeof define&&define.amd?define("smoothScroll",e(t)):"object"==typeof exports?module.exports=e(t):t.smoothScroll=e(t)}(window||this,function(t){"use strict";var e,n={},o=!!document.querySelector&&!!t.addEventListener,r={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},a=function(t,e,n){if("[object Object]"===Object.prototype.toString.call(t))for(var o in t)Object.prototype.hasOwnProperty.call(t,o)&&e.call(n,t[o],o,t);else for(var r=0,a=t.length;a>r;r++)e.call(n,t[r],r,t)},c=function(t,e){var n={};return a(t,function(e,o){n[o]=t[o]}),a(e,function(t,o){n[o]=e[o]}),n},u=function(t,e){for(var n=e.charAt(0);t&&t!==document;t=t.parentNode)if("."===n){if(t.classList.contains(e.substr(1)))return t}else if("#"===n){if(t.id===e.substr(1))return t}else if("["===n&&t.hasAttribute(e.substr(1,e.length-2)))return t;return!1},i=function(t){for(var e,n=String(t),o=n.length,r=-1,a="",c=n.charCodeAt(0);++r=1&&31>=e||127==e||0===r&&e>=48&&57>=e||1===r&&e>=48&&57>=e&&45===c?"\\"+e.toString(16)+" ":e>=128||45===e||95===e||e>=48&&57>=e||e>=65&&90>=e||e>=97&&122>=e?n.charAt(r):"\\"+n.charAt(r)}return a},s=function(t,e){var n;return"easeInQuad"===t&&(n=e*e),"easeOutQuad"===t&&(n=e*(2-e)),"easeInOutQuad"===t&&(n=.5>e?2*e*e:-1+(4-2*e)*e),"easeInCubic"===t&&(n=e*e*e),"easeOutCubic"===t&&(n=--e*e*e+1),"easeInOutCubic"===t&&(n=.5>e?4*e*e*e:(e-1)*(2*e-2)*(2*e-2)+1),"easeInQuart"===t&&(n=e*e*e*e),"easeOutQuart"===t&&(n=1- --e*e*e*e),"easeInOutQuart"===t&&(n=.5>e?8*e*e*e*e:1-8*--e*e*e*e),"easeInQuint"===t&&(n=e*e*e*e*e),"easeOutQuint"===t&&(n=1+--e*e*e*e*e),"easeInOutQuint"===t&&(n=.5>e?16*e*e*e*e*e:1+16*--e*e*e*e*e),n||e},f=function(t,e,n){var o=0;if(t.offsetParent)do o+=t.offsetTop,t=t.offsetParent;while(t);return o=o-e-n,o>=0?o:0},l=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},d=function(t){return t&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(t):{}},h=function(t,e){history.pushState&&(e||"true"===e)&&history.pushState({pos:t.id},"",window.location.pathname+t)};n.animateScroll=function(e,n,o){var a=c(a||r,o||{}),u=d(e?e.getAttribute("data-options"):null);a=c(a,u),n="#"+i(n.substr(1));var p,m,b,v=document.querySelector(n),g=document.querySelector("[data-scroll-header]"),O=null===g?0:g.offsetHeight+g.offsetTop,y=t.pageYOffset,I=f(v,O,parseInt(a.offset,10)),S=I-y,w=l(),A=0;h(n,a.updateURL);var Q=function(o,r,c){var u=t.pageYOffset;(o==r||u==r||t.innerHeight+u>=w)&&(clearInterval(c),v.focus(),a.callbackAfter(e,n))},C=function(){A+=16,m=A/parseInt(a.speed,10),m=m>1?1:m,b=y+S*s(a.easing,m),t.scrollTo(0,Math.floor(b)),Q(b,I,p)},H=function(){a.callbackBefore(e,n),p=setInterval(C,16)};0===t.pageYOffset&&t.scrollTo(0,0),H()};var p=function(t){var o=u(t.target,"[data-scroll]");o&&"a"===o.tagName.toLowerCase()&&(t.preventDefault(),n.animateScroll(o,o.hash,e))};return n.destroy=function(){e&&(document.removeEventListener("click",p,!1),e=null)},n.init=function(t){o&&(n.destroy(),e=c(r,t||{}),document.addEventListener("click",p,!1))},n}); \ No newline at end of file diff --git a/gulpfile.js b/gulpfile.js index bc600d6..dd6297a 100755 --- a/gulpfile.js +++ b/gulpfile.js @@ -174,7 +174,7 @@ gulp.task('copy:static', ['clean:dist'], function() { // Lint scripts gulp.task('lint:scripts', function () { - return gulp.src([paths.test.input, paths.test.spec]) + return gulp.src(paths.scripts.input) .pipe(plumber()) .pipe(jshint()) .pipe(jshint.reporter('jshint-stylish')); diff --git a/package.json b/package.json index bf49b14..277f05e 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "smooth-scroll", - "version": "5.2.0", + "version": "5.2.1", "description": "Animate scrolling to anchor links", "main": "./dist/js/smooth-scroll.js", "author": { diff --git a/test/spec/spec-smoothScroll.js b/test/spec/spec-smoothScroll.js index f365b2d..37a9e78 100755 --- a/test/spec/spec-smoothScroll.js +++ b/test/spec/spec-smoothScroll.js @@ -1,137 +1,150 @@ describe('Smooth Scroll', function () { - 'use strict'; - - describe('API', function () { - it('should export the smoothScroll module', function () { - expect(smoothScroll).toBeDefined(); - }); - - it('should expose public functions', function () { - expect(smoothScroll.init).toEqual(jasmine.any(Function)); - expect(smoothScroll.destroy).toEqual(jasmine.any(Function)); - expect(smoothScroll.animateScroll).toEqual(jasmine.any(Function)); - }); - - it('uses event listeners', function () { - spyOn(document, 'addEventListener'); - smoothScroll.init(); - expect(document.addEventListener).toHaveBeenCalledWith('click', jasmine.any(Function), false); - - spyOn(document, 'removeEventListener'); - smoothScroll.destroy(); - expect(document.removeEventListener).toHaveBeenCalledWith('click', jasmine.any(Function), false); - }); - }); - - /** - * Simulate a click event. - * @public - * @param {Element} the element to simulate a click on - */ - var simulateClick = function (elt) { - var click = document.createEvent('MouseEvents'); - click.initMouseEvent('click', true, true, window, 1, 0, 0, 0, 0, false, false, false, false, 0, null); - elt.dispatchEvent(click); - }; - - /** - * Create a link element, add it to the body. - * @public - * @param {String} the href attribute of the new link - * @param {Boolean} whether to add data-scroll to the link or not - * @returns {Element} - */ - var createTestLink = function (href, smooth) { - var elt = document.createElement('a'); - elt.href = href; - if (smooth) { - elt.setAttribute('data-scroll', true); - } - document.body.appendChild(elt); - return elt; - }; - - // A pattern for settings to validate their format. - var settingsStub = { - speed: jasmine.any(Number), - easing: jasmine.any(String), - offset: jasmine.any(Number), - updateURL: jasmine.any(Boolean), - callbackBefore: jasmine.any(Function), - callbackAfter: jasmine.any(Function) - }; - - describe('click on anchor', function () { - var elt = createTestLink('#anchor', true); - document.body.setAttribute('id', 'anchor'); - - afterEach(function () { - smoothScroll.destroy(); - }); - - it('triggers smooth scrolling', function () { - spyOn(smoothScroll, 'animateScroll'); - smoothScroll.init(); - simulateClick(elt); - expect(smoothScroll.animateScroll).toHaveBeenCalledWith(elt, '#anchor', jasmine.objectContaining(settingsStub)); - }); - - it('does nothing if not initialized', function () { - spyOn(smoothScroll, 'animateScroll'); - simulateClick(elt); - expect(smoothScroll.animateScroll).not.toHaveBeenCalled(); - }); - - it('does nothing if destructed', function () { - spyOn(smoothScroll, 'animateScroll'); - smoothScroll.init(); - smoothScroll.destroy(); - simulateClick(elt); - expect(smoothScroll.animateScroll).not.toHaveBeenCalled(); - }); - }); - - describe('before and after callbacks', function () { - var elt = createTestLink('#anchor', true); - document.body.setAttribute('id', 'anchor'); - - // Generates a callback to test asynchronous calls. - var callback = function (eltVal, anchorVal, done) { - return function (toggle, anchor) { - expect(toggle).toBe(eltVal); - expect(anchor).toBe(anchorVal); - done(); - }; - }; - - afterEach(function () { - smoothScroll.destroy(); - }); - - it('calls the before callback', function (done) { - var settings = { - callbackBefore: callback(elt, '#anchor', done) - }; - smoothScroll.init(settings); - simulateClick(elt); - }); - - it('calls the after callback', function (done) { - var settings = { - callbackAfter: callback(elt, '#anchor', done) - }; - smoothScroll.init(settings); - simulateClick(elt); - }); - - it('calls before and after in the right order', function (done) { - var settings = { - // The before callback will not trigger done(). - callbackBefore: callback(elt, '#anchor', function () {}), - callbackAfter: callback(elt, '#anchor', done) - }; - smoothScroll.init(settings); - simulateClick(elt); - }); - }); + + // + // Helper Methods + // + + /** + * Create a link element, add it to the body. + * @public + * @param {String} the href attribute of the new link + * @param {Boolean} whether to add data-scroll to the link or not + * @returns {Element} + */ + var injectElem = function (href, smooth) { + var elt = document.createElement('a'); + elt.href = href; + if (smooth) { + elt.setAttribute('data-scroll', true); + } + document.body.appendChild(elt); + return elt; + }; + + /** + * Simulate a click event. + * @public + * @param {Element} the element to simulate a click on + */ + var simulateClick = function (elt) { + var click = document.createEvent('MouseEvents'); + click.initMouseEvent('click', true, true, window, 1, 0, 0, 0, 0, false, false, false, false, 0, null); + elt.dispatchEvent(click); + }; + + // A pattern for settings to validate their format. + var settingsStub = { + speed: jasmine.any(Number), + easing: jasmine.any(String), + offset: jasmine.any(Number), + updateURL: jasmine.any(Boolean), + callbackBefore: jasmine.any(Function), + callbackAfter: jasmine.any(Function) + }; + + + // + // Init + // + + describe('Should initialize plugin', function () { + it('Should export the smoothScroll module', function () { + expect(smoothScroll).toBeDefined(); + }); + + it('Should expose public functions', function () { + expect(smoothScroll.init).toEqual(jasmine.any(Function)); + expect(smoothScroll.destroy).toEqual(jasmine.any(Function)); + expect(smoothScroll.animateScroll).toEqual(jasmine.any(Function)); + }); + + it('Should add event listeners', function () { + spyOn(document, 'addEventListener'); + smoothScroll.init(); + expect(document.addEventListener).toHaveBeenCalledWith('click', jasmine.any(Function), false); + + spyOn(document, 'removeEventListener'); + smoothScroll.destroy(); + expect(document.removeEventListener).toHaveBeenCalledWith('click', jasmine.any(Function), false); + }); + }); + + + // + // Events + // + + describe('Should animate scroll when anchor clicked', function () { + var elt = injectElem('#anchor', true); + document.body.setAttribute('id', 'anchor'); + + afterEach(function () { + smoothScroll.destroy(); + }); + + it('Should trigger smooth scrolling on click', function () { + spyOn(smoothScroll, 'animateScroll'); + smoothScroll.init(); + simulateClick(elt); + expect(smoothScroll.animateScroll).toHaveBeenCalledWith(elt, '#anchor', jasmine.objectContaining(settingsStub)); + }); + + it('Should do nothing if not initialized', function () { + spyOn(smoothScroll, 'animateScroll'); + simulateClick(elt); + expect(smoothScroll.animateScroll).not.toHaveBeenCalled(); + }); + + it('Should do nothing if destroyed', function () { + spyOn(smoothScroll, 'animateScroll'); + smoothScroll.init(); + smoothScroll.destroy(); + simulateClick(elt); + expect(smoothScroll.animateScroll).not.toHaveBeenCalled(); + }); + }); + + describe('Should run callbacks', function () { + var elt = injectElem('#anchor', true); + document.body.setAttribute('id', 'anchor'); + + // Generates a callback to test asynchronous calls. + var callback = function (eltVal, anchorVal, done) { + return function (toggle, anchor) { + expect(toggle).toBe(eltVal); + expect(anchor).toBe(anchorVal); + done(); + }; + }; + + afterEach(function () { + smoothScroll.destroy(); + }); + + it('Should run callback before', function (done) { + var settings = { + callbackBefore: callback(elt, '#anchor', done) + }; + smoothScroll.init(settings); + simulateClick(elt); + }); + + it('Should run callback after', function (done) { + var settings = { + callbackAfter: callback(elt, '#anchor', done) + }; + smoothScroll.init(settings); + simulateClick(elt); + }); + + it('Should run callbacks in the right order', function (done) { + var settings = { + // The before callback will not trigger done(). + callbackBefore: callback(elt, '#anchor', function () {}), + callbackAfter: callback(elt, '#anchor', done) + }; + smoothScroll.init(settings); + simulateClick(elt); + }); + }); }); From 951dcc252dad091b602015ef35997fb8c96bb7aa Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Sat, 13 Dec 2014 22:26:52 -0500 Subject: [PATCH 125/285] Accomodate query strings when updating URL --- README.md | 3 +++ dist/js/smooth-scroll.js | 6 ++---- dist/js/smooth-scroll.min.js | 4 ++-- docs/dist/js/smooth-scroll.js | 6 ++---- docs/dist/js/smooth-scroll.min.js | 4 ++-- package.json | 2 +- src/js/smooth-scroll.js | 4 +--- 7 files changed, 13 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index b4e0211..f6a7b56 100755 --- a/README.md +++ b/README.md @@ -233,6 +233,7 @@ If the `` element has been assigned a height of `100%`, Smooth Scroll is u * AMD support and numerous code improvements by [Todd Motto](https://github.com/toddmotto). * Push State bug fix by [Yanick Witschi](https://github.com/Toflar). * CommonJS module support by [Riku Rouvila](https://github.com/rikukissa). +* Query string fix when updating URL by [Qu Yatong](https://github.com/quyatong). * Unit tests by [Thibaud Colas](https://github.com/ThibWeb). @@ -252,6 +253,8 @@ Smooth Scroll is licensed under the [MIT License](http://gomakethings.com/mit/). Smooth Scroll uses [semantic versioning](http://semver.org/). +* v5.2.2 - December 13, 2014 + * Updating URL now accounts for query strings. * v5.2.1 - December 13, 2014 * Added unit tests. * v5.2.0 - November 21, 2014 diff --git a/dist/js/smooth-scroll.js b/dist/js/smooth-scroll.js index 050104c..078bdf6 100755 --- a/dist/js/smooth-scroll.js +++ b/dist/js/smooth-scroll.js @@ -1,5 +1,5 @@ /** - * smooth-scroll v5.2.1 + * smooth-scroll v5.2.2 * Animate scrolling to anchor links, by Chris Ferdinandi. * http://github.com/cferdinandi/smooth-scroll * @@ -255,9 +255,7 @@ */ var updateUrl = function ( anchor, url ) { if ( history.pushState && (url || url === 'true') ) { - history.pushState( { - pos: anchor.id - }, '', window.location.pathname + anchor ); + history.pushState( null, null, [root.location.protocol, '//', root.location.host, root.location.pathname, root.location.search, anchor].join('') ); } }; diff --git a/dist/js/smooth-scroll.min.js b/dist/js/smooth-scroll.min.js index d9de796..ed38d4e 100755 --- a/dist/js/smooth-scroll.min.js +++ b/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ -/** smooth-scroll v5.2.1, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ -!function(t,e){"function"==typeof define&&define.amd?define("smoothScroll",e(t)):"object"==typeof exports?module.exports=e(t):t.smoothScroll=e(t)}(window||this,function(t){"use strict";var e,n={},o=!!document.querySelector&&!!t.addEventListener,r={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},a=function(t,e,n){if("[object Object]"===Object.prototype.toString.call(t))for(var o in t)Object.prototype.hasOwnProperty.call(t,o)&&e.call(n,t[o],o,t);else for(var r=0,a=t.length;a>r;r++)e.call(n,t[r],r,t)},c=function(t,e){var n={};return a(t,function(e,o){n[o]=t[o]}),a(e,function(t,o){n[o]=e[o]}),n},u=function(t,e){for(var n=e.charAt(0);t&&t!==document;t=t.parentNode)if("."===n){if(t.classList.contains(e.substr(1)))return t}else if("#"===n){if(t.id===e.substr(1))return t}else if("["===n&&t.hasAttribute(e.substr(1,e.length-2)))return t;return!1},i=function(t){for(var e,n=String(t),o=n.length,r=-1,a="",c=n.charCodeAt(0);++r=1&&31>=e||127==e||0===r&&e>=48&&57>=e||1===r&&e>=48&&57>=e&&45===c?"\\"+e.toString(16)+" ":e>=128||45===e||95===e||e>=48&&57>=e||e>=65&&90>=e||e>=97&&122>=e?n.charAt(r):"\\"+n.charAt(r)}return a},s=function(t,e){var n;return"easeInQuad"===t&&(n=e*e),"easeOutQuad"===t&&(n=e*(2-e)),"easeInOutQuad"===t&&(n=.5>e?2*e*e:-1+(4-2*e)*e),"easeInCubic"===t&&(n=e*e*e),"easeOutCubic"===t&&(n=--e*e*e+1),"easeInOutCubic"===t&&(n=.5>e?4*e*e*e:(e-1)*(2*e-2)*(2*e-2)+1),"easeInQuart"===t&&(n=e*e*e*e),"easeOutQuart"===t&&(n=1- --e*e*e*e),"easeInOutQuart"===t&&(n=.5>e?8*e*e*e*e:1-8*--e*e*e*e),"easeInQuint"===t&&(n=e*e*e*e*e),"easeOutQuint"===t&&(n=1+--e*e*e*e*e),"easeInOutQuint"===t&&(n=.5>e?16*e*e*e*e*e:1+16*--e*e*e*e*e),n||e},f=function(t,e,n){var o=0;if(t.offsetParent)do o+=t.offsetTop,t=t.offsetParent;while(t);return o=o-e-n,o>=0?o:0},l=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},d=function(t){return t&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(t):{}},h=function(t,e){history.pushState&&(e||"true"===e)&&history.pushState({pos:t.id},"",window.location.pathname+t)};n.animateScroll=function(e,n,o){var a=c(a||r,o||{}),u=d(e?e.getAttribute("data-options"):null);a=c(a,u),n="#"+i(n.substr(1));var p,m,b,v=document.querySelector(n),g=document.querySelector("[data-scroll-header]"),O=null===g?0:g.offsetHeight+g.offsetTop,y=t.pageYOffset,I=f(v,O,parseInt(a.offset,10)),S=I-y,w=l(),A=0;h(n,a.updateURL);var Q=function(o,r,c){var u=t.pageYOffset;(o==r||u==r||t.innerHeight+u>=w)&&(clearInterval(c),v.focus(),a.callbackAfter(e,n))},C=function(){A+=16,m=A/parseInt(a.speed,10),m=m>1?1:m,b=y+S*s(a.easing,m),t.scrollTo(0,Math.floor(b)),Q(b,I,p)},H=function(){a.callbackBefore(e,n),p=setInterval(C,16)};0===t.pageYOffset&&t.scrollTo(0,0),H()};var p=function(t){var o=u(t.target,"[data-scroll]");o&&"a"===o.tagName.toLowerCase()&&(t.preventDefault(),n.animateScroll(o,o.hash,e))};return n.destroy=function(){e&&(document.removeEventListener("click",p,!1),e=null)},n.init=function(t){o&&(n.destroy(),e=c(r,t||{}),document.addEventListener("click",p,!1))},n}); \ No newline at end of file +/** smooth-scroll v5.2.2, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ +!function(t,e){"function"==typeof define&&define.amd?define("smoothScroll",e(t)):"object"==typeof exports?module.exports=e(t):t.smoothScroll=e(t)}(window||this,function(t){"use strict";var e,n={},o=!!document.querySelector&&!!t.addEventListener,r={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},a=function(t,e,n){if("[object Object]"===Object.prototype.toString.call(t))for(var o in t)Object.prototype.hasOwnProperty.call(t,o)&&e.call(n,t[o],o,t);else for(var r=0,a=t.length;a>r;r++)e.call(n,t[r],r,t)},c=function(t,e){var n={};return a(t,function(e,o){n[o]=t[o]}),a(e,function(t,o){n[o]=e[o]}),n},u=function(t,e){for(var n=e.charAt(0);t&&t!==document;t=t.parentNode)if("."===n){if(t.classList.contains(e.substr(1)))return t}else if("#"===n){if(t.id===e.substr(1))return t}else if("["===n&&t.hasAttribute(e.substr(1,e.length-2)))return t;return!1},i=function(t){for(var e,n=String(t),o=n.length,r=-1,a="",c=n.charCodeAt(0);++r=1&&31>=e||127==e||0===r&&e>=48&&57>=e||1===r&&e>=48&&57>=e&&45===c?"\\"+e.toString(16)+" ":e>=128||45===e||95===e||e>=48&&57>=e||e>=65&&90>=e||e>=97&&122>=e?n.charAt(r):"\\"+n.charAt(r)}return a},s=function(t,e){var n;return"easeInQuad"===t&&(n=e*e),"easeOutQuad"===t&&(n=e*(2-e)),"easeInOutQuad"===t&&(n=.5>e?2*e*e:-1+(4-2*e)*e),"easeInCubic"===t&&(n=e*e*e),"easeOutCubic"===t&&(n=--e*e*e+1),"easeInOutCubic"===t&&(n=.5>e?4*e*e*e:(e-1)*(2*e-2)*(2*e-2)+1),"easeInQuart"===t&&(n=e*e*e*e),"easeOutQuart"===t&&(n=1- --e*e*e*e),"easeInOutQuart"===t&&(n=.5>e?8*e*e*e*e:1-8*--e*e*e*e),"easeInQuint"===t&&(n=e*e*e*e*e),"easeOutQuint"===t&&(n=1+--e*e*e*e*e),"easeInOutQuint"===t&&(n=.5>e?16*e*e*e*e*e:1+16*--e*e*e*e*e),n||e},l=function(t,e,n){var o=0;if(t.offsetParent)do o+=t.offsetTop,t=t.offsetParent;while(t);return o=o-e-n,o>=0?o:0},f=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},d=function(t){return t&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(t):{}},h=function(e,n){history.pushState&&(n||"true"===n)&&history.pushState(null,null,[t.location.protocol,"//",t.location.host,t.location.pathname,t.location.search,e].join(""))};n.animateScroll=function(e,n,o){var a=c(a||r,o||{}),u=d(e?e.getAttribute("data-options"):null);a=c(a,u),n="#"+i(n.substr(1));var p,m,b,v=document.querySelector(n),g=document.querySelector("[data-scroll-header]"),O=null===g?0:g.offsetHeight+g.offsetTop,y=t.pageYOffset,I=l(v,O,parseInt(a.offset,10)),S=I-y,A=f(),Q=0;h(n,a.updateURL);var C=function(o,r,c){var u=t.pageYOffset;(o==r||u==r||t.innerHeight+u>=A)&&(clearInterval(c),v.focus(),a.callbackAfter(e,n))},H=function(){Q+=16,m=Q/parseInt(a.speed,10),m=m>1?1:m,b=y+S*s(a.easing,m),t.scrollTo(0,Math.floor(b)),C(b,I,p)},j=function(){a.callbackBefore(e,n),p=setInterval(H,16)};0===t.pageYOffset&&t.scrollTo(0,0),j()};var p=function(t){var o=u(t.target,"[data-scroll]");o&&"a"===o.tagName.toLowerCase()&&(t.preventDefault(),n.animateScroll(o,o.hash,e))};return n.destroy=function(){e&&(document.removeEventListener("click",p,!1),e=null)},n.init=function(t){o&&(n.destroy(),e=c(r,t||{}),document.addEventListener("click",p,!1))},n}); \ No newline at end of file diff --git a/docs/dist/js/smooth-scroll.js b/docs/dist/js/smooth-scroll.js index 050104c..078bdf6 100755 --- a/docs/dist/js/smooth-scroll.js +++ b/docs/dist/js/smooth-scroll.js @@ -1,5 +1,5 @@ /** - * smooth-scroll v5.2.1 + * smooth-scroll v5.2.2 * Animate scrolling to anchor links, by Chris Ferdinandi. * http://github.com/cferdinandi/smooth-scroll * @@ -255,9 +255,7 @@ */ var updateUrl = function ( anchor, url ) { if ( history.pushState && (url || url === 'true') ) { - history.pushState( { - pos: anchor.id - }, '', window.location.pathname + anchor ); + history.pushState( null, null, [root.location.protocol, '//', root.location.host, root.location.pathname, root.location.search, anchor].join('') ); } }; diff --git a/docs/dist/js/smooth-scroll.min.js b/docs/dist/js/smooth-scroll.min.js index d9de796..ed38d4e 100755 --- a/docs/dist/js/smooth-scroll.min.js +++ b/docs/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ -/** smooth-scroll v5.2.1, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ -!function(t,e){"function"==typeof define&&define.amd?define("smoothScroll",e(t)):"object"==typeof exports?module.exports=e(t):t.smoothScroll=e(t)}(window||this,function(t){"use strict";var e,n={},o=!!document.querySelector&&!!t.addEventListener,r={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},a=function(t,e,n){if("[object Object]"===Object.prototype.toString.call(t))for(var o in t)Object.prototype.hasOwnProperty.call(t,o)&&e.call(n,t[o],o,t);else for(var r=0,a=t.length;a>r;r++)e.call(n,t[r],r,t)},c=function(t,e){var n={};return a(t,function(e,o){n[o]=t[o]}),a(e,function(t,o){n[o]=e[o]}),n},u=function(t,e){for(var n=e.charAt(0);t&&t!==document;t=t.parentNode)if("."===n){if(t.classList.contains(e.substr(1)))return t}else if("#"===n){if(t.id===e.substr(1))return t}else if("["===n&&t.hasAttribute(e.substr(1,e.length-2)))return t;return!1},i=function(t){for(var e,n=String(t),o=n.length,r=-1,a="",c=n.charCodeAt(0);++r=1&&31>=e||127==e||0===r&&e>=48&&57>=e||1===r&&e>=48&&57>=e&&45===c?"\\"+e.toString(16)+" ":e>=128||45===e||95===e||e>=48&&57>=e||e>=65&&90>=e||e>=97&&122>=e?n.charAt(r):"\\"+n.charAt(r)}return a},s=function(t,e){var n;return"easeInQuad"===t&&(n=e*e),"easeOutQuad"===t&&(n=e*(2-e)),"easeInOutQuad"===t&&(n=.5>e?2*e*e:-1+(4-2*e)*e),"easeInCubic"===t&&(n=e*e*e),"easeOutCubic"===t&&(n=--e*e*e+1),"easeInOutCubic"===t&&(n=.5>e?4*e*e*e:(e-1)*(2*e-2)*(2*e-2)+1),"easeInQuart"===t&&(n=e*e*e*e),"easeOutQuart"===t&&(n=1- --e*e*e*e),"easeInOutQuart"===t&&(n=.5>e?8*e*e*e*e:1-8*--e*e*e*e),"easeInQuint"===t&&(n=e*e*e*e*e),"easeOutQuint"===t&&(n=1+--e*e*e*e*e),"easeInOutQuint"===t&&(n=.5>e?16*e*e*e*e*e:1+16*--e*e*e*e*e),n||e},f=function(t,e,n){var o=0;if(t.offsetParent)do o+=t.offsetTop,t=t.offsetParent;while(t);return o=o-e-n,o>=0?o:0},l=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},d=function(t){return t&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(t):{}},h=function(t,e){history.pushState&&(e||"true"===e)&&history.pushState({pos:t.id},"",window.location.pathname+t)};n.animateScroll=function(e,n,o){var a=c(a||r,o||{}),u=d(e?e.getAttribute("data-options"):null);a=c(a,u),n="#"+i(n.substr(1));var p,m,b,v=document.querySelector(n),g=document.querySelector("[data-scroll-header]"),O=null===g?0:g.offsetHeight+g.offsetTop,y=t.pageYOffset,I=f(v,O,parseInt(a.offset,10)),S=I-y,w=l(),A=0;h(n,a.updateURL);var Q=function(o,r,c){var u=t.pageYOffset;(o==r||u==r||t.innerHeight+u>=w)&&(clearInterval(c),v.focus(),a.callbackAfter(e,n))},C=function(){A+=16,m=A/parseInt(a.speed,10),m=m>1?1:m,b=y+S*s(a.easing,m),t.scrollTo(0,Math.floor(b)),Q(b,I,p)},H=function(){a.callbackBefore(e,n),p=setInterval(C,16)};0===t.pageYOffset&&t.scrollTo(0,0),H()};var p=function(t){var o=u(t.target,"[data-scroll]");o&&"a"===o.tagName.toLowerCase()&&(t.preventDefault(),n.animateScroll(o,o.hash,e))};return n.destroy=function(){e&&(document.removeEventListener("click",p,!1),e=null)},n.init=function(t){o&&(n.destroy(),e=c(r,t||{}),document.addEventListener("click",p,!1))},n}); \ No newline at end of file +/** smooth-scroll v5.2.2, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ +!function(t,e){"function"==typeof define&&define.amd?define("smoothScroll",e(t)):"object"==typeof exports?module.exports=e(t):t.smoothScroll=e(t)}(window||this,function(t){"use strict";var e,n={},o=!!document.querySelector&&!!t.addEventListener,r={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},a=function(t,e,n){if("[object Object]"===Object.prototype.toString.call(t))for(var o in t)Object.prototype.hasOwnProperty.call(t,o)&&e.call(n,t[o],o,t);else for(var r=0,a=t.length;a>r;r++)e.call(n,t[r],r,t)},c=function(t,e){var n={};return a(t,function(e,o){n[o]=t[o]}),a(e,function(t,o){n[o]=e[o]}),n},u=function(t,e){for(var n=e.charAt(0);t&&t!==document;t=t.parentNode)if("."===n){if(t.classList.contains(e.substr(1)))return t}else if("#"===n){if(t.id===e.substr(1))return t}else if("["===n&&t.hasAttribute(e.substr(1,e.length-2)))return t;return!1},i=function(t){for(var e,n=String(t),o=n.length,r=-1,a="",c=n.charCodeAt(0);++r=1&&31>=e||127==e||0===r&&e>=48&&57>=e||1===r&&e>=48&&57>=e&&45===c?"\\"+e.toString(16)+" ":e>=128||45===e||95===e||e>=48&&57>=e||e>=65&&90>=e||e>=97&&122>=e?n.charAt(r):"\\"+n.charAt(r)}return a},s=function(t,e){var n;return"easeInQuad"===t&&(n=e*e),"easeOutQuad"===t&&(n=e*(2-e)),"easeInOutQuad"===t&&(n=.5>e?2*e*e:-1+(4-2*e)*e),"easeInCubic"===t&&(n=e*e*e),"easeOutCubic"===t&&(n=--e*e*e+1),"easeInOutCubic"===t&&(n=.5>e?4*e*e*e:(e-1)*(2*e-2)*(2*e-2)+1),"easeInQuart"===t&&(n=e*e*e*e),"easeOutQuart"===t&&(n=1- --e*e*e*e),"easeInOutQuart"===t&&(n=.5>e?8*e*e*e*e:1-8*--e*e*e*e),"easeInQuint"===t&&(n=e*e*e*e*e),"easeOutQuint"===t&&(n=1+--e*e*e*e*e),"easeInOutQuint"===t&&(n=.5>e?16*e*e*e*e*e:1+16*--e*e*e*e*e),n||e},l=function(t,e,n){var o=0;if(t.offsetParent)do o+=t.offsetTop,t=t.offsetParent;while(t);return o=o-e-n,o>=0?o:0},f=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},d=function(t){return t&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(t):{}},h=function(e,n){history.pushState&&(n||"true"===n)&&history.pushState(null,null,[t.location.protocol,"//",t.location.host,t.location.pathname,t.location.search,e].join(""))};n.animateScroll=function(e,n,o){var a=c(a||r,o||{}),u=d(e?e.getAttribute("data-options"):null);a=c(a,u),n="#"+i(n.substr(1));var p,m,b,v=document.querySelector(n),g=document.querySelector("[data-scroll-header]"),O=null===g?0:g.offsetHeight+g.offsetTop,y=t.pageYOffset,I=l(v,O,parseInt(a.offset,10)),S=I-y,A=f(),Q=0;h(n,a.updateURL);var C=function(o,r,c){var u=t.pageYOffset;(o==r||u==r||t.innerHeight+u>=A)&&(clearInterval(c),v.focus(),a.callbackAfter(e,n))},H=function(){Q+=16,m=Q/parseInt(a.speed,10),m=m>1?1:m,b=y+S*s(a.easing,m),t.scrollTo(0,Math.floor(b)),C(b,I,p)},j=function(){a.callbackBefore(e,n),p=setInterval(H,16)};0===t.pageYOffset&&t.scrollTo(0,0),j()};var p=function(t){var o=u(t.target,"[data-scroll]");o&&"a"===o.tagName.toLowerCase()&&(t.preventDefault(),n.animateScroll(o,o.hash,e))};return n.destroy=function(){e&&(document.removeEventListener("click",p,!1),e=null)},n.init=function(t){o&&(n.destroy(),e=c(r,t||{}),document.addEventListener("click",p,!1))},n}); \ No newline at end of file diff --git a/package.json b/package.json index 277f05e..b2930f9 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "smooth-scroll", - "version": "5.2.1", + "version": "5.2.2", "description": "Animate scrolling to anchor links", "main": "./dist/js/smooth-scroll.js", "author": { diff --git a/src/js/smooth-scroll.js b/src/js/smooth-scroll.js index 1bfd714..5976fd2 100755 --- a/src/js/smooth-scroll.js +++ b/src/js/smooth-scroll.js @@ -246,9 +246,7 @@ */ var updateUrl = function ( anchor, url ) { if ( history.pushState && (url || url === 'true') ) { - history.pushState( { - pos: anchor.id - }, '', window.location.pathname + anchor ); + history.pushState( null, null, [root.location.protocol, '//', root.location.host, root.location.pathname, root.location.search, anchor].join('') ); } }; From 9dfd0617bfa3c562fd989361dc192025a1fb2cfc Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Sat, 20 Dec 2014 23:19:02 -0500 Subject: [PATCH 126/285] Added scroll to top support via empty # --- README.md | 3 +++ dist/js/smooth-scroll.js | 4 ++-- dist/js/smooth-scroll.min.js | 4 ++-- docs/dist/js/smooth-scroll.js | 4 ++-- docs/dist/js/smooth-scroll.min.js | 4 ++-- docs/index.html | 2 +- package.json | 2 +- src/docs/index.html | 2 +- src/js/smooth-scroll.js | 2 +- 9 files changed, 15 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index f6a7b56..677449c 100755 --- a/README.md +++ b/README.md @@ -234,6 +234,7 @@ If the `` element has been assigned a height of `100%`, Smooth Scroll is u * Push State bug fix by [Yanick Witschi](https://github.com/Toflar). * CommonJS module support by [Riku Rouvila](https://github.com/rikukissa). * Query string fix when updating URL by [Qu Yatong](https://github.com/quyatong). +* Scroll to top support by [Robbert Broersma](https://github.com/robbert). * Unit tests by [Thibaud Colas](https://github.com/ThibWeb). @@ -253,6 +254,8 @@ Smooth Scroll is licensed under the [MIT License](http://gomakethings.com/mit/). Smooth Scroll uses [semantic versioning](http://semver.org/). +* v5.3.0 - December 20, 2014 + * Now supports scrolling to the top with an empty hash (#). * v5.2.2 - December 13, 2014 * Updating URL now accounts for query strings. * v5.2.1 - December 13, 2014 diff --git a/dist/js/smooth-scroll.js b/dist/js/smooth-scroll.js index 078bdf6..93ed76a 100755 --- a/dist/js/smooth-scroll.js +++ b/dist/js/smooth-scroll.js @@ -1,5 +1,5 @@ /** - * smooth-scroll v5.2.2 + * smooth-scroll v5.3.0 * Animate scrolling to anchor links, by Chris Ferdinandi. * http://github.com/cferdinandi/smooth-scroll * @@ -275,7 +275,7 @@ anchor = '#' + escapeCharacters(anchor.substr(1)); // Escape special characters and leading numbers // Selectors and variables - var anchorElem = document.querySelector(anchor); + var anchorElem = anchor === '#' ? document.documentElement : document.querySelector(anchor); var fixedHeader = document.querySelector('[data-scroll-header]'); // Get the fixed header var headerHeight = fixedHeader === null ? 0 : (fixedHeader.offsetHeight + fixedHeader.offsetTop); // Get the height of a fixed header if one exists var startLocation = root.pageYOffset; // Current location on the page diff --git a/dist/js/smooth-scroll.min.js b/dist/js/smooth-scroll.min.js index ed38d4e..55db3b4 100755 --- a/dist/js/smooth-scroll.min.js +++ b/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ -/** smooth-scroll v5.2.2, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ -!function(t,e){"function"==typeof define&&define.amd?define("smoothScroll",e(t)):"object"==typeof exports?module.exports=e(t):t.smoothScroll=e(t)}(window||this,function(t){"use strict";var e,n={},o=!!document.querySelector&&!!t.addEventListener,r={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},a=function(t,e,n){if("[object Object]"===Object.prototype.toString.call(t))for(var o in t)Object.prototype.hasOwnProperty.call(t,o)&&e.call(n,t[o],o,t);else for(var r=0,a=t.length;a>r;r++)e.call(n,t[r],r,t)},c=function(t,e){var n={};return a(t,function(e,o){n[o]=t[o]}),a(e,function(t,o){n[o]=e[o]}),n},u=function(t,e){for(var n=e.charAt(0);t&&t!==document;t=t.parentNode)if("."===n){if(t.classList.contains(e.substr(1)))return t}else if("#"===n){if(t.id===e.substr(1))return t}else if("["===n&&t.hasAttribute(e.substr(1,e.length-2)))return t;return!1},i=function(t){for(var e,n=String(t),o=n.length,r=-1,a="",c=n.charCodeAt(0);++r=1&&31>=e||127==e||0===r&&e>=48&&57>=e||1===r&&e>=48&&57>=e&&45===c?"\\"+e.toString(16)+" ":e>=128||45===e||95===e||e>=48&&57>=e||e>=65&&90>=e||e>=97&&122>=e?n.charAt(r):"\\"+n.charAt(r)}return a},s=function(t,e){var n;return"easeInQuad"===t&&(n=e*e),"easeOutQuad"===t&&(n=e*(2-e)),"easeInOutQuad"===t&&(n=.5>e?2*e*e:-1+(4-2*e)*e),"easeInCubic"===t&&(n=e*e*e),"easeOutCubic"===t&&(n=--e*e*e+1),"easeInOutCubic"===t&&(n=.5>e?4*e*e*e:(e-1)*(2*e-2)*(2*e-2)+1),"easeInQuart"===t&&(n=e*e*e*e),"easeOutQuart"===t&&(n=1- --e*e*e*e),"easeInOutQuart"===t&&(n=.5>e?8*e*e*e*e:1-8*--e*e*e*e),"easeInQuint"===t&&(n=e*e*e*e*e),"easeOutQuint"===t&&(n=1+--e*e*e*e*e),"easeInOutQuint"===t&&(n=.5>e?16*e*e*e*e*e:1+16*--e*e*e*e*e),n||e},l=function(t,e,n){var o=0;if(t.offsetParent)do o+=t.offsetTop,t=t.offsetParent;while(t);return o=o-e-n,o>=0?o:0},f=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},d=function(t){return t&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(t):{}},h=function(e,n){history.pushState&&(n||"true"===n)&&history.pushState(null,null,[t.location.protocol,"//",t.location.host,t.location.pathname,t.location.search,e].join(""))};n.animateScroll=function(e,n,o){var a=c(a||r,o||{}),u=d(e?e.getAttribute("data-options"):null);a=c(a,u),n="#"+i(n.substr(1));var p,m,b,v=document.querySelector(n),g=document.querySelector("[data-scroll-header]"),O=null===g?0:g.offsetHeight+g.offsetTop,y=t.pageYOffset,I=l(v,O,parseInt(a.offset,10)),S=I-y,A=f(),Q=0;h(n,a.updateURL);var C=function(o,r,c){var u=t.pageYOffset;(o==r||u==r||t.innerHeight+u>=A)&&(clearInterval(c),v.focus(),a.callbackAfter(e,n))},H=function(){Q+=16,m=Q/parseInt(a.speed,10),m=m>1?1:m,b=y+S*s(a.easing,m),t.scrollTo(0,Math.floor(b)),C(b,I,p)},j=function(){a.callbackBefore(e,n),p=setInterval(H,16)};0===t.pageYOffset&&t.scrollTo(0,0),j()};var p=function(t){var o=u(t.target,"[data-scroll]");o&&"a"===o.tagName.toLowerCase()&&(t.preventDefault(),n.animateScroll(o,o.hash,e))};return n.destroy=function(){e&&(document.removeEventListener("click",p,!1),e=null)},n.init=function(t){o&&(n.destroy(),e=c(r,t||{}),document.addEventListener("click",p,!1))},n}); \ No newline at end of file +/** smooth-scroll v5.3.0, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ +!function(t,e){"function"==typeof define&&define.amd?define("smoothScroll",e(t)):"object"==typeof exports?module.exports=e(t):t.smoothScroll=e(t)}(window||this,function(t){"use strict";var e,n={},o=!!document.querySelector&&!!t.addEventListener,r={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},a=function(t,e,n){if("[object Object]"===Object.prototype.toString.call(t))for(var o in t)Object.prototype.hasOwnProperty.call(t,o)&&e.call(n,t[o],o,t);else for(var r=0,a=t.length;a>r;r++)e.call(n,t[r],r,t)},c=function(t,e){var n={};return a(t,function(e,o){n[o]=t[o]}),a(e,function(t,o){n[o]=e[o]}),n},u=function(t,e){for(var n=e.charAt(0);t&&t!==document;t=t.parentNode)if("."===n){if(t.classList.contains(e.substr(1)))return t}else if("#"===n){if(t.id===e.substr(1))return t}else if("["===n&&t.hasAttribute(e.substr(1,e.length-2)))return t;return!1},i=function(t){for(var e,n=String(t),o=n.length,r=-1,a="",c=n.charCodeAt(0);++r=1&&31>=e||127==e||0===r&&e>=48&&57>=e||1===r&&e>=48&&57>=e&&45===c?"\\"+e.toString(16)+" ":e>=128||45===e||95===e||e>=48&&57>=e||e>=65&&90>=e||e>=97&&122>=e?n.charAt(r):"\\"+n.charAt(r)}return a},s=function(t,e){var n;return"easeInQuad"===t&&(n=e*e),"easeOutQuad"===t&&(n=e*(2-e)),"easeInOutQuad"===t&&(n=.5>e?2*e*e:-1+(4-2*e)*e),"easeInCubic"===t&&(n=e*e*e),"easeOutCubic"===t&&(n=--e*e*e+1),"easeInOutCubic"===t&&(n=.5>e?4*e*e*e:(e-1)*(2*e-2)*(2*e-2)+1),"easeInQuart"===t&&(n=e*e*e*e),"easeOutQuart"===t&&(n=1- --e*e*e*e),"easeInOutQuart"===t&&(n=.5>e?8*e*e*e*e:1-8*--e*e*e*e),"easeInQuint"===t&&(n=e*e*e*e*e),"easeOutQuint"===t&&(n=1+--e*e*e*e*e),"easeInOutQuint"===t&&(n=.5>e?16*e*e*e*e*e:1+16*--e*e*e*e*e),n||e},l=function(t,e,n){var o=0;if(t.offsetParent)do o+=t.offsetTop,t=t.offsetParent;while(t);return o=o-e-n,o>=0?o:0},f=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},d=function(t){return t&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(t):{}},h=function(e,n){history.pushState&&(n||"true"===n)&&history.pushState(null,null,[t.location.protocol,"//",t.location.host,t.location.pathname,t.location.search,e].join(""))};n.animateScroll=function(e,n,o){var a=c(a||r,o||{}),u=d(e?e.getAttribute("data-options"):null);a=c(a,u),n="#"+i(n.substr(1));var p,m,b,v="#"===n?document.documentElement:document.querySelector(n),g=document.querySelector("[data-scroll-header]"),O=null===g?0:g.offsetHeight+g.offsetTop,y=t.pageYOffset,I=l(v,O,parseInt(a.offset,10)),S=I-y,A=f(),Q=0;h(n,a.updateURL);var C=function(o,r,c){var u=t.pageYOffset;(o==r||u==r||t.innerHeight+u>=A)&&(clearInterval(c),v.focus(),a.callbackAfter(e,n))},E=function(){Q+=16,m=Q/parseInt(a.speed,10),m=m>1?1:m,b=y+S*s(a.easing,m),t.scrollTo(0,Math.floor(b)),C(b,I,p)},H=function(){a.callbackBefore(e,n),p=setInterval(E,16)};0===t.pageYOffset&&t.scrollTo(0,0),H()};var p=function(t){var o=u(t.target,"[data-scroll]");o&&"a"===o.tagName.toLowerCase()&&(t.preventDefault(),n.animateScroll(o,o.hash,e))};return n.destroy=function(){e&&(document.removeEventListener("click",p,!1),e=null)},n.init=function(t){o&&(n.destroy(),e=c(r,t||{}),document.addEventListener("click",p,!1))},n}); \ No newline at end of file diff --git a/docs/dist/js/smooth-scroll.js b/docs/dist/js/smooth-scroll.js index 078bdf6..93ed76a 100755 --- a/docs/dist/js/smooth-scroll.js +++ b/docs/dist/js/smooth-scroll.js @@ -1,5 +1,5 @@ /** - * smooth-scroll v5.2.2 + * smooth-scroll v5.3.0 * Animate scrolling to anchor links, by Chris Ferdinandi. * http://github.com/cferdinandi/smooth-scroll * @@ -275,7 +275,7 @@ anchor = '#' + escapeCharacters(anchor.substr(1)); // Escape special characters and leading numbers // Selectors and variables - var anchorElem = document.querySelector(anchor); + var anchorElem = anchor === '#' ? document.documentElement : document.querySelector(anchor); var fixedHeader = document.querySelector('[data-scroll-header]'); // Get the fixed header var headerHeight = fixedHeader === null ? 0 : (fixedHeader.offsetHeight + fixedHeader.offsetTop); // Get the height of a fixed header if one exists var startLocation = root.pageYOffset; // Current location on the page diff --git a/docs/dist/js/smooth-scroll.min.js b/docs/dist/js/smooth-scroll.min.js index ed38d4e..55db3b4 100755 --- a/docs/dist/js/smooth-scroll.min.js +++ b/docs/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ -/** smooth-scroll v5.2.2, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ -!function(t,e){"function"==typeof define&&define.amd?define("smoothScroll",e(t)):"object"==typeof exports?module.exports=e(t):t.smoothScroll=e(t)}(window||this,function(t){"use strict";var e,n={},o=!!document.querySelector&&!!t.addEventListener,r={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},a=function(t,e,n){if("[object Object]"===Object.prototype.toString.call(t))for(var o in t)Object.prototype.hasOwnProperty.call(t,o)&&e.call(n,t[o],o,t);else for(var r=0,a=t.length;a>r;r++)e.call(n,t[r],r,t)},c=function(t,e){var n={};return a(t,function(e,o){n[o]=t[o]}),a(e,function(t,o){n[o]=e[o]}),n},u=function(t,e){for(var n=e.charAt(0);t&&t!==document;t=t.parentNode)if("."===n){if(t.classList.contains(e.substr(1)))return t}else if("#"===n){if(t.id===e.substr(1))return t}else if("["===n&&t.hasAttribute(e.substr(1,e.length-2)))return t;return!1},i=function(t){for(var e,n=String(t),o=n.length,r=-1,a="",c=n.charCodeAt(0);++r=1&&31>=e||127==e||0===r&&e>=48&&57>=e||1===r&&e>=48&&57>=e&&45===c?"\\"+e.toString(16)+" ":e>=128||45===e||95===e||e>=48&&57>=e||e>=65&&90>=e||e>=97&&122>=e?n.charAt(r):"\\"+n.charAt(r)}return a},s=function(t,e){var n;return"easeInQuad"===t&&(n=e*e),"easeOutQuad"===t&&(n=e*(2-e)),"easeInOutQuad"===t&&(n=.5>e?2*e*e:-1+(4-2*e)*e),"easeInCubic"===t&&(n=e*e*e),"easeOutCubic"===t&&(n=--e*e*e+1),"easeInOutCubic"===t&&(n=.5>e?4*e*e*e:(e-1)*(2*e-2)*(2*e-2)+1),"easeInQuart"===t&&(n=e*e*e*e),"easeOutQuart"===t&&(n=1- --e*e*e*e),"easeInOutQuart"===t&&(n=.5>e?8*e*e*e*e:1-8*--e*e*e*e),"easeInQuint"===t&&(n=e*e*e*e*e),"easeOutQuint"===t&&(n=1+--e*e*e*e*e),"easeInOutQuint"===t&&(n=.5>e?16*e*e*e*e*e:1+16*--e*e*e*e*e),n||e},l=function(t,e,n){var o=0;if(t.offsetParent)do o+=t.offsetTop,t=t.offsetParent;while(t);return o=o-e-n,o>=0?o:0},f=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},d=function(t){return t&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(t):{}},h=function(e,n){history.pushState&&(n||"true"===n)&&history.pushState(null,null,[t.location.protocol,"//",t.location.host,t.location.pathname,t.location.search,e].join(""))};n.animateScroll=function(e,n,o){var a=c(a||r,o||{}),u=d(e?e.getAttribute("data-options"):null);a=c(a,u),n="#"+i(n.substr(1));var p,m,b,v=document.querySelector(n),g=document.querySelector("[data-scroll-header]"),O=null===g?0:g.offsetHeight+g.offsetTop,y=t.pageYOffset,I=l(v,O,parseInt(a.offset,10)),S=I-y,A=f(),Q=0;h(n,a.updateURL);var C=function(o,r,c){var u=t.pageYOffset;(o==r||u==r||t.innerHeight+u>=A)&&(clearInterval(c),v.focus(),a.callbackAfter(e,n))},H=function(){Q+=16,m=Q/parseInt(a.speed,10),m=m>1?1:m,b=y+S*s(a.easing,m),t.scrollTo(0,Math.floor(b)),C(b,I,p)},j=function(){a.callbackBefore(e,n),p=setInterval(H,16)};0===t.pageYOffset&&t.scrollTo(0,0),j()};var p=function(t){var o=u(t.target,"[data-scroll]");o&&"a"===o.tagName.toLowerCase()&&(t.preventDefault(),n.animateScroll(o,o.hash,e))};return n.destroy=function(){e&&(document.removeEventListener("click",p,!1),e=null)},n.init=function(t){o&&(n.destroy(),e=c(r,t||{}),document.addEventListener("click",p,!1))},n}); \ No newline at end of file +/** smooth-scroll v5.3.0, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ +!function(t,e){"function"==typeof define&&define.amd?define("smoothScroll",e(t)):"object"==typeof exports?module.exports=e(t):t.smoothScroll=e(t)}(window||this,function(t){"use strict";var e,n={},o=!!document.querySelector&&!!t.addEventListener,r={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},a=function(t,e,n){if("[object Object]"===Object.prototype.toString.call(t))for(var o in t)Object.prototype.hasOwnProperty.call(t,o)&&e.call(n,t[o],o,t);else for(var r=0,a=t.length;a>r;r++)e.call(n,t[r],r,t)},c=function(t,e){var n={};return a(t,function(e,o){n[o]=t[o]}),a(e,function(t,o){n[o]=e[o]}),n},u=function(t,e){for(var n=e.charAt(0);t&&t!==document;t=t.parentNode)if("."===n){if(t.classList.contains(e.substr(1)))return t}else if("#"===n){if(t.id===e.substr(1))return t}else if("["===n&&t.hasAttribute(e.substr(1,e.length-2)))return t;return!1},i=function(t){for(var e,n=String(t),o=n.length,r=-1,a="",c=n.charCodeAt(0);++r=1&&31>=e||127==e||0===r&&e>=48&&57>=e||1===r&&e>=48&&57>=e&&45===c?"\\"+e.toString(16)+" ":e>=128||45===e||95===e||e>=48&&57>=e||e>=65&&90>=e||e>=97&&122>=e?n.charAt(r):"\\"+n.charAt(r)}return a},s=function(t,e){var n;return"easeInQuad"===t&&(n=e*e),"easeOutQuad"===t&&(n=e*(2-e)),"easeInOutQuad"===t&&(n=.5>e?2*e*e:-1+(4-2*e)*e),"easeInCubic"===t&&(n=e*e*e),"easeOutCubic"===t&&(n=--e*e*e+1),"easeInOutCubic"===t&&(n=.5>e?4*e*e*e:(e-1)*(2*e-2)*(2*e-2)+1),"easeInQuart"===t&&(n=e*e*e*e),"easeOutQuart"===t&&(n=1- --e*e*e*e),"easeInOutQuart"===t&&(n=.5>e?8*e*e*e*e:1-8*--e*e*e*e),"easeInQuint"===t&&(n=e*e*e*e*e),"easeOutQuint"===t&&(n=1+--e*e*e*e*e),"easeInOutQuint"===t&&(n=.5>e?16*e*e*e*e*e:1+16*--e*e*e*e*e),n||e},l=function(t,e,n){var o=0;if(t.offsetParent)do o+=t.offsetTop,t=t.offsetParent;while(t);return o=o-e-n,o>=0?o:0},f=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},d=function(t){return t&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(t):{}},h=function(e,n){history.pushState&&(n||"true"===n)&&history.pushState(null,null,[t.location.protocol,"//",t.location.host,t.location.pathname,t.location.search,e].join(""))};n.animateScroll=function(e,n,o){var a=c(a||r,o||{}),u=d(e?e.getAttribute("data-options"):null);a=c(a,u),n="#"+i(n.substr(1));var p,m,b,v="#"===n?document.documentElement:document.querySelector(n),g=document.querySelector("[data-scroll-header]"),O=null===g?0:g.offsetHeight+g.offsetTop,y=t.pageYOffset,I=l(v,O,parseInt(a.offset,10)),S=I-y,A=f(),Q=0;h(n,a.updateURL);var C=function(o,r,c){var u=t.pageYOffset;(o==r||u==r||t.innerHeight+u>=A)&&(clearInterval(c),v.focus(),a.callbackAfter(e,n))},E=function(){Q+=16,m=Q/parseInt(a.speed,10),m=m>1?1:m,b=y+S*s(a.easing,m),t.scrollTo(0,Math.floor(b)),C(b,I,p)},H=function(){a.callbackBefore(e,n),p=setInterval(E,16)};0===t.pageYOffset&&t.scrollTo(0,0),H()};var p=function(t){var o=u(t.target,"[data-scroll]");o&&"a"===o.tagName.toLowerCase()&&(t.preventDefault(),n.animateScroll(o,o.hash,e))};return n.destroy=function(){e&&(document.removeEventListener("click",p,!1),e=null)},n.init=function(t){o&&(n.destroy(),e=c(r,t||{}),document.addEventListener("click",p,!1))},n}); \ No newline at end of file diff --git a/docs/index.html b/docs/index.html index adc9e8e..9866302 100644 --- a/docs/index.html +++ b/docs/index.html @@ -64,7 +64,7 @@

Smooth Scroll

.
.
.
.
.
.
.
.
.
.
.
.
.

-

Back to the top

+

Back to the top

diff --git a/package.json b/package.json index b2930f9..644fa74 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "smooth-scroll", - "version": "5.2.2", + "version": "5.3.0", "description": "Animate scrolling to anchor links", "main": "./dist/js/smooth-scroll.js", "author": { diff --git a/src/docs/index.html b/src/docs/index.html index 5925bb5..1dd9971 100644 --- a/src/docs/index.html +++ b/src/docs/index.html @@ -41,4 +41,4 @@ .
.
.
.
.
.
.
.
.
.
.
.
.

-

Back to the top

\ No newline at end of file +

Back to the top

\ No newline at end of file diff --git a/src/js/smooth-scroll.js b/src/js/smooth-scroll.js index 5976fd2..a517809 100755 --- a/src/js/smooth-scroll.js +++ b/src/js/smooth-scroll.js @@ -266,7 +266,7 @@ anchor = '#' + escapeCharacters(anchor.substr(1)); // Escape special characters and leading numbers // Selectors and variables - var anchorElem = document.querySelector(anchor); + var anchorElem = anchor === '#' ? document.documentElement : document.querySelector(anchor); var fixedHeader = document.querySelector('[data-scroll-header]'); // Get the fixed header var headerHeight = fixedHeader === null ? 0 : (fixedHeader.offsetHeight + fixedHeader.offsetTop); // Get the height of a fixed header if one exists var startLocation = root.pageYOffset; // Current location on the page From f52af1c19894df4fd1ccc9603203eb5c34271f98 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Sat, 20 Dec 2014 23:30:48 -0500 Subject: [PATCH 127/285] Cache header height for better performance --- README.md | 2 ++ dist/js/smooth-scroll.js | 36 ++++++++++++++++++++++++++----- dist/js/smooth-scroll.min.js | 4 ++-- docs/dist/js/smooth-scroll.js | 36 ++++++++++++++++++++++++++----- docs/dist/js/smooth-scroll.min.js | 4 ++-- package.json | 2 +- src/js/smooth-scroll.js | 34 +++++++++++++++++++++++++---- 7 files changed, 99 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 677449c..35c9422 100755 --- a/README.md +++ b/README.md @@ -254,6 +254,8 @@ Smooth Scroll is licensed under the [MIT License](http://gomakethings.com/mit/). Smooth Scroll uses [semantic versioning](http://semver.org/). +* v5.3.1 - December 20, 2014 + * Cache header height for better performance. * v5.3.0 - December 20, 2014 * Now supports scrolling to the top with an empty hash (#). * v5.2.2 - December 13, 2014 diff --git a/dist/js/smooth-scroll.js b/dist/js/smooth-scroll.js index 93ed76a..f8815c8 100755 --- a/dist/js/smooth-scroll.js +++ b/dist/js/smooth-scroll.js @@ -1,5 +1,5 @@ /** - * smooth-scroll v5.3.0 + * smooth-scroll v5.3.1 * 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; + var settings, eventTimeout, fixedHeader, headerHeight; // Default settings var defaults = { @@ -276,8 +276,6 @@ // Selectors and variables var anchorElem = anchor === '#' ? document.documentElement : document.querySelector(anchor); - var fixedHeader = document.querySelector('[data-scroll-header]'); // Get the fixed header - var headerHeight = fixedHeader === null ? 0 : (fixedHeader.offsetHeight + fixedHeader.offsetTop); // Get the height of a fixed header if one exists var startLocation = root.pageYOffset; // Current location on the page var endLocation = getEndLocation( anchorElem, headerHeight, parseInt(settings.offset, 10) ); // Scroll to location var animationInterval; // interval timer @@ -352,14 +350,39 @@ } }; + /** + * On window scroll and resize, only run events at a rate of 15fps for better performance + * @private + * @param {Function} eventTimeout Timeout function + * @param {Object} settings + */ + var eventThrottler = function (event) { + if ( !eventTimeout ) { + eventTimeout = setTimeout(function() { + eventTimeout = null; // Reset timeout + headerHeight = fixedHeader === null ? 0 : (fixedHeader.offsetHeight + fixedHeader.offsetTop); // Get the height of a fixed header if one exists + }, 66); + } + }; + /** * Destroy the current initialization. * @public */ smoothScroll.destroy = function () { + + // If plugin isn't already initialized, stop if ( !settings ) return; + + // Remove event listeners document.removeEventListener( 'click', eventHandler, false ); + root.removeEventListener( 'resize', eventThrottler, false ); + + // Reset varaibles settings = null; + eventTimeout = null; + fixedHeader = null; + headerHeight = null; }; /** @@ -377,9 +400,12 @@ // 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 : (fixedHeader.offsetHeight + 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); + document.addEventListener('click', eventHandler, false ); + root.addEventListener( 'resize', eventThrottler, false ); }; diff --git a/dist/js/smooth-scroll.min.js b/dist/js/smooth-scroll.min.js index 55db3b4..f42c4f3 100755 --- a/dist/js/smooth-scroll.min.js +++ b/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ -/** smooth-scroll v5.3.0, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ -!function(t,e){"function"==typeof define&&define.amd?define("smoothScroll",e(t)):"object"==typeof exports?module.exports=e(t):t.smoothScroll=e(t)}(window||this,function(t){"use strict";var e,n={},o=!!document.querySelector&&!!t.addEventListener,r={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},a=function(t,e,n){if("[object Object]"===Object.prototype.toString.call(t))for(var o in t)Object.prototype.hasOwnProperty.call(t,o)&&e.call(n,t[o],o,t);else for(var r=0,a=t.length;a>r;r++)e.call(n,t[r],r,t)},c=function(t,e){var n={};return a(t,function(e,o){n[o]=t[o]}),a(e,function(t,o){n[o]=e[o]}),n},u=function(t,e){for(var n=e.charAt(0);t&&t!==document;t=t.parentNode)if("."===n){if(t.classList.contains(e.substr(1)))return t}else if("#"===n){if(t.id===e.substr(1))return t}else if("["===n&&t.hasAttribute(e.substr(1,e.length-2)))return t;return!1},i=function(t){for(var e,n=String(t),o=n.length,r=-1,a="",c=n.charCodeAt(0);++r=1&&31>=e||127==e||0===r&&e>=48&&57>=e||1===r&&e>=48&&57>=e&&45===c?"\\"+e.toString(16)+" ":e>=128||45===e||95===e||e>=48&&57>=e||e>=65&&90>=e||e>=97&&122>=e?n.charAt(r):"\\"+n.charAt(r)}return a},s=function(t,e){var n;return"easeInQuad"===t&&(n=e*e),"easeOutQuad"===t&&(n=e*(2-e)),"easeInOutQuad"===t&&(n=.5>e?2*e*e:-1+(4-2*e)*e),"easeInCubic"===t&&(n=e*e*e),"easeOutCubic"===t&&(n=--e*e*e+1),"easeInOutCubic"===t&&(n=.5>e?4*e*e*e:(e-1)*(2*e-2)*(2*e-2)+1),"easeInQuart"===t&&(n=e*e*e*e),"easeOutQuart"===t&&(n=1- --e*e*e*e),"easeInOutQuart"===t&&(n=.5>e?8*e*e*e*e:1-8*--e*e*e*e),"easeInQuint"===t&&(n=e*e*e*e*e),"easeOutQuint"===t&&(n=1+--e*e*e*e*e),"easeInOutQuint"===t&&(n=.5>e?16*e*e*e*e*e:1+16*--e*e*e*e*e),n||e},l=function(t,e,n){var o=0;if(t.offsetParent)do o+=t.offsetTop,t=t.offsetParent;while(t);return o=o-e-n,o>=0?o:0},f=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},d=function(t){return t&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(t):{}},h=function(e,n){history.pushState&&(n||"true"===n)&&history.pushState(null,null,[t.location.protocol,"//",t.location.host,t.location.pathname,t.location.search,e].join(""))};n.animateScroll=function(e,n,o){var a=c(a||r,o||{}),u=d(e?e.getAttribute("data-options"):null);a=c(a,u),n="#"+i(n.substr(1));var p,m,b,v="#"===n?document.documentElement:document.querySelector(n),g=document.querySelector("[data-scroll-header]"),O=null===g?0:g.offsetHeight+g.offsetTop,y=t.pageYOffset,I=l(v,O,parseInt(a.offset,10)),S=I-y,A=f(),Q=0;h(n,a.updateURL);var C=function(o,r,c){var u=t.pageYOffset;(o==r||u==r||t.innerHeight+u>=A)&&(clearInterval(c),v.focus(),a.callbackAfter(e,n))},E=function(){Q+=16,m=Q/parseInt(a.speed,10),m=m>1?1:m,b=y+S*s(a.easing,m),t.scrollTo(0,Math.floor(b)),C(b,I,p)},H=function(){a.callbackBefore(e,n),p=setInterval(E,16)};0===t.pageYOffset&&t.scrollTo(0,0),H()};var p=function(t){var o=u(t.target,"[data-scroll]");o&&"a"===o.tagName.toLowerCase()&&(t.preventDefault(),n.animateScroll(o,o.hash,e))};return n.destroy=function(){e&&(document.removeEventListener("click",p,!1),e=null)},n.init=function(t){o&&(n.destroy(),e=c(r,t||{}),document.addEventListener("click",p,!1))},n}); \ No newline at end of file +/** smooth-scroll v5.3.1, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ +!function(e,t){"function"==typeof define&&define.amd?define("smoothScroll",t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)}(window||this,function(e){"use strict";var t,n,o,r,a={},u=!!document.querySelector&&!!e.addEventListener,c={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},i=function(e,t,n){if("[object Object]"===Object.prototype.toString.call(e))for(var o in e)Object.prototype.hasOwnProperty.call(e,o)&&t.call(n,e[o],o,e);else for(var r=0,a=e.length;a>r;r++)t.call(n,e[r],r,e)},l=function(e,t){var n={};return i(e,function(t,o){n[o]=e[o]}),i(t,function(e,o){n[o]=t[o]}),n},s=function(e,t){for(var n=t.charAt(0);e&&e!==document;e=e.parentNode)if("."===n){if(e.classList.contains(t.substr(1)))return e}else if("#"===n){if(e.id===t.substr(1))return e}else if("["===n&&e.hasAttribute(t.substr(1,t.length-2)))return e;return!1},f=function(e){for(var t,n=String(e),o=n.length,r=-1,a="",u=n.charCodeAt(0);++r=1&&31>=t||127==t||0===r&&t>=48&&57>=t||1===r&&t>=48&&57>=t&&45===u?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(r):"\\"+n.charAt(r)}return a},d=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},h=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=o-t-n,o>=0?o:0},m=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},p=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},v=function(t,n){history.pushState&&(n||"true"===n)&&history.pushState(null,null,[e.location.protocol,"//",e.location.host,e.location.pathname,e.location.search,t].join(""))};a.animateScroll=function(t,n,o){var a=l(a||c,o||{}),u=p(t?t.getAttribute("data-options"):null);a=l(a,u),n="#"+f(n.substr(1));var i,s,b,g="#"===n?document.documentElement:document.querySelector(n),O=e.pageYOffset,y=h(g,r,parseInt(a.offset,10)),I=y-O,S=m(),E=0;v(n,a.updateURL);var A=function(o,r,u){var c=e.pageYOffset;(o==r||c==r||e.innerHeight+c>=S)&&(clearInterval(u),g.focus(),a.callbackAfter(t,n))},H=function(){E+=16,s=E/parseInt(a.speed,10),s=s>1?1:s,b=O+I*d(a.easing,s),e.scrollTo(0,Math.floor(b)),A(b,y,i)},L=function(){a.callbackBefore(t,n),i=setInterval(H,16)};0===e.pageYOffset&&e.scrollTo(0,0),L()};var b=function(e){var n=s(e.target,"[data-scroll]");n&&"a"===n.tagName.toLowerCase()&&(e.preventDefault(),a.animateScroll(n,n.hash,t))},g=function(){n||(n=setTimeout(function(){n=null,r=null===o?0:o.offsetHeight+o.offsetTop},66))};return a.destroy=function(){t&&(document.removeEventListener("click",b,!1),e.removeEventListener("resize",g,!1),t=null,n=null,o=null,r=null)},a.init=function(n){u&&(a.destroy(),t=l(c,n||{}),o=document.querySelector("[data-scroll-header]"),r=null===o?0:o.offsetHeight+o.offsetTop,document.addEventListener("click",b,!1),e.addEventListener("resize",g,!1))},a}); \ No newline at end of file diff --git a/docs/dist/js/smooth-scroll.js b/docs/dist/js/smooth-scroll.js index 93ed76a..f8815c8 100755 --- a/docs/dist/js/smooth-scroll.js +++ b/docs/dist/js/smooth-scroll.js @@ -1,5 +1,5 @@ /** - * smooth-scroll v5.3.0 + * smooth-scroll v5.3.1 * 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; + var settings, eventTimeout, fixedHeader, headerHeight; // Default settings var defaults = { @@ -276,8 +276,6 @@ // Selectors and variables var anchorElem = anchor === '#' ? document.documentElement : document.querySelector(anchor); - var fixedHeader = document.querySelector('[data-scroll-header]'); // Get the fixed header - var headerHeight = fixedHeader === null ? 0 : (fixedHeader.offsetHeight + fixedHeader.offsetTop); // Get the height of a fixed header if one exists var startLocation = root.pageYOffset; // Current location on the page var endLocation = getEndLocation( anchorElem, headerHeight, parseInt(settings.offset, 10) ); // Scroll to location var animationInterval; // interval timer @@ -352,14 +350,39 @@ } }; + /** + * On window scroll and resize, only run events at a rate of 15fps for better performance + * @private + * @param {Function} eventTimeout Timeout function + * @param {Object} settings + */ + var eventThrottler = function (event) { + if ( !eventTimeout ) { + eventTimeout = setTimeout(function() { + eventTimeout = null; // Reset timeout + headerHeight = fixedHeader === null ? 0 : (fixedHeader.offsetHeight + fixedHeader.offsetTop); // Get the height of a fixed header if one exists + }, 66); + } + }; + /** * Destroy the current initialization. * @public */ smoothScroll.destroy = function () { + + // If plugin isn't already initialized, stop if ( !settings ) return; + + // Remove event listeners document.removeEventListener( 'click', eventHandler, false ); + root.removeEventListener( 'resize', eventThrottler, false ); + + // Reset varaibles settings = null; + eventTimeout = null; + fixedHeader = null; + headerHeight = null; }; /** @@ -377,9 +400,12 @@ // 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 : (fixedHeader.offsetHeight + 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); + document.addEventListener('click', eventHandler, false ); + root.addEventListener( 'resize', eventThrottler, false ); }; diff --git a/docs/dist/js/smooth-scroll.min.js b/docs/dist/js/smooth-scroll.min.js index 55db3b4..f42c4f3 100755 --- a/docs/dist/js/smooth-scroll.min.js +++ b/docs/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ -/** smooth-scroll v5.3.0, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ -!function(t,e){"function"==typeof define&&define.amd?define("smoothScroll",e(t)):"object"==typeof exports?module.exports=e(t):t.smoothScroll=e(t)}(window||this,function(t){"use strict";var e,n={},o=!!document.querySelector&&!!t.addEventListener,r={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},a=function(t,e,n){if("[object Object]"===Object.prototype.toString.call(t))for(var o in t)Object.prototype.hasOwnProperty.call(t,o)&&e.call(n,t[o],o,t);else for(var r=0,a=t.length;a>r;r++)e.call(n,t[r],r,t)},c=function(t,e){var n={};return a(t,function(e,o){n[o]=t[o]}),a(e,function(t,o){n[o]=e[o]}),n},u=function(t,e){for(var n=e.charAt(0);t&&t!==document;t=t.parentNode)if("."===n){if(t.classList.contains(e.substr(1)))return t}else if("#"===n){if(t.id===e.substr(1))return t}else if("["===n&&t.hasAttribute(e.substr(1,e.length-2)))return t;return!1},i=function(t){for(var e,n=String(t),o=n.length,r=-1,a="",c=n.charCodeAt(0);++r=1&&31>=e||127==e||0===r&&e>=48&&57>=e||1===r&&e>=48&&57>=e&&45===c?"\\"+e.toString(16)+" ":e>=128||45===e||95===e||e>=48&&57>=e||e>=65&&90>=e||e>=97&&122>=e?n.charAt(r):"\\"+n.charAt(r)}return a},s=function(t,e){var n;return"easeInQuad"===t&&(n=e*e),"easeOutQuad"===t&&(n=e*(2-e)),"easeInOutQuad"===t&&(n=.5>e?2*e*e:-1+(4-2*e)*e),"easeInCubic"===t&&(n=e*e*e),"easeOutCubic"===t&&(n=--e*e*e+1),"easeInOutCubic"===t&&(n=.5>e?4*e*e*e:(e-1)*(2*e-2)*(2*e-2)+1),"easeInQuart"===t&&(n=e*e*e*e),"easeOutQuart"===t&&(n=1- --e*e*e*e),"easeInOutQuart"===t&&(n=.5>e?8*e*e*e*e:1-8*--e*e*e*e),"easeInQuint"===t&&(n=e*e*e*e*e),"easeOutQuint"===t&&(n=1+--e*e*e*e*e),"easeInOutQuint"===t&&(n=.5>e?16*e*e*e*e*e:1+16*--e*e*e*e*e),n||e},l=function(t,e,n){var o=0;if(t.offsetParent)do o+=t.offsetTop,t=t.offsetParent;while(t);return o=o-e-n,o>=0?o:0},f=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},d=function(t){return t&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(t):{}},h=function(e,n){history.pushState&&(n||"true"===n)&&history.pushState(null,null,[t.location.protocol,"//",t.location.host,t.location.pathname,t.location.search,e].join(""))};n.animateScroll=function(e,n,o){var a=c(a||r,o||{}),u=d(e?e.getAttribute("data-options"):null);a=c(a,u),n="#"+i(n.substr(1));var p,m,b,v="#"===n?document.documentElement:document.querySelector(n),g=document.querySelector("[data-scroll-header]"),O=null===g?0:g.offsetHeight+g.offsetTop,y=t.pageYOffset,I=l(v,O,parseInt(a.offset,10)),S=I-y,A=f(),Q=0;h(n,a.updateURL);var C=function(o,r,c){var u=t.pageYOffset;(o==r||u==r||t.innerHeight+u>=A)&&(clearInterval(c),v.focus(),a.callbackAfter(e,n))},E=function(){Q+=16,m=Q/parseInt(a.speed,10),m=m>1?1:m,b=y+S*s(a.easing,m),t.scrollTo(0,Math.floor(b)),C(b,I,p)},H=function(){a.callbackBefore(e,n),p=setInterval(E,16)};0===t.pageYOffset&&t.scrollTo(0,0),H()};var p=function(t){var o=u(t.target,"[data-scroll]");o&&"a"===o.tagName.toLowerCase()&&(t.preventDefault(),n.animateScroll(o,o.hash,e))};return n.destroy=function(){e&&(document.removeEventListener("click",p,!1),e=null)},n.init=function(t){o&&(n.destroy(),e=c(r,t||{}),document.addEventListener("click",p,!1))},n}); \ No newline at end of file +/** smooth-scroll v5.3.1, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ +!function(e,t){"function"==typeof define&&define.amd?define("smoothScroll",t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)}(window||this,function(e){"use strict";var t,n,o,r,a={},u=!!document.querySelector&&!!e.addEventListener,c={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},i=function(e,t,n){if("[object Object]"===Object.prototype.toString.call(e))for(var o in e)Object.prototype.hasOwnProperty.call(e,o)&&t.call(n,e[o],o,e);else for(var r=0,a=e.length;a>r;r++)t.call(n,e[r],r,e)},l=function(e,t){var n={};return i(e,function(t,o){n[o]=e[o]}),i(t,function(e,o){n[o]=t[o]}),n},s=function(e,t){for(var n=t.charAt(0);e&&e!==document;e=e.parentNode)if("."===n){if(e.classList.contains(t.substr(1)))return e}else if("#"===n){if(e.id===t.substr(1))return e}else if("["===n&&e.hasAttribute(t.substr(1,t.length-2)))return e;return!1},f=function(e){for(var t,n=String(e),o=n.length,r=-1,a="",u=n.charCodeAt(0);++r=1&&31>=t||127==t||0===r&&t>=48&&57>=t||1===r&&t>=48&&57>=t&&45===u?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(r):"\\"+n.charAt(r)}return a},d=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},h=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=o-t-n,o>=0?o:0},m=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},p=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},v=function(t,n){history.pushState&&(n||"true"===n)&&history.pushState(null,null,[e.location.protocol,"//",e.location.host,e.location.pathname,e.location.search,t].join(""))};a.animateScroll=function(t,n,o){var a=l(a||c,o||{}),u=p(t?t.getAttribute("data-options"):null);a=l(a,u),n="#"+f(n.substr(1));var i,s,b,g="#"===n?document.documentElement:document.querySelector(n),O=e.pageYOffset,y=h(g,r,parseInt(a.offset,10)),I=y-O,S=m(),E=0;v(n,a.updateURL);var A=function(o,r,u){var c=e.pageYOffset;(o==r||c==r||e.innerHeight+c>=S)&&(clearInterval(u),g.focus(),a.callbackAfter(t,n))},H=function(){E+=16,s=E/parseInt(a.speed,10),s=s>1?1:s,b=O+I*d(a.easing,s),e.scrollTo(0,Math.floor(b)),A(b,y,i)},L=function(){a.callbackBefore(t,n),i=setInterval(H,16)};0===e.pageYOffset&&e.scrollTo(0,0),L()};var b=function(e){var n=s(e.target,"[data-scroll]");n&&"a"===n.tagName.toLowerCase()&&(e.preventDefault(),a.animateScroll(n,n.hash,t))},g=function(){n||(n=setTimeout(function(){n=null,r=null===o?0:o.offsetHeight+o.offsetTop},66))};return a.destroy=function(){t&&(document.removeEventListener("click",b,!1),e.removeEventListener("resize",g,!1),t=null,n=null,o=null,r=null)},a.init=function(n){u&&(a.destroy(),t=l(c,n||{}),o=document.querySelector("[data-scroll-header]"),r=null===o?0:o.offsetHeight+o.offsetTop,document.addEventListener("click",b,!1),e.addEventListener("resize",g,!1))},a}); \ No newline at end of file diff --git a/package.json b/package.json index 644fa74..f353b74 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "smooth-scroll", - "version": "5.3.0", + "version": "5.3.1", "description": "Animate scrolling to anchor links", "main": "./dist/js/smooth-scroll.js", "author": { diff --git a/src/js/smooth-scroll.js b/src/js/smooth-scroll.js index a517809..ea607d8 100755 --- a/src/js/smooth-scroll.js +++ b/src/js/smooth-scroll.js @@ -16,7 +16,7 @@ var smoothScroll = {}; // Object for public APIs var supports = !!document.querySelector && !!root.addEventListener; // Feature test - var settings; + var settings, eventTimeout, fixedHeader, headerHeight; // Default settings var defaults = { @@ -267,8 +267,6 @@ // Selectors and variables var anchorElem = anchor === '#' ? document.documentElement : document.querySelector(anchor); - var fixedHeader = document.querySelector('[data-scroll-header]'); // Get the fixed header - var headerHeight = fixedHeader === null ? 0 : (fixedHeader.offsetHeight + fixedHeader.offsetTop); // Get the height of a fixed header if one exists var startLocation = root.pageYOffset; // Current location on the page var endLocation = getEndLocation( anchorElem, headerHeight, parseInt(settings.offset, 10) ); // Scroll to location var animationInterval; // interval timer @@ -343,14 +341,39 @@ } }; + /** + * On window scroll and resize, only run events at a rate of 15fps for better performance + * @private + * @param {Function} eventTimeout Timeout function + * @param {Object} settings + */ + var eventThrottler = function (event) { + if ( !eventTimeout ) { + eventTimeout = setTimeout(function() { + eventTimeout = null; // Reset timeout + headerHeight = fixedHeader === null ? 0 : (fixedHeader.offsetHeight + fixedHeader.offsetTop); // Get the height of a fixed header if one exists + }, 66); + } + }; + /** * Destroy the current initialization. * @public */ smoothScroll.destroy = function () { + + // If plugin isn't already initialized, stop if ( !settings ) return; + + // Remove event listeners document.removeEventListener( 'click', eventHandler, false ); + root.removeEventListener( 'resize', eventThrottler, false ); + + // Reset varaibles settings = null; + eventTimeout = null; + fixedHeader = null; + headerHeight = null; }; /** @@ -368,9 +391,12 @@ // 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 : (fixedHeader.offsetHeight + 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); + document.addEventListener('click', eventHandler, false ); + root.addEventListener( 'resize', eventThrottler, false ); }; From d255f140b6e31eba0785044a45b9e87b2b80279d Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Sat, 20 Dec 2014 23:36:38 -0500 Subject: [PATCH 128/285] Added method to more accurately get node height --- README.md | 2 ++ dist/js/smooth-scroll.js | 18 ++++++++++++++---- dist/js/smooth-scroll.min.js | 4 ++-- docs/dist/js/smooth-scroll.js | 18 ++++++++++++++---- docs/dist/js/smooth-scroll.min.js | 4 ++-- package.json | 2 +- src/js/smooth-scroll.js | 16 +++++++++++++--- 7 files changed, 48 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 35c9422..ab97544 100755 --- a/README.md +++ b/README.md @@ -254,6 +254,8 @@ Smooth Scroll is licensed under the [MIT License](http://gomakethings.com/mit/). Smooth Scroll uses [semantic versioning](http://semver.org/). +* v5.3.2 - December 20, 2014 + * Added method to get nod eheight more accurately. * v5.3.1 - December 20, 2014 * Cache header height for better performance. * v5.3.0 - December 20, 2014 diff --git a/dist/js/smooth-scroll.js b/dist/js/smooth-scroll.js index f8815c8..22afd73 100755 --- a/dist/js/smooth-scroll.js +++ b/dist/js/smooth-scroll.js @@ -1,5 +1,5 @@ /** - * smooth-scroll v5.3.1 + * smooth-scroll v5.3.2 * Animate scrolling to anchor links, by Chris Ferdinandi. * http://github.com/cferdinandi/smooth-scroll * @@ -107,6 +107,16 @@ return false; }; + /** + * Get the height of an element + * @private + * @param {Node]} elem The element + * @return {Number} The element's height + */ + var getHeight = function (elem) { + return Math.max( elem.scrollHeight, elem.offsetHeight, elem.clientHeight ); + }; + /** * Escape special characters for use with querySelector * @private @@ -360,7 +370,7 @@ if ( !eventTimeout ) { eventTimeout = setTimeout(function() { eventTimeout = null; // Reset timeout - headerHeight = fixedHeader === null ? 0 : (fixedHeader.offsetHeight + fixedHeader.offsetTop); // Get the height of a fixed header if one exists + headerHeight = fixedHeader === null ? 0 : ( getHeight( fixedHeader ) + fixedHeader.offsetTop ); // Get the height of a fixed header if one exists }, 66); } }; @@ -401,11 +411,11 @@ // 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 : (fixedHeader.offsetHeight + fixedHeader.offsetTop); // Get the height of a fixed header if one exists + 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 ); - root.addEventListener( 'resize', eventThrottler, false ); + if ( fixedHeader ) { root.addEventListener( 'resize', eventThrottler, false ); } }; diff --git a/dist/js/smooth-scroll.min.js b/dist/js/smooth-scroll.min.js index f42c4f3..472887b 100755 --- a/dist/js/smooth-scroll.min.js +++ b/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ -/** smooth-scroll v5.3.1, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ -!function(e,t){"function"==typeof define&&define.amd?define("smoothScroll",t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)}(window||this,function(e){"use strict";var t,n,o,r,a={},u=!!document.querySelector&&!!e.addEventListener,c={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},i=function(e,t,n){if("[object Object]"===Object.prototype.toString.call(e))for(var o in e)Object.prototype.hasOwnProperty.call(e,o)&&t.call(n,e[o],o,e);else for(var r=0,a=e.length;a>r;r++)t.call(n,e[r],r,e)},l=function(e,t){var n={};return i(e,function(t,o){n[o]=e[o]}),i(t,function(e,o){n[o]=t[o]}),n},s=function(e,t){for(var n=t.charAt(0);e&&e!==document;e=e.parentNode)if("."===n){if(e.classList.contains(t.substr(1)))return e}else if("#"===n){if(e.id===t.substr(1))return e}else if("["===n&&e.hasAttribute(t.substr(1,t.length-2)))return e;return!1},f=function(e){for(var t,n=String(e),o=n.length,r=-1,a="",u=n.charCodeAt(0);++r=1&&31>=t||127==t||0===r&&t>=48&&57>=t||1===r&&t>=48&&57>=t&&45===u?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(r):"\\"+n.charAt(r)}return a},d=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},h=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=o-t-n,o>=0?o:0},m=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},p=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},v=function(t,n){history.pushState&&(n||"true"===n)&&history.pushState(null,null,[e.location.protocol,"//",e.location.host,e.location.pathname,e.location.search,t].join(""))};a.animateScroll=function(t,n,o){var a=l(a||c,o||{}),u=p(t?t.getAttribute("data-options"):null);a=l(a,u),n="#"+f(n.substr(1));var i,s,b,g="#"===n?document.documentElement:document.querySelector(n),O=e.pageYOffset,y=h(g,r,parseInt(a.offset,10)),I=y-O,S=m(),E=0;v(n,a.updateURL);var A=function(o,r,u){var c=e.pageYOffset;(o==r||c==r||e.innerHeight+c>=S)&&(clearInterval(u),g.focus(),a.callbackAfter(t,n))},H=function(){E+=16,s=E/parseInt(a.speed,10),s=s>1?1:s,b=O+I*d(a.easing,s),e.scrollTo(0,Math.floor(b)),A(b,y,i)},L=function(){a.callbackBefore(t,n),i=setInterval(H,16)};0===e.pageYOffset&&e.scrollTo(0,0),L()};var b=function(e){var n=s(e.target,"[data-scroll]");n&&"a"===n.tagName.toLowerCase()&&(e.preventDefault(),a.animateScroll(n,n.hash,t))},g=function(){n||(n=setTimeout(function(){n=null,r=null===o?0:o.offsetHeight+o.offsetTop},66))};return a.destroy=function(){t&&(document.removeEventListener("click",b,!1),e.removeEventListener("resize",g,!1),t=null,n=null,o=null,r=null)},a.init=function(n){u&&(a.destroy(),t=l(c,n||{}),o=document.querySelector("[data-scroll-header]"),r=null===o?0:o.offsetHeight+o.offsetTop,document.addEventListener("click",b,!1),e.addEventListener("resize",g,!1))},a}); \ No newline at end of file +/** smooth-scroll v5.3.2, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ +!function(t,e){"function"==typeof define&&define.amd?define("smoothScroll",e(t)):"object"==typeof exports?module.exports=e(t):t.smoothScroll=e(t)}(window||this,function(t){"use strict";var e,n,o,r,a={},u=!!document.querySelector&&!!t.addEventListener,c={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},i=function(t,e,n){if("[object Object]"===Object.prototype.toString.call(t))for(var o in t)Object.prototype.hasOwnProperty.call(t,o)&&e.call(n,t[o],o,t);else for(var r=0,a=t.length;a>r;r++)e.call(n,t[r],r,t)},l=function(t,e){var n={};return i(t,function(e,o){n[o]=t[o]}),i(e,function(t,o){n[o]=e[o]}),n},s=function(t,e){for(var n=e.charAt(0);t&&t!==document;t=t.parentNode)if("."===n){if(t.classList.contains(e.substr(1)))return t}else if("#"===n){if(t.id===e.substr(1))return t}else if("["===n&&t.hasAttribute(e.substr(1,e.length-2)))return t;return!1},f=function(t){return Math.max(t.scrollHeight,t.offsetHeight,t.clientHeight)},d=function(t){for(var e,n=String(t),o=n.length,r=-1,a="",u=n.charCodeAt(0);++r=1&&31>=e||127==e||0===r&&e>=48&&57>=e||1===r&&e>=48&&57>=e&&45===u?"\\"+e.toString(16)+" ":e>=128||45===e||95===e||e>=48&&57>=e||e>=65&&90>=e||e>=97&&122>=e?n.charAt(r):"\\"+n.charAt(r)}return a},h=function(t,e){var n;return"easeInQuad"===t&&(n=e*e),"easeOutQuad"===t&&(n=e*(2-e)),"easeInOutQuad"===t&&(n=.5>e?2*e*e:-1+(4-2*e)*e),"easeInCubic"===t&&(n=e*e*e),"easeOutCubic"===t&&(n=--e*e*e+1),"easeInOutCubic"===t&&(n=.5>e?4*e*e*e:(e-1)*(2*e-2)*(2*e-2)+1),"easeInQuart"===t&&(n=e*e*e*e),"easeOutQuart"===t&&(n=1- --e*e*e*e),"easeInOutQuart"===t&&(n=.5>e?8*e*e*e*e:1-8*--e*e*e*e),"easeInQuint"===t&&(n=e*e*e*e*e),"easeOutQuint"===t&&(n=1+--e*e*e*e*e),"easeInOutQuint"===t&&(n=.5>e?16*e*e*e*e*e:1+16*--e*e*e*e*e),n||e},m=function(t,e,n){var o=0;if(t.offsetParent)do o+=t.offsetTop,t=t.offsetParent;while(t);return o=o-e-n,o>=0?o:0},p=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},v=function(t){return t&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(t):{}},g=function(e,n){history.pushState&&(n||"true"===n)&&history.pushState(null,null,[t.location.protocol,"//",t.location.host,t.location.pathname,t.location.search,e].join(""))};a.animateScroll=function(e,n,o){var a=l(a||c,o||{}),u=v(e?e.getAttribute("data-options"):null);a=l(a,u),n="#"+d(n.substr(1));var i,s,f,b="#"===n?document.documentElement:document.querySelector(n),O=t.pageYOffset,y=m(b,r,parseInt(a.offset,10)),I=y-O,S=p(),E=0;g(n,a.updateURL);var H=function(o,r,u){var c=t.pageYOffset;(o==r||c==r||t.innerHeight+c>=S)&&(clearInterval(u),b.focus(),a.callbackAfter(e,n))},A=function(){E+=16,s=E/parseInt(a.speed,10),s=s>1?1:s,f=O+I*h(a.easing,s),t.scrollTo(0,Math.floor(f)),H(f,y,i)},L=function(){a.callbackBefore(e,n),i=setInterval(A,16)};0===t.pageYOffset&&t.scrollTo(0,0),L()};var b=function(t){var n=s(t.target,"[data-scroll]");n&&"a"===n.tagName.toLowerCase()&&(t.preventDefault(),a.animateScroll(n,n.hash,e))},O=function(){n||(n=setTimeout(function(){n=null,r=null===o?0:f(o)+o.offsetTop},66))};return a.destroy=function(){e&&(document.removeEventListener("click",b,!1),t.removeEventListener("resize",O,!1),e=null,n=null,o=null,r=null)},a.init=function(n){u&&(a.destroy(),e=l(c,n||{}),o=document.querySelector("[data-scroll-header]"),r=null===o?0:f(o)+o.offsetTop,document.addEventListener("click",b,!1),o&&t.addEventListener("resize",O,!1))},a}); \ No newline at end of file diff --git a/docs/dist/js/smooth-scroll.js b/docs/dist/js/smooth-scroll.js index f8815c8..22afd73 100755 --- a/docs/dist/js/smooth-scroll.js +++ b/docs/dist/js/smooth-scroll.js @@ -1,5 +1,5 @@ /** - * smooth-scroll v5.3.1 + * smooth-scroll v5.3.2 * Animate scrolling to anchor links, by Chris Ferdinandi. * http://github.com/cferdinandi/smooth-scroll * @@ -107,6 +107,16 @@ return false; }; + /** + * Get the height of an element + * @private + * @param {Node]} elem The element + * @return {Number} The element's height + */ + var getHeight = function (elem) { + return Math.max( elem.scrollHeight, elem.offsetHeight, elem.clientHeight ); + }; + /** * Escape special characters for use with querySelector * @private @@ -360,7 +370,7 @@ if ( !eventTimeout ) { eventTimeout = setTimeout(function() { eventTimeout = null; // Reset timeout - headerHeight = fixedHeader === null ? 0 : (fixedHeader.offsetHeight + fixedHeader.offsetTop); // Get the height of a fixed header if one exists + headerHeight = fixedHeader === null ? 0 : ( getHeight( fixedHeader ) + fixedHeader.offsetTop ); // Get the height of a fixed header if one exists }, 66); } }; @@ -401,11 +411,11 @@ // 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 : (fixedHeader.offsetHeight + fixedHeader.offsetTop); // Get the height of a fixed header if one exists + 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 ); - root.addEventListener( 'resize', eventThrottler, false ); + if ( fixedHeader ) { root.addEventListener( 'resize', eventThrottler, false ); } }; diff --git a/docs/dist/js/smooth-scroll.min.js b/docs/dist/js/smooth-scroll.min.js index f42c4f3..472887b 100755 --- a/docs/dist/js/smooth-scroll.min.js +++ b/docs/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ -/** smooth-scroll v5.3.1, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ -!function(e,t){"function"==typeof define&&define.amd?define("smoothScroll",t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)}(window||this,function(e){"use strict";var t,n,o,r,a={},u=!!document.querySelector&&!!e.addEventListener,c={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},i=function(e,t,n){if("[object Object]"===Object.prototype.toString.call(e))for(var o in e)Object.prototype.hasOwnProperty.call(e,o)&&t.call(n,e[o],o,e);else for(var r=0,a=e.length;a>r;r++)t.call(n,e[r],r,e)},l=function(e,t){var n={};return i(e,function(t,o){n[o]=e[o]}),i(t,function(e,o){n[o]=t[o]}),n},s=function(e,t){for(var n=t.charAt(0);e&&e!==document;e=e.parentNode)if("."===n){if(e.classList.contains(t.substr(1)))return e}else if("#"===n){if(e.id===t.substr(1))return e}else if("["===n&&e.hasAttribute(t.substr(1,t.length-2)))return e;return!1},f=function(e){for(var t,n=String(e),o=n.length,r=-1,a="",u=n.charCodeAt(0);++r=1&&31>=t||127==t||0===r&&t>=48&&57>=t||1===r&&t>=48&&57>=t&&45===u?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(r):"\\"+n.charAt(r)}return a},d=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},h=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=o-t-n,o>=0?o:0},m=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},p=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},v=function(t,n){history.pushState&&(n||"true"===n)&&history.pushState(null,null,[e.location.protocol,"//",e.location.host,e.location.pathname,e.location.search,t].join(""))};a.animateScroll=function(t,n,o){var a=l(a||c,o||{}),u=p(t?t.getAttribute("data-options"):null);a=l(a,u),n="#"+f(n.substr(1));var i,s,b,g="#"===n?document.documentElement:document.querySelector(n),O=e.pageYOffset,y=h(g,r,parseInt(a.offset,10)),I=y-O,S=m(),E=0;v(n,a.updateURL);var A=function(o,r,u){var c=e.pageYOffset;(o==r||c==r||e.innerHeight+c>=S)&&(clearInterval(u),g.focus(),a.callbackAfter(t,n))},H=function(){E+=16,s=E/parseInt(a.speed,10),s=s>1?1:s,b=O+I*d(a.easing,s),e.scrollTo(0,Math.floor(b)),A(b,y,i)},L=function(){a.callbackBefore(t,n),i=setInterval(H,16)};0===e.pageYOffset&&e.scrollTo(0,0),L()};var b=function(e){var n=s(e.target,"[data-scroll]");n&&"a"===n.tagName.toLowerCase()&&(e.preventDefault(),a.animateScroll(n,n.hash,t))},g=function(){n||(n=setTimeout(function(){n=null,r=null===o?0:o.offsetHeight+o.offsetTop},66))};return a.destroy=function(){t&&(document.removeEventListener("click",b,!1),e.removeEventListener("resize",g,!1),t=null,n=null,o=null,r=null)},a.init=function(n){u&&(a.destroy(),t=l(c,n||{}),o=document.querySelector("[data-scroll-header]"),r=null===o?0:o.offsetHeight+o.offsetTop,document.addEventListener("click",b,!1),e.addEventListener("resize",g,!1))},a}); \ No newline at end of file +/** smooth-scroll v5.3.2, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ +!function(t,e){"function"==typeof define&&define.amd?define("smoothScroll",e(t)):"object"==typeof exports?module.exports=e(t):t.smoothScroll=e(t)}(window||this,function(t){"use strict";var e,n,o,r,a={},u=!!document.querySelector&&!!t.addEventListener,c={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},i=function(t,e,n){if("[object Object]"===Object.prototype.toString.call(t))for(var o in t)Object.prototype.hasOwnProperty.call(t,o)&&e.call(n,t[o],o,t);else for(var r=0,a=t.length;a>r;r++)e.call(n,t[r],r,t)},l=function(t,e){var n={};return i(t,function(e,o){n[o]=t[o]}),i(e,function(t,o){n[o]=e[o]}),n},s=function(t,e){for(var n=e.charAt(0);t&&t!==document;t=t.parentNode)if("."===n){if(t.classList.contains(e.substr(1)))return t}else if("#"===n){if(t.id===e.substr(1))return t}else if("["===n&&t.hasAttribute(e.substr(1,e.length-2)))return t;return!1},f=function(t){return Math.max(t.scrollHeight,t.offsetHeight,t.clientHeight)},d=function(t){for(var e,n=String(t),o=n.length,r=-1,a="",u=n.charCodeAt(0);++r=1&&31>=e||127==e||0===r&&e>=48&&57>=e||1===r&&e>=48&&57>=e&&45===u?"\\"+e.toString(16)+" ":e>=128||45===e||95===e||e>=48&&57>=e||e>=65&&90>=e||e>=97&&122>=e?n.charAt(r):"\\"+n.charAt(r)}return a},h=function(t,e){var n;return"easeInQuad"===t&&(n=e*e),"easeOutQuad"===t&&(n=e*(2-e)),"easeInOutQuad"===t&&(n=.5>e?2*e*e:-1+(4-2*e)*e),"easeInCubic"===t&&(n=e*e*e),"easeOutCubic"===t&&(n=--e*e*e+1),"easeInOutCubic"===t&&(n=.5>e?4*e*e*e:(e-1)*(2*e-2)*(2*e-2)+1),"easeInQuart"===t&&(n=e*e*e*e),"easeOutQuart"===t&&(n=1- --e*e*e*e),"easeInOutQuart"===t&&(n=.5>e?8*e*e*e*e:1-8*--e*e*e*e),"easeInQuint"===t&&(n=e*e*e*e*e),"easeOutQuint"===t&&(n=1+--e*e*e*e*e),"easeInOutQuint"===t&&(n=.5>e?16*e*e*e*e*e:1+16*--e*e*e*e*e),n||e},m=function(t,e,n){var o=0;if(t.offsetParent)do o+=t.offsetTop,t=t.offsetParent;while(t);return o=o-e-n,o>=0?o:0},p=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},v=function(t){return t&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(t):{}},g=function(e,n){history.pushState&&(n||"true"===n)&&history.pushState(null,null,[t.location.protocol,"//",t.location.host,t.location.pathname,t.location.search,e].join(""))};a.animateScroll=function(e,n,o){var a=l(a||c,o||{}),u=v(e?e.getAttribute("data-options"):null);a=l(a,u),n="#"+d(n.substr(1));var i,s,f,b="#"===n?document.documentElement:document.querySelector(n),O=t.pageYOffset,y=m(b,r,parseInt(a.offset,10)),I=y-O,S=p(),E=0;g(n,a.updateURL);var H=function(o,r,u){var c=t.pageYOffset;(o==r||c==r||t.innerHeight+c>=S)&&(clearInterval(u),b.focus(),a.callbackAfter(e,n))},A=function(){E+=16,s=E/parseInt(a.speed,10),s=s>1?1:s,f=O+I*h(a.easing,s),t.scrollTo(0,Math.floor(f)),H(f,y,i)},L=function(){a.callbackBefore(e,n),i=setInterval(A,16)};0===t.pageYOffset&&t.scrollTo(0,0),L()};var b=function(t){var n=s(t.target,"[data-scroll]");n&&"a"===n.tagName.toLowerCase()&&(t.preventDefault(),a.animateScroll(n,n.hash,e))},O=function(){n||(n=setTimeout(function(){n=null,r=null===o?0:f(o)+o.offsetTop},66))};return a.destroy=function(){e&&(document.removeEventListener("click",b,!1),t.removeEventListener("resize",O,!1),e=null,n=null,o=null,r=null)},a.init=function(n){u&&(a.destroy(),e=l(c,n||{}),o=document.querySelector("[data-scroll-header]"),r=null===o?0:f(o)+o.offsetTop,document.addEventListener("click",b,!1),o&&t.addEventListener("resize",O,!1))},a}); \ No newline at end of file diff --git a/package.json b/package.json index f353b74..7fe9e3c 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "smooth-scroll", - "version": "5.3.1", + "version": "5.3.2", "description": "Animate scrolling to anchor links", "main": "./dist/js/smooth-scroll.js", "author": { diff --git a/src/js/smooth-scroll.js b/src/js/smooth-scroll.js index ea607d8..ee7e59a 100755 --- a/src/js/smooth-scroll.js +++ b/src/js/smooth-scroll.js @@ -98,6 +98,16 @@ return false; }; + /** + * Get the height of an element + * @private + * @param {Node]} elem The element + * @return {Number} The element's height + */ + var getHeight = function (elem) { + return Math.max( elem.scrollHeight, elem.offsetHeight, elem.clientHeight ); + }; + /** * Escape special characters for use with querySelector * @private @@ -351,7 +361,7 @@ if ( !eventTimeout ) { eventTimeout = setTimeout(function() { eventTimeout = null; // Reset timeout - headerHeight = fixedHeader === null ? 0 : (fixedHeader.offsetHeight + fixedHeader.offsetTop); // Get the height of a fixed header if one exists + headerHeight = fixedHeader === null ? 0 : ( getHeight( fixedHeader ) + fixedHeader.offsetTop ); // Get the height of a fixed header if one exists }, 66); } }; @@ -392,11 +402,11 @@ // 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 : (fixedHeader.offsetHeight + fixedHeader.offsetTop); // Get the height of a fixed header if one exists + 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 ); - root.addEventListener( 'resize', eventThrottler, false ); + if ( fixedHeader ) { root.addEventListener( 'resize', eventThrottler, false ); } }; From 484b1d163d5abcc291dcdba7d93713c34d8bd3bc Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Sun, 21 Dec 2014 19:58:23 -0500 Subject: [PATCH 129/285] Adjust how fixedHeader is set --- README.md | 4 +++- dist/js/smooth-scroll.js | 8 ++++---- dist/js/smooth-scroll.min.js | 4 ++-- docs/dist/js/smooth-scroll.js | 8 ++++---- docs/dist/js/smooth-scroll.min.js | 4 ++-- package.json | 2 +- src/js/smooth-scroll.js | 6 +++--- 7 files changed, 19 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index ab97544..cb4bac0 100755 --- a/README.md +++ b/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 diff --git a/dist/js/smooth-scroll.js b/dist/js/smooth-scroll.js index 22afd73..f187eb7 100755 --- a/dist/js/smooth-scroll.js +++ b/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 ); diff --git a/dist/js/smooth-scroll.min.js b/dist/js/smooth-scroll.min.js index 472887b..1e4828f 100755 --- a/dist/js/smooth-scroll.min.js +++ b/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ -/** smooth-scroll v5.3.2, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ -!function(t,e){"function"==typeof define&&define.amd?define("smoothScroll",e(t)):"object"==typeof exports?module.exports=e(t):t.smoothScroll=e(t)}(window||this,function(t){"use strict";var e,n,o,r,a={},u=!!document.querySelector&&!!t.addEventListener,c={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},i=function(t,e,n){if("[object Object]"===Object.prototype.toString.call(t))for(var o in t)Object.prototype.hasOwnProperty.call(t,o)&&e.call(n,t[o],o,t);else for(var r=0,a=t.length;a>r;r++)e.call(n,t[r],r,t)},l=function(t,e){var n={};return i(t,function(e,o){n[o]=t[o]}),i(e,function(t,o){n[o]=e[o]}),n},s=function(t,e){for(var n=e.charAt(0);t&&t!==document;t=t.parentNode)if("."===n){if(t.classList.contains(e.substr(1)))return t}else if("#"===n){if(t.id===e.substr(1))return t}else if("["===n&&t.hasAttribute(e.substr(1,e.length-2)))return t;return!1},f=function(t){return Math.max(t.scrollHeight,t.offsetHeight,t.clientHeight)},d=function(t){for(var e,n=String(t),o=n.length,r=-1,a="",u=n.charCodeAt(0);++r=1&&31>=e||127==e||0===r&&e>=48&&57>=e||1===r&&e>=48&&57>=e&&45===u?"\\"+e.toString(16)+" ":e>=128||45===e||95===e||e>=48&&57>=e||e>=65&&90>=e||e>=97&&122>=e?n.charAt(r):"\\"+n.charAt(r)}return a},h=function(t,e){var n;return"easeInQuad"===t&&(n=e*e),"easeOutQuad"===t&&(n=e*(2-e)),"easeInOutQuad"===t&&(n=.5>e?2*e*e:-1+(4-2*e)*e),"easeInCubic"===t&&(n=e*e*e),"easeOutCubic"===t&&(n=--e*e*e+1),"easeInOutCubic"===t&&(n=.5>e?4*e*e*e:(e-1)*(2*e-2)*(2*e-2)+1),"easeInQuart"===t&&(n=e*e*e*e),"easeOutQuart"===t&&(n=1- --e*e*e*e),"easeInOutQuart"===t&&(n=.5>e?8*e*e*e*e:1-8*--e*e*e*e),"easeInQuint"===t&&(n=e*e*e*e*e),"easeOutQuint"===t&&(n=1+--e*e*e*e*e),"easeInOutQuint"===t&&(n=.5>e?16*e*e*e*e*e:1+16*--e*e*e*e*e),n||e},m=function(t,e,n){var o=0;if(t.offsetParent)do o+=t.offsetTop,t=t.offsetParent;while(t);return o=o-e-n,o>=0?o:0},p=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},v=function(t){return t&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(t):{}},g=function(e,n){history.pushState&&(n||"true"===n)&&history.pushState(null,null,[t.location.protocol,"//",t.location.host,t.location.pathname,t.location.search,e].join(""))};a.animateScroll=function(e,n,o){var a=l(a||c,o||{}),u=v(e?e.getAttribute("data-options"):null);a=l(a,u),n="#"+d(n.substr(1));var i,s,f,b="#"===n?document.documentElement:document.querySelector(n),O=t.pageYOffset,y=m(b,r,parseInt(a.offset,10)),I=y-O,S=p(),E=0;g(n,a.updateURL);var H=function(o,r,u){var c=t.pageYOffset;(o==r||c==r||t.innerHeight+c>=S)&&(clearInterval(u),b.focus(),a.callbackAfter(e,n))},A=function(){E+=16,s=E/parseInt(a.speed,10),s=s>1?1:s,f=O+I*h(a.easing,s),t.scrollTo(0,Math.floor(f)),H(f,y,i)},L=function(){a.callbackBefore(e,n),i=setInterval(A,16)};0===t.pageYOffset&&t.scrollTo(0,0),L()};var b=function(t){var n=s(t.target,"[data-scroll]");n&&"a"===n.tagName.toLowerCase()&&(t.preventDefault(),a.animateScroll(n,n.hash,e))},O=function(){n||(n=setTimeout(function(){n=null,r=null===o?0:f(o)+o.offsetTop},66))};return a.destroy=function(){e&&(document.removeEventListener("click",b,!1),t.removeEventListener("resize",O,!1),e=null,n=null,o=null,r=null)},a.init=function(n){u&&(a.destroy(),e=l(c,n||{}),o=document.querySelector("[data-scroll-header]"),r=null===o?0:f(o)+o.offsetTop,document.addEventListener("click",b,!1),o&&t.addEventListener("resize",O,!1))},a}); \ No newline at end of file +/** smooth-scroll v5.3.3, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ +!function(e,t){"function"==typeof define&&define.amd?define("smoothScroll",t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)}(window||this,function(e){"use strict";var t,n,o,r={},a=!!document.querySelector&&!!e.addEventListener,c={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},u=function(e,t,n){if("[object Object]"===Object.prototype.toString.call(e))for(var o in e)Object.prototype.hasOwnProperty.call(e,o)&&t.call(n,e[o],o,e);else for(var r=0,a=e.length;a>r;r++)t.call(n,e[r],r,e)},i=function(e,t){var n={};return u(e,function(t,o){n[o]=e[o]}),u(t,function(e,o){n[o]=t[o]}),n},l=function(e,t){for(var n=t.charAt(0);e&&e!==document;e=e.parentNode)if("."===n){if(e.classList.contains(t.substr(1)))return e}else if("#"===n){if(e.id===t.substr(1))return e}else if("["===n&&e.hasAttribute(t.substr(1,t.length-2)))return e;return!1},s=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},f=function(e){for(var t,n=String(e),o=n.length,r=-1,a="",c=n.charCodeAt(0);++r=1&&31>=t||127==t||0===r&&t>=48&&57>=t||1===r&&t>=48&&57>=t&&45===c?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(r):"\\"+n.charAt(r)}return a},d=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},h=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=o-t-n,o>=0?o:0},m=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},p=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},v=function(t,n){history.pushState&&(n||"true"===n)&&history.pushState(null,null,[e.location.protocol,"//",e.location.host,e.location.pathname,e.location.search,t].join(""))};r.animateScroll=function(t,n,r){var a=i(a||c,r||{}),u=p(t?t.getAttribute("data-options"):null);a=i(a,u),n="#"+f(n.substr(1));var l="#"===n?document.documentElement:document.querySelector(n),g=e.pageYOffset;o||(o=document.querySelector("[data-scroll-header]"));var b,O,y,S=null===o?0:s(o)+o.offsetTop,I=h(l,S,parseInt(a.offset,10)),H=I-g,E=m(),A=0;v(n,a.updateURL);var L=function(o,r,c){var u=e.pageYOffset;(o==r||u==r||e.innerHeight+u>=E)&&(clearInterval(c),l.focus(),a.callbackAfter(t,n))},Q=function(){A+=16,O=A/parseInt(a.speed,10),O=O>1?1:O,y=g+H*d(a.easing,O),e.scrollTo(0,Math.floor(y)),L(y,I,b)},C=function(){a.callbackBefore(t,n),b=setInterval(Q,16)};0===e.pageYOffset&&e.scrollTo(0,0),C()};var g=function(e){var n=l(e.target,"[data-scroll]");n&&"a"===n.tagName.toLowerCase()&&(e.preventDefault(),r.animateScroll(n,n.hash,t))},b=function(){n||(n=setTimeout(function(){n=null,headerHeight=null===o?0:s(o)+o.offsetTop},66))};return r.destroy=function(){t&&(document.removeEventListener("click",g,!1),e.removeEventListener("resize",b,!1),t=null,n=null,o=null)},r.init=function(n){a&&(r.destroy(),t=i(c,n||{}),o=document.querySelector("[data-scroll-header]"),document.addEventListener("click",g,!1),o&&e.addEventListener("resize",b,!1))},r}); \ No newline at end of file diff --git a/docs/dist/js/smooth-scroll.js b/docs/dist/js/smooth-scroll.js index 22afd73..f187eb7 100755 --- a/docs/dist/js/smooth-scroll.js +++ b/docs/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 ); diff --git a/docs/dist/js/smooth-scroll.min.js b/docs/dist/js/smooth-scroll.min.js index 472887b..1e4828f 100755 --- a/docs/dist/js/smooth-scroll.min.js +++ b/docs/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ -/** smooth-scroll v5.3.2, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ -!function(t,e){"function"==typeof define&&define.amd?define("smoothScroll",e(t)):"object"==typeof exports?module.exports=e(t):t.smoothScroll=e(t)}(window||this,function(t){"use strict";var e,n,o,r,a={},u=!!document.querySelector&&!!t.addEventListener,c={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},i=function(t,e,n){if("[object Object]"===Object.prototype.toString.call(t))for(var o in t)Object.prototype.hasOwnProperty.call(t,o)&&e.call(n,t[o],o,t);else for(var r=0,a=t.length;a>r;r++)e.call(n,t[r],r,t)},l=function(t,e){var n={};return i(t,function(e,o){n[o]=t[o]}),i(e,function(t,o){n[o]=e[o]}),n},s=function(t,e){for(var n=e.charAt(0);t&&t!==document;t=t.parentNode)if("."===n){if(t.classList.contains(e.substr(1)))return t}else if("#"===n){if(t.id===e.substr(1))return t}else if("["===n&&t.hasAttribute(e.substr(1,e.length-2)))return t;return!1},f=function(t){return Math.max(t.scrollHeight,t.offsetHeight,t.clientHeight)},d=function(t){for(var e,n=String(t),o=n.length,r=-1,a="",u=n.charCodeAt(0);++r=1&&31>=e||127==e||0===r&&e>=48&&57>=e||1===r&&e>=48&&57>=e&&45===u?"\\"+e.toString(16)+" ":e>=128||45===e||95===e||e>=48&&57>=e||e>=65&&90>=e||e>=97&&122>=e?n.charAt(r):"\\"+n.charAt(r)}return a},h=function(t,e){var n;return"easeInQuad"===t&&(n=e*e),"easeOutQuad"===t&&(n=e*(2-e)),"easeInOutQuad"===t&&(n=.5>e?2*e*e:-1+(4-2*e)*e),"easeInCubic"===t&&(n=e*e*e),"easeOutCubic"===t&&(n=--e*e*e+1),"easeInOutCubic"===t&&(n=.5>e?4*e*e*e:(e-1)*(2*e-2)*(2*e-2)+1),"easeInQuart"===t&&(n=e*e*e*e),"easeOutQuart"===t&&(n=1- --e*e*e*e),"easeInOutQuart"===t&&(n=.5>e?8*e*e*e*e:1-8*--e*e*e*e),"easeInQuint"===t&&(n=e*e*e*e*e),"easeOutQuint"===t&&(n=1+--e*e*e*e*e),"easeInOutQuint"===t&&(n=.5>e?16*e*e*e*e*e:1+16*--e*e*e*e*e),n||e},m=function(t,e,n){var o=0;if(t.offsetParent)do o+=t.offsetTop,t=t.offsetParent;while(t);return o=o-e-n,o>=0?o:0},p=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},v=function(t){return t&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(t):{}},g=function(e,n){history.pushState&&(n||"true"===n)&&history.pushState(null,null,[t.location.protocol,"//",t.location.host,t.location.pathname,t.location.search,e].join(""))};a.animateScroll=function(e,n,o){var a=l(a||c,o||{}),u=v(e?e.getAttribute("data-options"):null);a=l(a,u),n="#"+d(n.substr(1));var i,s,f,b="#"===n?document.documentElement:document.querySelector(n),O=t.pageYOffset,y=m(b,r,parseInt(a.offset,10)),I=y-O,S=p(),E=0;g(n,a.updateURL);var H=function(o,r,u){var c=t.pageYOffset;(o==r||c==r||t.innerHeight+c>=S)&&(clearInterval(u),b.focus(),a.callbackAfter(e,n))},A=function(){E+=16,s=E/parseInt(a.speed,10),s=s>1?1:s,f=O+I*h(a.easing,s),t.scrollTo(0,Math.floor(f)),H(f,y,i)},L=function(){a.callbackBefore(e,n),i=setInterval(A,16)};0===t.pageYOffset&&t.scrollTo(0,0),L()};var b=function(t){var n=s(t.target,"[data-scroll]");n&&"a"===n.tagName.toLowerCase()&&(t.preventDefault(),a.animateScroll(n,n.hash,e))},O=function(){n||(n=setTimeout(function(){n=null,r=null===o?0:f(o)+o.offsetTop},66))};return a.destroy=function(){e&&(document.removeEventListener("click",b,!1),t.removeEventListener("resize",O,!1),e=null,n=null,o=null,r=null)},a.init=function(n){u&&(a.destroy(),e=l(c,n||{}),o=document.querySelector("[data-scroll-header]"),r=null===o?0:f(o)+o.offsetTop,document.addEventListener("click",b,!1),o&&t.addEventListener("resize",O,!1))},a}); \ No newline at end of file +/** smooth-scroll v5.3.3, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ +!function(e,t){"function"==typeof define&&define.amd?define("smoothScroll",t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)}(window||this,function(e){"use strict";var t,n,o,r={},a=!!document.querySelector&&!!e.addEventListener,c={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},u=function(e,t,n){if("[object Object]"===Object.prototype.toString.call(e))for(var o in e)Object.prototype.hasOwnProperty.call(e,o)&&t.call(n,e[o],o,e);else for(var r=0,a=e.length;a>r;r++)t.call(n,e[r],r,e)},i=function(e,t){var n={};return u(e,function(t,o){n[o]=e[o]}),u(t,function(e,o){n[o]=t[o]}),n},l=function(e,t){for(var n=t.charAt(0);e&&e!==document;e=e.parentNode)if("."===n){if(e.classList.contains(t.substr(1)))return e}else if("#"===n){if(e.id===t.substr(1))return e}else if("["===n&&e.hasAttribute(t.substr(1,t.length-2)))return e;return!1},s=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},f=function(e){for(var t,n=String(e),o=n.length,r=-1,a="",c=n.charCodeAt(0);++r=1&&31>=t||127==t||0===r&&t>=48&&57>=t||1===r&&t>=48&&57>=t&&45===c?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(r):"\\"+n.charAt(r)}return a},d=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},h=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=o-t-n,o>=0?o:0},m=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},p=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},v=function(t,n){history.pushState&&(n||"true"===n)&&history.pushState(null,null,[e.location.protocol,"//",e.location.host,e.location.pathname,e.location.search,t].join(""))};r.animateScroll=function(t,n,r){var a=i(a||c,r||{}),u=p(t?t.getAttribute("data-options"):null);a=i(a,u),n="#"+f(n.substr(1));var l="#"===n?document.documentElement:document.querySelector(n),g=e.pageYOffset;o||(o=document.querySelector("[data-scroll-header]"));var b,O,y,S=null===o?0:s(o)+o.offsetTop,I=h(l,S,parseInt(a.offset,10)),H=I-g,E=m(),A=0;v(n,a.updateURL);var L=function(o,r,c){var u=e.pageYOffset;(o==r||u==r||e.innerHeight+u>=E)&&(clearInterval(c),l.focus(),a.callbackAfter(t,n))},Q=function(){A+=16,O=A/parseInt(a.speed,10),O=O>1?1:O,y=g+H*d(a.easing,O),e.scrollTo(0,Math.floor(y)),L(y,I,b)},C=function(){a.callbackBefore(t,n),b=setInterval(Q,16)};0===e.pageYOffset&&e.scrollTo(0,0),C()};var g=function(e){var n=l(e.target,"[data-scroll]");n&&"a"===n.tagName.toLowerCase()&&(e.preventDefault(),r.animateScroll(n,n.hash,t))},b=function(){n||(n=setTimeout(function(){n=null,headerHeight=null===o?0:s(o)+o.offsetTop},66))};return r.destroy=function(){t&&(document.removeEventListener("click",g,!1),e.removeEventListener("resize",b,!1),t=null,n=null,o=null)},r.init=function(n){a&&(r.destroy(),t=i(c,n||{}),o=document.querySelector("[data-scroll-header]"),document.addEventListener("click",g,!1),o&&e.addEventListener("resize",b,!1))},r}); \ No newline at end of file diff --git a/package.json b/package.json index 7fe9e3c..194d7d3 100755 --- a/package.json +++ b/package.json @@ -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": { diff --git a/src/js/smooth-scroll.js b/src/js/smooth-scroll.js index ee7e59a..23a3387 100755 --- a/src/js/smooth-scroll.js +++ b/src/js/smooth-scroll.js @@ -16,7 +16,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 = { @@ -278,6 +278,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 @@ -383,7 +385,6 @@ settings = null; eventTimeout = null; fixedHeader = null; - headerHeight = null; }; /** @@ -402,7 +403,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 ); From 7cd329c47816697a9d67cf01ee3537810d975869 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Fri, 6 Mar 2015 07:30:16 -0500 Subject: [PATCH 130/285] Fixed `headerHeight` error with fixed headers https://github.com/cferdinandi/smooth-scroll/issues/149 --- README.md | 2 ++ dist/js/smooth-scroll.js | 14 ++++++++++---- dist/js/smooth-scroll.min.js | 4 ++-- docs/dist/js/smooth-scroll.js | 14 ++++++++++---- docs/dist/js/smooth-scroll.min.js | 4 ++-- gulpfile.js | 31 ++++++++++++++++++++----------- package.json | 2 +- src/js/smooth-scroll.js | 12 +++++++++--- 8 files changed, 56 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index cb4bac0..cf45f73 100755 --- a/README.md +++ b/README.md @@ -254,6 +254,8 @@ Smooth Scroll is licensed under the [MIT License](http://gomakethings.com/mit/). Smooth Scroll uses [semantic versioning](http://semver.org/). +* v5.3.4 - March 6, 2015 + * Fixed `headerHeight` error with fixed headers. (https://github.com/cferdinandi/smooth-scroll/issues/149) * v5.3.3 - December 21, 2014 * Adjust how fixed header is set for better accuracy and flexibility. * v5.3.2 - December 20, 2014 diff --git a/dist/js/smooth-scroll.js b/dist/js/smooth-scroll.js index f187eb7..4f228cd 100755 --- a/dist/js/smooth-scroll.js +++ b/dist/js/smooth-scroll.js @@ -1,5 +1,5 @@ /** - * smooth-scroll v5.3.3 + * smooth-scroll v5.3.4 * 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; + var settings, eventTimeout, fixedHeader, headerHeight; // Default settings var defaults = { @@ -269,6 +269,10 @@ } }; + var getHeaderHeight = function ( header ) { + return header === null ? 0 : ( getHeight( header ) + header.offsetTop ); + }; + /** * Start/stop the scrolling animation * @public @@ -288,7 +292,7 @@ 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 + if ( !headerHeight ) { headerHeight = getHeaderHeight( fixedHeader ); } // Get the height of a fixed header if one exists and not already set var endLocation = getEndLocation( anchorElem, headerHeight, parseInt(settings.offset, 10) ); // Scroll to location var animationInterval; // interval timer var distance = endLocation - startLocation; // distance to travel @@ -372,7 +376,7 @@ if ( !eventTimeout ) { eventTimeout = setTimeout(function() { eventTimeout = null; // Reset timeout - headerHeight = fixedHeader === null ? 0 : ( getHeight( fixedHeader ) + fixedHeader.offsetTop ); // Get the height of a fixed header if one exists + headerHeight = getHeaderHeight( fixedHeader ); // Get the height of a fixed header if one exists }, 66); } }; @@ -394,6 +398,7 @@ settings = null; eventTimeout = null; fixedHeader = null; + headerHeight = null; }; /** @@ -412,6 +417,7 @@ // Selectors and variables settings = extend( defaults, options || {} ); // Merge user options with defaults fixedHeader = document.querySelector('[data-scroll-header]'); // Get the fixed header + headerHeight = getHeaderHeight( fixedHeader ); // When a toggle is clicked, run the click handler document.addEventListener('click', eventHandler, false ); diff --git a/dist/js/smooth-scroll.min.js b/dist/js/smooth-scroll.min.js index 1e4828f..3c56e19 100755 --- a/dist/js/smooth-scroll.min.js +++ b/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ -/** smooth-scroll v5.3.3, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ -!function(e,t){"function"==typeof define&&define.amd?define("smoothScroll",t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)}(window||this,function(e){"use strict";var t,n,o,r={},a=!!document.querySelector&&!!e.addEventListener,c={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},u=function(e,t,n){if("[object Object]"===Object.prototype.toString.call(e))for(var o in e)Object.prototype.hasOwnProperty.call(e,o)&&t.call(n,e[o],o,e);else for(var r=0,a=e.length;a>r;r++)t.call(n,e[r],r,e)},i=function(e,t){var n={};return u(e,function(t,o){n[o]=e[o]}),u(t,function(e,o){n[o]=t[o]}),n},l=function(e,t){for(var n=t.charAt(0);e&&e!==document;e=e.parentNode)if("."===n){if(e.classList.contains(t.substr(1)))return e}else if("#"===n){if(e.id===t.substr(1))return e}else if("["===n&&e.hasAttribute(t.substr(1,t.length-2)))return e;return!1},s=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},f=function(e){for(var t,n=String(e),o=n.length,r=-1,a="",c=n.charCodeAt(0);++r=1&&31>=t||127==t||0===r&&t>=48&&57>=t||1===r&&t>=48&&57>=t&&45===c?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(r):"\\"+n.charAt(r)}return a},d=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},h=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=o-t-n,o>=0?o:0},m=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},p=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},v=function(t,n){history.pushState&&(n||"true"===n)&&history.pushState(null,null,[e.location.protocol,"//",e.location.host,e.location.pathname,e.location.search,t].join(""))};r.animateScroll=function(t,n,r){var a=i(a||c,r||{}),u=p(t?t.getAttribute("data-options"):null);a=i(a,u),n="#"+f(n.substr(1));var l="#"===n?document.documentElement:document.querySelector(n),g=e.pageYOffset;o||(o=document.querySelector("[data-scroll-header]"));var b,O,y,S=null===o?0:s(o)+o.offsetTop,I=h(l,S,parseInt(a.offset,10)),H=I-g,E=m(),A=0;v(n,a.updateURL);var L=function(o,r,c){var u=e.pageYOffset;(o==r||u==r||e.innerHeight+u>=E)&&(clearInterval(c),l.focus(),a.callbackAfter(t,n))},Q=function(){A+=16,O=A/parseInt(a.speed,10),O=O>1?1:O,y=g+H*d(a.easing,O),e.scrollTo(0,Math.floor(y)),L(y,I,b)},C=function(){a.callbackBefore(t,n),b=setInterval(Q,16)};0===e.pageYOffset&&e.scrollTo(0,0),C()};var g=function(e){var n=l(e.target,"[data-scroll]");n&&"a"===n.tagName.toLowerCase()&&(e.preventDefault(),r.animateScroll(n,n.hash,t))},b=function(){n||(n=setTimeout(function(){n=null,headerHeight=null===o?0:s(o)+o.offsetTop},66))};return r.destroy=function(){t&&(document.removeEventListener("click",g,!1),e.removeEventListener("resize",b,!1),t=null,n=null,o=null)},r.init=function(n){a&&(r.destroy(),t=i(c,n||{}),o=document.querySelector("[data-scroll-header]"),document.addEventListener("click",g,!1),o&&e.addEventListener("resize",b,!1))},r}); \ No newline at end of file +/** smooth-scroll v5.3.4, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ +!function(e,t){"function"==typeof define&&define.amd?define("smoothScroll",t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)}(window||this,function(e){"use strict";var t,n,o,r,a={},c=!!document.querySelector&&!!e.addEventListener,u={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},i=function(e,t,n){if("[object Object]"===Object.prototype.toString.call(e))for(var o in e)Object.prototype.hasOwnProperty.call(e,o)&&t.call(n,e[o],o,e);else for(var r=0,a=e.length;a>r;r++)t.call(n,e[r],r,e)},l=function(e,t){var n={};return i(e,function(t,o){n[o]=e[o]}),i(t,function(e,o){n[o]=t[o]}),n},s=function(e,t){for(var n=t.charAt(0);e&&e!==document;e=e.parentNode)if("."===n){if(e.classList.contains(t.substr(1)))return e}else if("#"===n){if(e.id===t.substr(1))return e}else if("["===n&&e.hasAttribute(t.substr(1,t.length-2)))return e;return!1},f=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},d=function(e){for(var t,n=String(e),o=n.length,r=-1,a="",c=n.charCodeAt(0);++r=1&&31>=t||127==t||0===r&&t>=48&&57>=t||1===r&&t>=48&&57>=t&&45===c?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(r):"\\"+n.charAt(r)}return a},h=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},m=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=o-t-n,o>=0?o:0},p=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},v=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},g=function(t,n){history.pushState&&(n||"true"===n)&&history.pushState(null,null,[e.location.protocol,"//",e.location.host,e.location.pathname,e.location.search,t].join(""))},b=function(e){return null===e?0:f(e)+e.offsetTop};a.animateScroll=function(t,n,a){var c=l(c||u,a||{}),i=v(t?t.getAttribute("data-options"):null);c=l(c,i),n="#"+d(n.substr(1));var s="#"===n?document.documentElement:document.querySelector(n),f=e.pageYOffset;o||(o=document.querySelector("[data-scroll-header]")),r||(r=b(o));var O,y,S,I=m(s,r,parseInt(c.offset,10)),E=I-f,H=p(),A=0;g(n,c.updateURL);var L=function(o,r,a){var u=e.pageYOffset;(o==r||u==r||e.innerHeight+u>=H)&&(clearInterval(a),s.focus(),c.callbackAfter(t,n))},Q=function(){A+=16,y=A/parseInt(c.speed,10),y=y>1?1:y,S=f+E*h(c.easing,y),e.scrollTo(0,Math.floor(S)),L(S,I,O)},C=function(){c.callbackBefore(t,n),O=setInterval(Q,16)};0===e.pageYOffset&&e.scrollTo(0,0),C()};var O=function(e){var n=s(e.target,"[data-scroll]");n&&"a"===n.tagName.toLowerCase()&&(e.preventDefault(),a.animateScroll(n,n.hash,t))},y=function(){n||(n=setTimeout(function(){n=null,r=b(o)},66))};return a.destroy=function(){t&&(document.removeEventListener("click",O,!1),e.removeEventListener("resize",y,!1),t=null,n=null,o=null,r=null)},a.init=function(n){c&&(a.destroy(),t=l(u,n||{}),o=document.querySelector("[data-scroll-header]"),r=b(o),document.addEventListener("click",O,!1),o&&e.addEventListener("resize",y,!1))},a}); \ No newline at end of file diff --git a/docs/dist/js/smooth-scroll.js b/docs/dist/js/smooth-scroll.js index f187eb7..4f228cd 100755 --- a/docs/dist/js/smooth-scroll.js +++ b/docs/dist/js/smooth-scroll.js @@ -1,5 +1,5 @@ /** - * smooth-scroll v5.3.3 + * smooth-scroll v5.3.4 * 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; + var settings, eventTimeout, fixedHeader, headerHeight; // Default settings var defaults = { @@ -269,6 +269,10 @@ } }; + var getHeaderHeight = function ( header ) { + return header === null ? 0 : ( getHeight( header ) + header.offsetTop ); + }; + /** * Start/stop the scrolling animation * @public @@ -288,7 +292,7 @@ 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 + if ( !headerHeight ) { headerHeight = getHeaderHeight( fixedHeader ); } // Get the height of a fixed header if one exists and not already set var endLocation = getEndLocation( anchorElem, headerHeight, parseInt(settings.offset, 10) ); // Scroll to location var animationInterval; // interval timer var distance = endLocation - startLocation; // distance to travel @@ -372,7 +376,7 @@ if ( !eventTimeout ) { eventTimeout = setTimeout(function() { eventTimeout = null; // Reset timeout - headerHeight = fixedHeader === null ? 0 : ( getHeight( fixedHeader ) + fixedHeader.offsetTop ); // Get the height of a fixed header if one exists + headerHeight = getHeaderHeight( fixedHeader ); // Get the height of a fixed header if one exists }, 66); } }; @@ -394,6 +398,7 @@ settings = null; eventTimeout = null; fixedHeader = null; + headerHeight = null; }; /** @@ -412,6 +417,7 @@ // Selectors and variables settings = extend( defaults, options || {} ); // Merge user options with defaults fixedHeader = document.querySelector('[data-scroll-header]'); // Get the fixed header + headerHeight = getHeaderHeight( fixedHeader ); // When a toggle is clicked, run the click handler document.addEventListener('click', eventHandler, false ); diff --git a/docs/dist/js/smooth-scroll.min.js b/docs/dist/js/smooth-scroll.min.js index 1e4828f..3c56e19 100755 --- a/docs/dist/js/smooth-scroll.min.js +++ b/docs/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ -/** smooth-scroll v5.3.3, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ -!function(e,t){"function"==typeof define&&define.amd?define("smoothScroll",t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)}(window||this,function(e){"use strict";var t,n,o,r={},a=!!document.querySelector&&!!e.addEventListener,c={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},u=function(e,t,n){if("[object Object]"===Object.prototype.toString.call(e))for(var o in e)Object.prototype.hasOwnProperty.call(e,o)&&t.call(n,e[o],o,e);else for(var r=0,a=e.length;a>r;r++)t.call(n,e[r],r,e)},i=function(e,t){var n={};return u(e,function(t,o){n[o]=e[o]}),u(t,function(e,o){n[o]=t[o]}),n},l=function(e,t){for(var n=t.charAt(0);e&&e!==document;e=e.parentNode)if("."===n){if(e.classList.contains(t.substr(1)))return e}else if("#"===n){if(e.id===t.substr(1))return e}else if("["===n&&e.hasAttribute(t.substr(1,t.length-2)))return e;return!1},s=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},f=function(e){for(var t,n=String(e),o=n.length,r=-1,a="",c=n.charCodeAt(0);++r=1&&31>=t||127==t||0===r&&t>=48&&57>=t||1===r&&t>=48&&57>=t&&45===c?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(r):"\\"+n.charAt(r)}return a},d=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},h=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=o-t-n,o>=0?o:0},m=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},p=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},v=function(t,n){history.pushState&&(n||"true"===n)&&history.pushState(null,null,[e.location.protocol,"//",e.location.host,e.location.pathname,e.location.search,t].join(""))};r.animateScroll=function(t,n,r){var a=i(a||c,r||{}),u=p(t?t.getAttribute("data-options"):null);a=i(a,u),n="#"+f(n.substr(1));var l="#"===n?document.documentElement:document.querySelector(n),g=e.pageYOffset;o||(o=document.querySelector("[data-scroll-header]"));var b,O,y,S=null===o?0:s(o)+o.offsetTop,I=h(l,S,parseInt(a.offset,10)),H=I-g,E=m(),A=0;v(n,a.updateURL);var L=function(o,r,c){var u=e.pageYOffset;(o==r||u==r||e.innerHeight+u>=E)&&(clearInterval(c),l.focus(),a.callbackAfter(t,n))},Q=function(){A+=16,O=A/parseInt(a.speed,10),O=O>1?1:O,y=g+H*d(a.easing,O),e.scrollTo(0,Math.floor(y)),L(y,I,b)},C=function(){a.callbackBefore(t,n),b=setInterval(Q,16)};0===e.pageYOffset&&e.scrollTo(0,0),C()};var g=function(e){var n=l(e.target,"[data-scroll]");n&&"a"===n.tagName.toLowerCase()&&(e.preventDefault(),r.animateScroll(n,n.hash,t))},b=function(){n||(n=setTimeout(function(){n=null,headerHeight=null===o?0:s(o)+o.offsetTop},66))};return r.destroy=function(){t&&(document.removeEventListener("click",g,!1),e.removeEventListener("resize",b,!1),t=null,n=null,o=null)},r.init=function(n){a&&(r.destroy(),t=i(c,n||{}),o=document.querySelector("[data-scroll-header]"),document.addEventListener("click",g,!1),o&&e.addEventListener("resize",b,!1))},r}); \ No newline at end of file +/** smooth-scroll v5.3.4, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ +!function(e,t){"function"==typeof define&&define.amd?define("smoothScroll",t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)}(window||this,function(e){"use strict";var t,n,o,r,a={},c=!!document.querySelector&&!!e.addEventListener,u={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},i=function(e,t,n){if("[object Object]"===Object.prototype.toString.call(e))for(var o in e)Object.prototype.hasOwnProperty.call(e,o)&&t.call(n,e[o],o,e);else for(var r=0,a=e.length;a>r;r++)t.call(n,e[r],r,e)},l=function(e,t){var n={};return i(e,function(t,o){n[o]=e[o]}),i(t,function(e,o){n[o]=t[o]}),n},s=function(e,t){for(var n=t.charAt(0);e&&e!==document;e=e.parentNode)if("."===n){if(e.classList.contains(t.substr(1)))return e}else if("#"===n){if(e.id===t.substr(1))return e}else if("["===n&&e.hasAttribute(t.substr(1,t.length-2)))return e;return!1},f=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},d=function(e){for(var t,n=String(e),o=n.length,r=-1,a="",c=n.charCodeAt(0);++r=1&&31>=t||127==t||0===r&&t>=48&&57>=t||1===r&&t>=48&&57>=t&&45===c?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(r):"\\"+n.charAt(r)}return a},h=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},m=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=o-t-n,o>=0?o:0},p=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},v=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},g=function(t,n){history.pushState&&(n||"true"===n)&&history.pushState(null,null,[e.location.protocol,"//",e.location.host,e.location.pathname,e.location.search,t].join(""))},b=function(e){return null===e?0:f(e)+e.offsetTop};a.animateScroll=function(t,n,a){var c=l(c||u,a||{}),i=v(t?t.getAttribute("data-options"):null);c=l(c,i),n="#"+d(n.substr(1));var s="#"===n?document.documentElement:document.querySelector(n),f=e.pageYOffset;o||(o=document.querySelector("[data-scroll-header]")),r||(r=b(o));var O,y,S,I=m(s,r,parseInt(c.offset,10)),E=I-f,H=p(),A=0;g(n,c.updateURL);var L=function(o,r,a){var u=e.pageYOffset;(o==r||u==r||e.innerHeight+u>=H)&&(clearInterval(a),s.focus(),c.callbackAfter(t,n))},Q=function(){A+=16,y=A/parseInt(c.speed,10),y=y>1?1:y,S=f+E*h(c.easing,y),e.scrollTo(0,Math.floor(S)),L(S,I,O)},C=function(){c.callbackBefore(t,n),O=setInterval(Q,16)};0===e.pageYOffset&&e.scrollTo(0,0),C()};var O=function(e){var n=s(e.target,"[data-scroll]");n&&"a"===n.tagName.toLowerCase()&&(e.preventDefault(),a.animateScroll(n,n.hash,t))},y=function(){n||(n=setTimeout(function(){n=null,r=b(o)},66))};return a.destroy=function(){t&&(document.removeEventListener("click",O,!1),e.removeEventListener("resize",y,!1),t=null,n=null,o=null,r=null)},a.init=function(n){c&&(a.destroy(),t=l(u,n||{}),o=document.querySelector("[data-scroll-header]"),r=b(o),document.addEventListener("click",O,!1),o&&e.addEventListener("resize",y,!1))},a}); \ No newline at end of file diff --git a/gulpfile.js b/gulpfile.js index dd6297a..0a3a0e8 100755 --- a/gulpfile.js +++ b/gulpfile.js @@ -128,9 +128,18 @@ gulp.task('build:scripts', ['clean:dist'], function() { gulp.task('build:styles', ['clean:dist'], function() { return gulp.src(paths.styles.input) .pipe(plumber()) - .pipe(sass({style: 'expanded', noCache: true, 'sourcemap=none': true})) + .pipe(sass({ + style: 'expanded', + lineNumbers: true, + noCache: true, + 'sourcemap=none': true + })) .pipe(flatten()) - .pipe(prefix('last 2 version', '> 1%')) + .pipe(prefix({ + browsers: ['last 2 version', '> 1%'], + cascade: true, + remove: true + })) .pipe(header(banner.full, { package : package })) .pipe(gulp.dest(paths.styles.output)) .pipe(rename({ suffix: '.min' })) @@ -236,16 +245,16 @@ gulp.task('clean:docs', function () { // Spin up livereload server and listen for file changes gulp.task('listen', function () { - livereload.listen(); - gulp.watch(paths.input).on('change', function(file) { - gulp.start('default'); - gulp.start('refresh'); - }); + livereload.listen(); + gulp.watch(paths.input).on('change', function(file) { + gulp.start('default'); + gulp.start('refresh'); + }); }); // Run livereload after file change gulp.task('refresh', ['compile', 'docs'], function () { - livereload.changed(); + livereload.changed(); }); @@ -285,6 +294,6 @@ gulp.task('default', [ // Compile files, generate docs, and run unit tests when something changes gulp.task('watch', [ - 'listen', - 'default' -]); + 'listen', + 'default' +]); \ No newline at end of file diff --git a/package.json b/package.json index 194d7d3..d0b4864 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "smooth-scroll", - "version": "5.3.3", + "version": "5.3.4", "description": "Animate scrolling to anchor links", "main": "./dist/js/smooth-scroll.js", "author": { diff --git a/src/js/smooth-scroll.js b/src/js/smooth-scroll.js index 23a3387..8f4d8d4 100755 --- a/src/js/smooth-scroll.js +++ b/src/js/smooth-scroll.js @@ -16,7 +16,7 @@ var smoothScroll = {}; // Object for public APIs var supports = !!document.querySelector && !!root.addEventListener; // Feature test - var settings, eventTimeout, fixedHeader; + var settings, eventTimeout, fixedHeader, headerHeight; // Default settings var defaults = { @@ -260,6 +260,10 @@ } }; + var getHeaderHeight = function ( header ) { + return header === null ? 0 : ( getHeight( header ) + header.offsetTop ); + }; + /** * Start/stop the scrolling animation * @public @@ -279,7 +283,7 @@ 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 + if ( !headerHeight ) { headerHeight = getHeaderHeight( fixedHeader ); } // Get the height of a fixed header if one exists and not already set var endLocation = getEndLocation( anchorElem, headerHeight, parseInt(settings.offset, 10) ); // Scroll to location var animationInterval; // interval timer var distance = endLocation - startLocation; // distance to travel @@ -363,7 +367,7 @@ if ( !eventTimeout ) { eventTimeout = setTimeout(function() { eventTimeout = null; // Reset timeout - headerHeight = fixedHeader === null ? 0 : ( getHeight( fixedHeader ) + fixedHeader.offsetTop ); // Get the height of a fixed header if one exists + headerHeight = getHeaderHeight( fixedHeader ); // Get the height of a fixed header if one exists }, 66); } }; @@ -385,6 +389,7 @@ settings = null; eventTimeout = null; fixedHeader = null; + headerHeight = null; }; /** @@ -403,6 +408,7 @@ // Selectors and variables settings = extend( defaults, options || {} ); // Merge user options with defaults fixedHeader = document.querySelector('[data-scroll-header]'); // Get the fixed header + headerHeight = getHeaderHeight( fixedHeader ); // When a toggle is clicked, run the click handler document.addEventListener('click', eventHandler, false ); From f070474041cd9524752e74eecae756dd4a668a4d Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Sat, 7 Mar 2015 21:42:14 -0500 Subject: [PATCH 131/285] Fixed AMD wrapper --- README.md | 2 ++ dist/js/smooth-scroll.js | 4 ++-- dist/js/smooth-scroll.min.js | 4 ++-- docs/dist/js/smooth-scroll.js | 4 ++-- docs/dist/js/smooth-scroll.min.js | 4 ++-- package.json | 2 +- src/js/smooth-scroll.js | 2 +- 7 files changed, 12 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index cf45f73..b493ae5 100755 --- a/README.md +++ b/README.md @@ -254,6 +254,8 @@ Smooth Scroll is licensed under the [MIT License](http://gomakethings.com/mit/). Smooth Scroll uses [semantic versioning](http://semver.org/). +* v5.3.5 - March 7, 2015 + * Fixed AMD wrapper. * v5.3.4 - March 6, 2015 * Fixed `headerHeight` error with fixed headers. (https://github.com/cferdinandi/smooth-scroll/issues/149) * v5.3.3 - December 21, 2014 diff --git a/dist/js/smooth-scroll.js b/dist/js/smooth-scroll.js index 4f228cd..5735857 100755 --- a/dist/js/smooth-scroll.js +++ b/dist/js/smooth-scroll.js @@ -1,5 +1,5 @@ /** - * smooth-scroll v5.3.4 + * smooth-scroll v5.3.5 * Animate scrolling to anchor links, by Chris Ferdinandi. * http://github.com/cferdinandi/smooth-scroll * @@ -15,7 +15,7 @@ } else { root.smoothScroll = factory(root); } -})(window || this, function (root) { +})(this, function (root) { 'use strict'; diff --git a/dist/js/smooth-scroll.min.js b/dist/js/smooth-scroll.min.js index 3c56e19..078a593 100755 --- a/dist/js/smooth-scroll.min.js +++ b/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ -/** smooth-scroll v5.3.4, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ -!function(e,t){"function"==typeof define&&define.amd?define("smoothScroll",t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)}(window||this,function(e){"use strict";var t,n,o,r,a={},c=!!document.querySelector&&!!e.addEventListener,u={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},i=function(e,t,n){if("[object Object]"===Object.prototype.toString.call(e))for(var o in e)Object.prototype.hasOwnProperty.call(e,o)&&t.call(n,e[o],o,e);else for(var r=0,a=e.length;a>r;r++)t.call(n,e[r],r,e)},l=function(e,t){var n={};return i(e,function(t,o){n[o]=e[o]}),i(t,function(e,o){n[o]=t[o]}),n},s=function(e,t){for(var n=t.charAt(0);e&&e!==document;e=e.parentNode)if("."===n){if(e.classList.contains(t.substr(1)))return e}else if("#"===n){if(e.id===t.substr(1))return e}else if("["===n&&e.hasAttribute(t.substr(1,t.length-2)))return e;return!1},f=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},d=function(e){for(var t,n=String(e),o=n.length,r=-1,a="",c=n.charCodeAt(0);++r=1&&31>=t||127==t||0===r&&t>=48&&57>=t||1===r&&t>=48&&57>=t&&45===c?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(r):"\\"+n.charAt(r)}return a},h=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},m=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=o-t-n,o>=0?o:0},p=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},v=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},g=function(t,n){history.pushState&&(n||"true"===n)&&history.pushState(null,null,[e.location.protocol,"//",e.location.host,e.location.pathname,e.location.search,t].join(""))},b=function(e){return null===e?0:f(e)+e.offsetTop};a.animateScroll=function(t,n,a){var c=l(c||u,a||{}),i=v(t?t.getAttribute("data-options"):null);c=l(c,i),n="#"+d(n.substr(1));var s="#"===n?document.documentElement:document.querySelector(n),f=e.pageYOffset;o||(o=document.querySelector("[data-scroll-header]")),r||(r=b(o));var O,y,S,I=m(s,r,parseInt(c.offset,10)),E=I-f,H=p(),A=0;g(n,c.updateURL);var L=function(o,r,a){var u=e.pageYOffset;(o==r||u==r||e.innerHeight+u>=H)&&(clearInterval(a),s.focus(),c.callbackAfter(t,n))},Q=function(){A+=16,y=A/parseInt(c.speed,10),y=y>1?1:y,S=f+E*h(c.easing,y),e.scrollTo(0,Math.floor(S)),L(S,I,O)},C=function(){c.callbackBefore(t,n),O=setInterval(Q,16)};0===e.pageYOffset&&e.scrollTo(0,0),C()};var O=function(e){var n=s(e.target,"[data-scroll]");n&&"a"===n.tagName.toLowerCase()&&(e.preventDefault(),a.animateScroll(n,n.hash,t))},y=function(){n||(n=setTimeout(function(){n=null,r=b(o)},66))};return a.destroy=function(){t&&(document.removeEventListener("click",O,!1),e.removeEventListener("resize",y,!1),t=null,n=null,o=null,r=null)},a.init=function(n){c&&(a.destroy(),t=l(u,n||{}),o=document.querySelector("[data-scroll-header]"),r=b(o),document.addEventListener("click",O,!1),o&&e.addEventListener("resize",y,!1))},a}); \ No newline at end of file +/** smooth-scroll v5.3.5, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ +!function(e,t){"function"==typeof define&&define.amd?define("smoothScroll",t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)}(this,function(e){"use strict";var t,n,o,r,a={},c=!!document.querySelector&&!!e.addEventListener,u={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},i=function(e,t,n){if("[object Object]"===Object.prototype.toString.call(e))for(var o in e)Object.prototype.hasOwnProperty.call(e,o)&&t.call(n,e[o],o,e);else for(var r=0,a=e.length;a>r;r++)t.call(n,e[r],r,e)},l=function(e,t){var n={};return i(e,function(t,o){n[o]=e[o]}),i(t,function(e,o){n[o]=t[o]}),n},s=function(e,t){for(var n=t.charAt(0);e&&e!==document;e=e.parentNode)if("."===n){if(e.classList.contains(t.substr(1)))return e}else if("#"===n){if(e.id===t.substr(1))return e}else if("["===n&&e.hasAttribute(t.substr(1,t.length-2)))return e;return!1},f=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},d=function(e){for(var t,n=String(e),o=n.length,r=-1,a="",c=n.charCodeAt(0);++r=1&&31>=t||127==t||0===r&&t>=48&&57>=t||1===r&&t>=48&&57>=t&&45===c?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(r):"\\"+n.charAt(r)}return a},h=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},m=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=o-t-n,o>=0?o:0},p=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},v=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},g=function(t,n){history.pushState&&(n||"true"===n)&&history.pushState(null,null,[e.location.protocol,"//",e.location.host,e.location.pathname,e.location.search,t].join(""))},b=function(e){return null===e?0:f(e)+e.offsetTop};a.animateScroll=function(t,n,a){var c=l(c||u,a||{}),i=v(t?t.getAttribute("data-options"):null);c=l(c,i),n="#"+d(n.substr(1));var s="#"===n?document.documentElement:document.querySelector(n),f=e.pageYOffset;o||(o=document.querySelector("[data-scroll-header]")),r||(r=b(o));var O,y,S,I=m(s,r,parseInt(c.offset,10)),E=I-f,H=p(),A=0;g(n,c.updateURL);var L=function(o,r,a){var u=e.pageYOffset;(o==r||u==r||e.innerHeight+u>=H)&&(clearInterval(a),s.focus(),c.callbackAfter(t,n))},Q=function(){A+=16,y=A/parseInt(c.speed,10),y=y>1?1:y,S=f+E*h(c.easing,y),e.scrollTo(0,Math.floor(S)),L(S,I,O)},C=function(){c.callbackBefore(t,n),O=setInterval(Q,16)};0===e.pageYOffset&&e.scrollTo(0,0),C()};var O=function(e){var n=s(e.target,"[data-scroll]");n&&"a"===n.tagName.toLowerCase()&&(e.preventDefault(),a.animateScroll(n,n.hash,t))},y=function(){n||(n=setTimeout(function(){n=null,r=b(o)},66))};return a.destroy=function(){t&&(document.removeEventListener("click",O,!1),e.removeEventListener("resize",y,!1),t=null,n=null,o=null,r=null)},a.init=function(n){c&&(a.destroy(),t=l(u,n||{}),o=document.querySelector("[data-scroll-header]"),r=b(o),document.addEventListener("click",O,!1),o&&e.addEventListener("resize",y,!1))},a}); \ No newline at end of file diff --git a/docs/dist/js/smooth-scroll.js b/docs/dist/js/smooth-scroll.js index 4f228cd..5735857 100755 --- a/docs/dist/js/smooth-scroll.js +++ b/docs/dist/js/smooth-scroll.js @@ -1,5 +1,5 @@ /** - * smooth-scroll v5.3.4 + * smooth-scroll v5.3.5 * Animate scrolling to anchor links, by Chris Ferdinandi. * http://github.com/cferdinandi/smooth-scroll * @@ -15,7 +15,7 @@ } else { root.smoothScroll = factory(root); } -})(window || this, function (root) { +})(this, function (root) { 'use strict'; diff --git a/docs/dist/js/smooth-scroll.min.js b/docs/dist/js/smooth-scroll.min.js index 3c56e19..078a593 100755 --- a/docs/dist/js/smooth-scroll.min.js +++ b/docs/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ -/** smooth-scroll v5.3.4, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ -!function(e,t){"function"==typeof define&&define.amd?define("smoothScroll",t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)}(window||this,function(e){"use strict";var t,n,o,r,a={},c=!!document.querySelector&&!!e.addEventListener,u={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},i=function(e,t,n){if("[object Object]"===Object.prototype.toString.call(e))for(var o in e)Object.prototype.hasOwnProperty.call(e,o)&&t.call(n,e[o],o,e);else for(var r=0,a=e.length;a>r;r++)t.call(n,e[r],r,e)},l=function(e,t){var n={};return i(e,function(t,o){n[o]=e[o]}),i(t,function(e,o){n[o]=t[o]}),n},s=function(e,t){for(var n=t.charAt(0);e&&e!==document;e=e.parentNode)if("."===n){if(e.classList.contains(t.substr(1)))return e}else if("#"===n){if(e.id===t.substr(1))return e}else if("["===n&&e.hasAttribute(t.substr(1,t.length-2)))return e;return!1},f=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},d=function(e){for(var t,n=String(e),o=n.length,r=-1,a="",c=n.charCodeAt(0);++r=1&&31>=t||127==t||0===r&&t>=48&&57>=t||1===r&&t>=48&&57>=t&&45===c?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(r):"\\"+n.charAt(r)}return a},h=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},m=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=o-t-n,o>=0?o:0},p=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},v=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},g=function(t,n){history.pushState&&(n||"true"===n)&&history.pushState(null,null,[e.location.protocol,"//",e.location.host,e.location.pathname,e.location.search,t].join(""))},b=function(e){return null===e?0:f(e)+e.offsetTop};a.animateScroll=function(t,n,a){var c=l(c||u,a||{}),i=v(t?t.getAttribute("data-options"):null);c=l(c,i),n="#"+d(n.substr(1));var s="#"===n?document.documentElement:document.querySelector(n),f=e.pageYOffset;o||(o=document.querySelector("[data-scroll-header]")),r||(r=b(o));var O,y,S,I=m(s,r,parseInt(c.offset,10)),E=I-f,H=p(),A=0;g(n,c.updateURL);var L=function(o,r,a){var u=e.pageYOffset;(o==r||u==r||e.innerHeight+u>=H)&&(clearInterval(a),s.focus(),c.callbackAfter(t,n))},Q=function(){A+=16,y=A/parseInt(c.speed,10),y=y>1?1:y,S=f+E*h(c.easing,y),e.scrollTo(0,Math.floor(S)),L(S,I,O)},C=function(){c.callbackBefore(t,n),O=setInterval(Q,16)};0===e.pageYOffset&&e.scrollTo(0,0),C()};var O=function(e){var n=s(e.target,"[data-scroll]");n&&"a"===n.tagName.toLowerCase()&&(e.preventDefault(),a.animateScroll(n,n.hash,t))},y=function(){n||(n=setTimeout(function(){n=null,r=b(o)},66))};return a.destroy=function(){t&&(document.removeEventListener("click",O,!1),e.removeEventListener("resize",y,!1),t=null,n=null,o=null,r=null)},a.init=function(n){c&&(a.destroy(),t=l(u,n||{}),o=document.querySelector("[data-scroll-header]"),r=b(o),document.addEventListener("click",O,!1),o&&e.addEventListener("resize",y,!1))},a}); \ No newline at end of file +/** smooth-scroll v5.3.5, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ +!function(e,t){"function"==typeof define&&define.amd?define("smoothScroll",t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)}(this,function(e){"use strict";var t,n,o,r,a={},c=!!document.querySelector&&!!e.addEventListener,u={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},i=function(e,t,n){if("[object Object]"===Object.prototype.toString.call(e))for(var o in e)Object.prototype.hasOwnProperty.call(e,o)&&t.call(n,e[o],o,e);else for(var r=0,a=e.length;a>r;r++)t.call(n,e[r],r,e)},l=function(e,t){var n={};return i(e,function(t,o){n[o]=e[o]}),i(t,function(e,o){n[o]=t[o]}),n},s=function(e,t){for(var n=t.charAt(0);e&&e!==document;e=e.parentNode)if("."===n){if(e.classList.contains(t.substr(1)))return e}else if("#"===n){if(e.id===t.substr(1))return e}else if("["===n&&e.hasAttribute(t.substr(1,t.length-2)))return e;return!1},f=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},d=function(e){for(var t,n=String(e),o=n.length,r=-1,a="",c=n.charCodeAt(0);++r=1&&31>=t||127==t||0===r&&t>=48&&57>=t||1===r&&t>=48&&57>=t&&45===c?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(r):"\\"+n.charAt(r)}return a},h=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},m=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=o-t-n,o>=0?o:0},p=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},v=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},g=function(t,n){history.pushState&&(n||"true"===n)&&history.pushState(null,null,[e.location.protocol,"//",e.location.host,e.location.pathname,e.location.search,t].join(""))},b=function(e){return null===e?0:f(e)+e.offsetTop};a.animateScroll=function(t,n,a){var c=l(c||u,a||{}),i=v(t?t.getAttribute("data-options"):null);c=l(c,i),n="#"+d(n.substr(1));var s="#"===n?document.documentElement:document.querySelector(n),f=e.pageYOffset;o||(o=document.querySelector("[data-scroll-header]")),r||(r=b(o));var O,y,S,I=m(s,r,parseInt(c.offset,10)),E=I-f,H=p(),A=0;g(n,c.updateURL);var L=function(o,r,a){var u=e.pageYOffset;(o==r||u==r||e.innerHeight+u>=H)&&(clearInterval(a),s.focus(),c.callbackAfter(t,n))},Q=function(){A+=16,y=A/parseInt(c.speed,10),y=y>1?1:y,S=f+E*h(c.easing,y),e.scrollTo(0,Math.floor(S)),L(S,I,O)},C=function(){c.callbackBefore(t,n),O=setInterval(Q,16)};0===e.pageYOffset&&e.scrollTo(0,0),C()};var O=function(e){var n=s(e.target,"[data-scroll]");n&&"a"===n.tagName.toLowerCase()&&(e.preventDefault(),a.animateScroll(n,n.hash,t))},y=function(){n||(n=setTimeout(function(){n=null,r=b(o)},66))};return a.destroy=function(){t&&(document.removeEventListener("click",O,!1),e.removeEventListener("resize",y,!1),t=null,n=null,o=null,r=null)},a.init=function(n){c&&(a.destroy(),t=l(u,n||{}),o=document.querySelector("[data-scroll-header]"),r=b(o),document.addEventListener("click",O,!1),o&&e.addEventListener("resize",y,!1))},a}); \ No newline at end of file diff --git a/package.json b/package.json index d0b4864..95aca5d 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "smooth-scroll", - "version": "5.3.4", + "version": "5.3.5", "description": "Animate scrolling to anchor links", "main": "./dist/js/smooth-scroll.js", "author": { diff --git a/src/js/smooth-scroll.js b/src/js/smooth-scroll.js index 8f4d8d4..c27e418 100755 --- a/src/js/smooth-scroll.js +++ b/src/js/smooth-scroll.js @@ -6,7 +6,7 @@ } else { root.smoothScroll = factory(root); } -})(window || this, function (root) { +})(this, function (root) { 'use strict'; From 0d18d4f59da5f368642a7d73244fddeb3b9a7eb0 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Sat, 7 Mar 2015 23:02:36 -0500 Subject: [PATCH 132/285] Fixed UMD wrapper --- README.md | 2 +- dist/js/smooth-scroll.js | 26 +++++++++++++------------- dist/js/smooth-scroll.min.js | 2 +- docs/dist/js/smooth-scroll.js | 26 +++++++++++++------------- docs/dist/js/smooth-scroll.min.js | 2 +- src/js/smooth-scroll.js | 26 +++++++++++++------------- 6 files changed, 42 insertions(+), 42 deletions(-) diff --git a/README.md b/README.md index b493ae5..2f74a73 100755 --- a/README.md +++ b/README.md @@ -255,7 +255,7 @@ Smooth Scroll is licensed under the [MIT License](http://gomakethings.com/mit/). Smooth Scroll uses [semantic versioning](http://semver.org/). * v5.3.5 - March 7, 2015 - * Fixed AMD wrapper. + * Fixed UMD wrapper. * v5.3.4 - March 6, 2015 * Fixed `headerHeight` error with fixed headers. (https://github.com/cferdinandi/smooth-scroll/issues/149) * v5.3.3 - December 21, 2014 diff --git a/dist/js/smooth-scroll.js b/dist/js/smooth-scroll.js index 5735857..67d154f 100755 --- a/dist/js/smooth-scroll.js +++ b/dist/js/smooth-scroll.js @@ -9,13 +9,13 @@ (function (root, factory) { if ( typeof define === 'function' && define.amd ) { - define('smoothScroll', factory(root)); + define([], factory); } else if ( typeof exports === 'object' ) { - module.exports = factory(root); + module.exports = factory; } else { root.smoothScroll = factory(root); } -})(this, function (root) { +})(this, function (window) { 'use strict'; @@ -24,7 +24,7 @@ // var smoothScroll = {}; // Object for public APIs - var supports = !!document.querySelector && !!root.addEventListener; // Feature test + var supports = !!document.querySelector && !!window.addEventListener; // Feature test var settings, eventTimeout, fixedHeader, headerHeight; // Default settings @@ -265,7 +265,7 @@ */ var updateUrl = function ( anchor, url ) { if ( history.pushState && (url || url === 'true') ) { - history.pushState( null, null, [root.location.protocol, '//', root.location.host, root.location.pathname, root.location.search, anchor].join('') ); + history.pushState( null, null, [window.location.protocol, '//', window.location.host, window.location.pathname, window.location.search, anchor].join('') ); } }; @@ -290,7 +290,7 @@ // Selectors and variables var anchorElem = anchor === '#' ? document.documentElement : document.querySelector(anchor); - var startLocation = root.pageYOffset; // Current location on the page + var startLocation = window.pageYOffset; // Current location on the page if ( !fixedHeader ) { fixedHeader = document.querySelector('[data-scroll-header]'); } // 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 = getEndLocation( anchorElem, headerHeight, parseInt(settings.offset, 10) ); // Scroll to location @@ -311,8 +311,8 @@ * @param {Number} animationInterval How much to scroll on this loop */ var stopAnimateScroll = function (position, endLocation, animationInterval) { - var currentLocation = root.pageYOffset; - if ( position == endLocation || currentLocation == endLocation || ( (root.innerHeight + currentLocation) >= documentHeight ) ) { + var currentLocation = window.pageYOffset; + if ( position == endLocation || currentLocation == endLocation || ( (window.innerHeight + currentLocation) >= documentHeight ) ) { clearInterval(animationInterval); anchorElem.focus(); settings.callbackAfter( toggle, anchor ); // Run callbacks after animation complete @@ -328,7 +328,7 @@ percentage = ( timeLapsed / parseInt(settings.speed, 10) ); percentage = ( percentage > 1 ) ? 1 : percentage; position = startLocation + ( distance * easingPattern(settings.easing, percentage) ); - root.scrollTo( 0, Math.floor(position) ); + window.scrollTo( 0, Math.floor(position) ); stopAnimateScroll(position, endLocation, animationInterval); }; @@ -345,8 +345,8 @@ * Reset position to fix weird iOS bug * @link https://github.com/cferdinandi/smooth-scroll/issues/45 */ - if ( root.pageYOffset === 0 ) { - root.scrollTo( 0, 0 ); + if ( window.pageYOffset === 0 ) { + window.scrollTo( 0, 0 ); } // Start scrolling animation @@ -392,7 +392,7 @@ // Remove event listeners document.removeEventListener( 'click', eventHandler, false ); - root.removeEventListener( 'resize', eventThrottler, false ); + window.removeEventListener( 'resize', eventThrottler, false ); // Reset varaibles settings = null; @@ -421,7 +421,7 @@ // When a toggle is clicked, run the click handler document.addEventListener('click', eventHandler, false ); - if ( fixedHeader ) { root.addEventListener( 'resize', eventThrottler, false ); } + if ( fixedHeader ) { window.addEventListener( 'resize', eventThrottler, false ); } }; diff --git a/dist/js/smooth-scroll.min.js b/dist/js/smooth-scroll.min.js index 078a593..5cb87a0 100755 --- a/dist/js/smooth-scroll.min.js +++ b/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ /** smooth-scroll v5.3.5, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ -!function(e,t){"function"==typeof define&&define.amd?define("smoothScroll",t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)}(this,function(e){"use strict";var t,n,o,r,a={},c=!!document.querySelector&&!!e.addEventListener,u={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},i=function(e,t,n){if("[object Object]"===Object.prototype.toString.call(e))for(var o in e)Object.prototype.hasOwnProperty.call(e,o)&&t.call(n,e[o],o,e);else for(var r=0,a=e.length;a>r;r++)t.call(n,e[r],r,e)},l=function(e,t){var n={};return i(e,function(t,o){n[o]=e[o]}),i(t,function(e,o){n[o]=t[o]}),n},s=function(e,t){for(var n=t.charAt(0);e&&e!==document;e=e.parentNode)if("."===n){if(e.classList.contains(t.substr(1)))return e}else if("#"===n){if(e.id===t.substr(1))return e}else if("["===n&&e.hasAttribute(t.substr(1,t.length-2)))return e;return!1},f=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},d=function(e){for(var t,n=String(e),o=n.length,r=-1,a="",c=n.charCodeAt(0);++r=1&&31>=t||127==t||0===r&&t>=48&&57>=t||1===r&&t>=48&&57>=t&&45===c?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(r):"\\"+n.charAt(r)}return a},h=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},m=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=o-t-n,o>=0?o:0},p=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},v=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},g=function(t,n){history.pushState&&(n||"true"===n)&&history.pushState(null,null,[e.location.protocol,"//",e.location.host,e.location.pathname,e.location.search,t].join(""))},b=function(e){return null===e?0:f(e)+e.offsetTop};a.animateScroll=function(t,n,a){var c=l(c||u,a||{}),i=v(t?t.getAttribute("data-options"):null);c=l(c,i),n="#"+d(n.substr(1));var s="#"===n?document.documentElement:document.querySelector(n),f=e.pageYOffset;o||(o=document.querySelector("[data-scroll-header]")),r||(r=b(o));var O,y,S,I=m(s,r,parseInt(c.offset,10)),E=I-f,H=p(),A=0;g(n,c.updateURL);var L=function(o,r,a){var u=e.pageYOffset;(o==r||u==r||e.innerHeight+u>=H)&&(clearInterval(a),s.focus(),c.callbackAfter(t,n))},Q=function(){A+=16,y=A/parseInt(c.speed,10),y=y>1?1:y,S=f+E*h(c.easing,y),e.scrollTo(0,Math.floor(S)),L(S,I,O)},C=function(){c.callbackBefore(t,n),O=setInterval(Q,16)};0===e.pageYOffset&&e.scrollTo(0,0),C()};var O=function(e){var n=s(e.target,"[data-scroll]");n&&"a"===n.tagName.toLowerCase()&&(e.preventDefault(),a.animateScroll(n,n.hash,t))},y=function(){n||(n=setTimeout(function(){n=null,r=b(o)},66))};return a.destroy=function(){t&&(document.removeEventListener("click",O,!1),e.removeEventListener("resize",y,!1),t=null,n=null,o=null,r=null)},a.init=function(n){c&&(a.destroy(),t=l(u,n||{}),o=document.querySelector("[data-scroll-header]"),r=b(o),document.addEventListener("click",O,!1),o&&e.addEventListener("resize",y,!1))},a}); \ No newline at end of file +!function(e,t){"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?module.exports=t:e.smoothScroll=t(e)}(this,function(e){"use strict";var t,n,o,r,a={},u=!!document.querySelector&&!!e.addEventListener,c={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},i=function(e,t,n){if("[object Object]"===Object.prototype.toString.call(e))for(var o in e)Object.prototype.hasOwnProperty.call(e,o)&&t.call(n,e[o],o,e);else for(var r=0,a=e.length;a>r;r++)t.call(n,e[r],r,e)},l=function(e,t){var n={};return i(e,function(t,o){n[o]=e[o]}),i(t,function(e,o){n[o]=t[o]}),n},s=function(e,t){for(var n=t.charAt(0);e&&e!==document;e=e.parentNode)if("."===n){if(e.classList.contains(t.substr(1)))return e}else if("#"===n){if(e.id===t.substr(1))return e}else if("["===n&&e.hasAttribute(t.substr(1,t.length-2)))return e;return!1},f=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},d=function(e){for(var t,n=String(e),o=n.length,r=-1,a="",u=n.charCodeAt(0);++r=1&&31>=t||127==t||0===r&&t>=48&&57>=t||1===r&&t>=48&&57>=t&&45===u?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(r):"\\"+n.charAt(r)}return a},h=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},m=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=o-t-n,o>=0?o:0},p=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},v=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},g=function(t,n){history.pushState&&(n||"true"===n)&&history.pushState(null,null,[e.location.protocol,"//",e.location.host,e.location.pathname,e.location.search,t].join(""))},b=function(e){return null===e?0:f(e)+e.offsetTop};a.animateScroll=function(t,n,a){var u=l(u||c,a||{}),i=v(t?t.getAttribute("data-options"):null);u=l(u,i),n="#"+d(n.substr(1));var s="#"===n?document.documentElement:document.querySelector(n),f=e.pageYOffset;o||(o=document.querySelector("[data-scroll-header]")),r||(r=b(o));var O,y,I,S=m(s,r,parseInt(u.offset,10)),E=S-f,H=p(),A=0;g(n,u.updateURL);var L=function(o,r,a){var c=e.pageYOffset;(o==r||c==r||e.innerHeight+c>=H)&&(clearInterval(a),s.focus(),u.callbackAfter(t,n))},Q=function(){A+=16,y=A/parseInt(u.speed,10),y=y>1?1:y,I=f+E*h(u.easing,y),e.scrollTo(0,Math.floor(I)),L(I,S,O)},C=function(){u.callbackBefore(t,n),O=setInterval(Q,16)};0===e.pageYOffset&&e.scrollTo(0,0),C()};var O=function(e){var n=s(e.target,"[data-scroll]");n&&"a"===n.tagName.toLowerCase()&&(e.preventDefault(),a.animateScroll(n,n.hash,t))},y=function(){n||(n=setTimeout(function(){n=null,r=b(o)},66))};return a.destroy=function(){t&&(document.removeEventListener("click",O,!1),e.removeEventListener("resize",y,!1),t=null,n=null,o=null,r=null)},a.init=function(n){u&&(a.destroy(),t=l(c,n||{}),o=document.querySelector("[data-scroll-header]"),r=b(o),document.addEventListener("click",O,!1),o&&e.addEventListener("resize",y,!1))},a}); \ No newline at end of file diff --git a/docs/dist/js/smooth-scroll.js b/docs/dist/js/smooth-scroll.js index 5735857..67d154f 100755 --- a/docs/dist/js/smooth-scroll.js +++ b/docs/dist/js/smooth-scroll.js @@ -9,13 +9,13 @@ (function (root, factory) { if ( typeof define === 'function' && define.amd ) { - define('smoothScroll', factory(root)); + define([], factory); } else if ( typeof exports === 'object' ) { - module.exports = factory(root); + module.exports = factory; } else { root.smoothScroll = factory(root); } -})(this, function (root) { +})(this, function (window) { 'use strict'; @@ -24,7 +24,7 @@ // var smoothScroll = {}; // Object for public APIs - var supports = !!document.querySelector && !!root.addEventListener; // Feature test + var supports = !!document.querySelector && !!window.addEventListener; // Feature test var settings, eventTimeout, fixedHeader, headerHeight; // Default settings @@ -265,7 +265,7 @@ */ var updateUrl = function ( anchor, url ) { if ( history.pushState && (url || url === 'true') ) { - history.pushState( null, null, [root.location.protocol, '//', root.location.host, root.location.pathname, root.location.search, anchor].join('') ); + history.pushState( null, null, [window.location.protocol, '//', window.location.host, window.location.pathname, window.location.search, anchor].join('') ); } }; @@ -290,7 +290,7 @@ // Selectors and variables var anchorElem = anchor === '#' ? document.documentElement : document.querySelector(anchor); - var startLocation = root.pageYOffset; // Current location on the page + var startLocation = window.pageYOffset; // Current location on the page if ( !fixedHeader ) { fixedHeader = document.querySelector('[data-scroll-header]'); } // 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 = getEndLocation( anchorElem, headerHeight, parseInt(settings.offset, 10) ); // Scroll to location @@ -311,8 +311,8 @@ * @param {Number} animationInterval How much to scroll on this loop */ var stopAnimateScroll = function (position, endLocation, animationInterval) { - var currentLocation = root.pageYOffset; - if ( position == endLocation || currentLocation == endLocation || ( (root.innerHeight + currentLocation) >= documentHeight ) ) { + var currentLocation = window.pageYOffset; + if ( position == endLocation || currentLocation == endLocation || ( (window.innerHeight + currentLocation) >= documentHeight ) ) { clearInterval(animationInterval); anchorElem.focus(); settings.callbackAfter( toggle, anchor ); // Run callbacks after animation complete @@ -328,7 +328,7 @@ percentage = ( timeLapsed / parseInt(settings.speed, 10) ); percentage = ( percentage > 1 ) ? 1 : percentage; position = startLocation + ( distance * easingPattern(settings.easing, percentage) ); - root.scrollTo( 0, Math.floor(position) ); + window.scrollTo( 0, Math.floor(position) ); stopAnimateScroll(position, endLocation, animationInterval); }; @@ -345,8 +345,8 @@ * Reset position to fix weird iOS bug * @link https://github.com/cferdinandi/smooth-scroll/issues/45 */ - if ( root.pageYOffset === 0 ) { - root.scrollTo( 0, 0 ); + if ( window.pageYOffset === 0 ) { + window.scrollTo( 0, 0 ); } // Start scrolling animation @@ -392,7 +392,7 @@ // Remove event listeners document.removeEventListener( 'click', eventHandler, false ); - root.removeEventListener( 'resize', eventThrottler, false ); + window.removeEventListener( 'resize', eventThrottler, false ); // Reset varaibles settings = null; @@ -421,7 +421,7 @@ // When a toggle is clicked, run the click handler document.addEventListener('click', eventHandler, false ); - if ( fixedHeader ) { root.addEventListener( 'resize', eventThrottler, false ); } + if ( fixedHeader ) { window.addEventListener( 'resize', eventThrottler, false ); } }; diff --git a/docs/dist/js/smooth-scroll.min.js b/docs/dist/js/smooth-scroll.min.js index 078a593..5cb87a0 100755 --- a/docs/dist/js/smooth-scroll.min.js +++ b/docs/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ /** smooth-scroll v5.3.5, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ -!function(e,t){"function"==typeof define&&define.amd?define("smoothScroll",t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)}(this,function(e){"use strict";var t,n,o,r,a={},c=!!document.querySelector&&!!e.addEventListener,u={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},i=function(e,t,n){if("[object Object]"===Object.prototype.toString.call(e))for(var o in e)Object.prototype.hasOwnProperty.call(e,o)&&t.call(n,e[o],o,e);else for(var r=0,a=e.length;a>r;r++)t.call(n,e[r],r,e)},l=function(e,t){var n={};return i(e,function(t,o){n[o]=e[o]}),i(t,function(e,o){n[o]=t[o]}),n},s=function(e,t){for(var n=t.charAt(0);e&&e!==document;e=e.parentNode)if("."===n){if(e.classList.contains(t.substr(1)))return e}else if("#"===n){if(e.id===t.substr(1))return e}else if("["===n&&e.hasAttribute(t.substr(1,t.length-2)))return e;return!1},f=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},d=function(e){for(var t,n=String(e),o=n.length,r=-1,a="",c=n.charCodeAt(0);++r=1&&31>=t||127==t||0===r&&t>=48&&57>=t||1===r&&t>=48&&57>=t&&45===c?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(r):"\\"+n.charAt(r)}return a},h=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},m=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=o-t-n,o>=0?o:0},p=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},v=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},g=function(t,n){history.pushState&&(n||"true"===n)&&history.pushState(null,null,[e.location.protocol,"//",e.location.host,e.location.pathname,e.location.search,t].join(""))},b=function(e){return null===e?0:f(e)+e.offsetTop};a.animateScroll=function(t,n,a){var c=l(c||u,a||{}),i=v(t?t.getAttribute("data-options"):null);c=l(c,i),n="#"+d(n.substr(1));var s="#"===n?document.documentElement:document.querySelector(n),f=e.pageYOffset;o||(o=document.querySelector("[data-scroll-header]")),r||(r=b(o));var O,y,S,I=m(s,r,parseInt(c.offset,10)),E=I-f,H=p(),A=0;g(n,c.updateURL);var L=function(o,r,a){var u=e.pageYOffset;(o==r||u==r||e.innerHeight+u>=H)&&(clearInterval(a),s.focus(),c.callbackAfter(t,n))},Q=function(){A+=16,y=A/parseInt(c.speed,10),y=y>1?1:y,S=f+E*h(c.easing,y),e.scrollTo(0,Math.floor(S)),L(S,I,O)},C=function(){c.callbackBefore(t,n),O=setInterval(Q,16)};0===e.pageYOffset&&e.scrollTo(0,0),C()};var O=function(e){var n=s(e.target,"[data-scroll]");n&&"a"===n.tagName.toLowerCase()&&(e.preventDefault(),a.animateScroll(n,n.hash,t))},y=function(){n||(n=setTimeout(function(){n=null,r=b(o)},66))};return a.destroy=function(){t&&(document.removeEventListener("click",O,!1),e.removeEventListener("resize",y,!1),t=null,n=null,o=null,r=null)},a.init=function(n){c&&(a.destroy(),t=l(u,n||{}),o=document.querySelector("[data-scroll-header]"),r=b(o),document.addEventListener("click",O,!1),o&&e.addEventListener("resize",y,!1))},a}); \ No newline at end of file +!function(e,t){"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?module.exports=t:e.smoothScroll=t(e)}(this,function(e){"use strict";var t,n,o,r,a={},u=!!document.querySelector&&!!e.addEventListener,c={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},i=function(e,t,n){if("[object Object]"===Object.prototype.toString.call(e))for(var o in e)Object.prototype.hasOwnProperty.call(e,o)&&t.call(n,e[o],o,e);else for(var r=0,a=e.length;a>r;r++)t.call(n,e[r],r,e)},l=function(e,t){var n={};return i(e,function(t,o){n[o]=e[o]}),i(t,function(e,o){n[o]=t[o]}),n},s=function(e,t){for(var n=t.charAt(0);e&&e!==document;e=e.parentNode)if("."===n){if(e.classList.contains(t.substr(1)))return e}else if("#"===n){if(e.id===t.substr(1))return e}else if("["===n&&e.hasAttribute(t.substr(1,t.length-2)))return e;return!1},f=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},d=function(e){for(var t,n=String(e),o=n.length,r=-1,a="",u=n.charCodeAt(0);++r=1&&31>=t||127==t||0===r&&t>=48&&57>=t||1===r&&t>=48&&57>=t&&45===u?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(r):"\\"+n.charAt(r)}return a},h=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},m=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=o-t-n,o>=0?o:0},p=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},v=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},g=function(t,n){history.pushState&&(n||"true"===n)&&history.pushState(null,null,[e.location.protocol,"//",e.location.host,e.location.pathname,e.location.search,t].join(""))},b=function(e){return null===e?0:f(e)+e.offsetTop};a.animateScroll=function(t,n,a){var u=l(u||c,a||{}),i=v(t?t.getAttribute("data-options"):null);u=l(u,i),n="#"+d(n.substr(1));var s="#"===n?document.documentElement:document.querySelector(n),f=e.pageYOffset;o||(o=document.querySelector("[data-scroll-header]")),r||(r=b(o));var O,y,I,S=m(s,r,parseInt(u.offset,10)),E=S-f,H=p(),A=0;g(n,u.updateURL);var L=function(o,r,a){var c=e.pageYOffset;(o==r||c==r||e.innerHeight+c>=H)&&(clearInterval(a),s.focus(),u.callbackAfter(t,n))},Q=function(){A+=16,y=A/parseInt(u.speed,10),y=y>1?1:y,I=f+E*h(u.easing,y),e.scrollTo(0,Math.floor(I)),L(I,S,O)},C=function(){u.callbackBefore(t,n),O=setInterval(Q,16)};0===e.pageYOffset&&e.scrollTo(0,0),C()};var O=function(e){var n=s(e.target,"[data-scroll]");n&&"a"===n.tagName.toLowerCase()&&(e.preventDefault(),a.animateScroll(n,n.hash,t))},y=function(){n||(n=setTimeout(function(){n=null,r=b(o)},66))};return a.destroy=function(){t&&(document.removeEventListener("click",O,!1),e.removeEventListener("resize",y,!1),t=null,n=null,o=null,r=null)},a.init=function(n){u&&(a.destroy(),t=l(c,n||{}),o=document.querySelector("[data-scroll-header]"),r=b(o),document.addEventListener("click",O,!1),o&&e.addEventListener("resize",y,!1))},a}); \ No newline at end of file diff --git a/src/js/smooth-scroll.js b/src/js/smooth-scroll.js index c27e418..64effe5 100755 --- a/src/js/smooth-scroll.js +++ b/src/js/smooth-scroll.js @@ -1,12 +1,12 @@ (function (root, factory) { if ( typeof define === 'function' && define.amd ) { - define('smoothScroll', factory(root)); + define([], factory); } else if ( typeof exports === 'object' ) { - module.exports = factory(root); + module.exports = factory; } else { root.smoothScroll = factory(root); } -})(this, function (root) { +})(this, function (window) { 'use strict'; @@ -15,7 +15,7 @@ // var smoothScroll = {}; // Object for public APIs - var supports = !!document.querySelector && !!root.addEventListener; // Feature test + var supports = !!document.querySelector && !!window.addEventListener; // Feature test var settings, eventTimeout, fixedHeader, headerHeight; // Default settings @@ -256,7 +256,7 @@ */ var updateUrl = function ( anchor, url ) { if ( history.pushState && (url || url === 'true') ) { - history.pushState( null, null, [root.location.protocol, '//', root.location.host, root.location.pathname, root.location.search, anchor].join('') ); + history.pushState( null, null, [window.location.protocol, '//', window.location.host, window.location.pathname, window.location.search, anchor].join('') ); } }; @@ -281,7 +281,7 @@ // Selectors and variables var anchorElem = anchor === '#' ? document.documentElement : document.querySelector(anchor); - var startLocation = root.pageYOffset; // Current location on the page + var startLocation = window.pageYOffset; // Current location on the page if ( !fixedHeader ) { fixedHeader = document.querySelector('[data-scroll-header]'); } // 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 = getEndLocation( anchorElem, headerHeight, parseInt(settings.offset, 10) ); // Scroll to location @@ -302,8 +302,8 @@ * @param {Number} animationInterval How much to scroll on this loop */ var stopAnimateScroll = function (position, endLocation, animationInterval) { - var currentLocation = root.pageYOffset; - if ( position == endLocation || currentLocation == endLocation || ( (root.innerHeight + currentLocation) >= documentHeight ) ) { + var currentLocation = window.pageYOffset; + if ( position == endLocation || currentLocation == endLocation || ( (window.innerHeight + currentLocation) >= documentHeight ) ) { clearInterval(animationInterval); anchorElem.focus(); settings.callbackAfter( toggle, anchor ); // Run callbacks after animation complete @@ -319,7 +319,7 @@ percentage = ( timeLapsed / parseInt(settings.speed, 10) ); percentage = ( percentage > 1 ) ? 1 : percentage; position = startLocation + ( distance * easingPattern(settings.easing, percentage) ); - root.scrollTo( 0, Math.floor(position) ); + window.scrollTo( 0, Math.floor(position) ); stopAnimateScroll(position, endLocation, animationInterval); }; @@ -336,8 +336,8 @@ * Reset position to fix weird iOS bug * @link https://github.com/cferdinandi/smooth-scroll/issues/45 */ - if ( root.pageYOffset === 0 ) { - root.scrollTo( 0, 0 ); + if ( window.pageYOffset === 0 ) { + window.scrollTo( 0, 0 ); } // Start scrolling animation @@ -383,7 +383,7 @@ // Remove event listeners document.removeEventListener( 'click', eventHandler, false ); - root.removeEventListener( 'resize', eventThrottler, false ); + window.removeEventListener( 'resize', eventThrottler, false ); // Reset varaibles settings = null; @@ -412,7 +412,7 @@ // When a toggle is clicked, run the click handler document.addEventListener('click', eventHandler, false ); - if ( fixedHeader ) { root.addEventListener( 'resize', eventThrottler, false ); } + if ( fixedHeader ) { window.addEventListener( 'resize', eventThrottler, false ); } }; From 0f777390b7751f1c049ec0d92eded7b2f3ae80a5 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Mon, 9 Mar 2015 21:40:21 -0400 Subject: [PATCH 133/285] Really fixed UMD wrapper --- README.md | 2 ++ dist/js/smooth-scroll.js | 6 +++--- dist/js/smooth-scroll.min.js | 4 ++-- docs/dist/js/smooth-scroll.js | 6 +++--- docs/dist/js/smooth-scroll.min.js | 4 ++-- package.json | 2 +- src/js/smooth-scroll.js | 4 ++-- 7 files changed, 15 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 2f74a73..ad2a667 100755 --- a/README.md +++ b/README.md @@ -254,6 +254,8 @@ Smooth Scroll is licensed under the [MIT License](http://gomakethings.com/mit/). Smooth Scroll uses [semantic versioning](http://semver.org/). +* v5.3.6 - March 9, 2015 + * REALLY fixed UMD wrapper. * v5.3.5 - March 7, 2015 * Fixed UMD wrapper. * v5.3.4 - March 6, 2015 diff --git a/dist/js/smooth-scroll.js b/dist/js/smooth-scroll.js index 67d154f..1218660 100755 --- a/dist/js/smooth-scroll.js +++ b/dist/js/smooth-scroll.js @@ -1,5 +1,5 @@ /** - * smooth-scroll v5.3.5 + * smooth-scroll v5.3.6 * Animate scrolling to anchor links, by Chris Ferdinandi. * http://github.com/cferdinandi/smooth-scroll * @@ -9,9 +9,9 @@ (function (root, factory) { if ( typeof define === 'function' && define.amd ) { - define([], factory); + define([], factory(root)); } else if ( typeof exports === 'object' ) { - module.exports = factory; + module.exports = factory(root); } else { root.smoothScroll = factory(root); } diff --git a/dist/js/smooth-scroll.min.js b/dist/js/smooth-scroll.min.js index 5cb87a0..01d9d9c 100755 --- a/dist/js/smooth-scroll.min.js +++ b/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ -/** smooth-scroll v5.3.5, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ -!function(e,t){"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?module.exports=t:e.smoothScroll=t(e)}(this,function(e){"use strict";var t,n,o,r,a={},u=!!document.querySelector&&!!e.addEventListener,c={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},i=function(e,t,n){if("[object Object]"===Object.prototype.toString.call(e))for(var o in e)Object.prototype.hasOwnProperty.call(e,o)&&t.call(n,e[o],o,e);else for(var r=0,a=e.length;a>r;r++)t.call(n,e[r],r,e)},l=function(e,t){var n={};return i(e,function(t,o){n[o]=e[o]}),i(t,function(e,o){n[o]=t[o]}),n},s=function(e,t){for(var n=t.charAt(0);e&&e!==document;e=e.parentNode)if("."===n){if(e.classList.contains(t.substr(1)))return e}else if("#"===n){if(e.id===t.substr(1))return e}else if("["===n&&e.hasAttribute(t.substr(1,t.length-2)))return e;return!1},f=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},d=function(e){for(var t,n=String(e),o=n.length,r=-1,a="",u=n.charCodeAt(0);++r=1&&31>=t||127==t||0===r&&t>=48&&57>=t||1===r&&t>=48&&57>=t&&45===u?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(r):"\\"+n.charAt(r)}return a},h=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},m=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=o-t-n,o>=0?o:0},p=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},v=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},g=function(t,n){history.pushState&&(n||"true"===n)&&history.pushState(null,null,[e.location.protocol,"//",e.location.host,e.location.pathname,e.location.search,t].join(""))},b=function(e){return null===e?0:f(e)+e.offsetTop};a.animateScroll=function(t,n,a){var u=l(u||c,a||{}),i=v(t?t.getAttribute("data-options"):null);u=l(u,i),n="#"+d(n.substr(1));var s="#"===n?document.documentElement:document.querySelector(n),f=e.pageYOffset;o||(o=document.querySelector("[data-scroll-header]")),r||(r=b(o));var O,y,I,S=m(s,r,parseInt(u.offset,10)),E=S-f,H=p(),A=0;g(n,u.updateURL);var L=function(o,r,a){var c=e.pageYOffset;(o==r||c==r||e.innerHeight+c>=H)&&(clearInterval(a),s.focus(),u.callbackAfter(t,n))},Q=function(){A+=16,y=A/parseInt(u.speed,10),y=y>1?1:y,I=f+E*h(u.easing,y),e.scrollTo(0,Math.floor(I)),L(I,S,O)},C=function(){u.callbackBefore(t,n),O=setInterval(Q,16)};0===e.pageYOffset&&e.scrollTo(0,0),C()};var O=function(e){var n=s(e.target,"[data-scroll]");n&&"a"===n.tagName.toLowerCase()&&(e.preventDefault(),a.animateScroll(n,n.hash,t))},y=function(){n||(n=setTimeout(function(){n=null,r=b(o)},66))};return a.destroy=function(){t&&(document.removeEventListener("click",O,!1),e.removeEventListener("resize",y,!1),t=null,n=null,o=null,r=null)},a.init=function(n){u&&(a.destroy(),t=l(c,n||{}),o=document.querySelector("[data-scroll-header]"),r=b(o),document.addEventListener("click",O,!1),o&&e.addEventListener("resize",y,!1))},a}); \ No newline at end of file +/** smooth-scroll v5.3.6, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ +!function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)}(this,function(e){"use strict";var t,n,o,r,a={},u=!!document.querySelector&&!!e.addEventListener,c={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},i=function(e,t,n){if("[object Object]"===Object.prototype.toString.call(e))for(var o in e)Object.prototype.hasOwnProperty.call(e,o)&&t.call(n,e[o],o,e);else for(var r=0,a=e.length;a>r;r++)t.call(n,e[r],r,e)},l=function(e,t){var n={};return i(e,function(t,o){n[o]=e[o]}),i(t,function(e,o){n[o]=t[o]}),n},s=function(e,t){for(var n=t.charAt(0);e&&e!==document;e=e.parentNode)if("."===n){if(e.classList.contains(t.substr(1)))return e}else if("#"===n){if(e.id===t.substr(1))return e}else if("["===n&&e.hasAttribute(t.substr(1,t.length-2)))return e;return!1},f=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},d=function(e){for(var t,n=String(e),o=n.length,r=-1,a="",u=n.charCodeAt(0);++r=1&&31>=t||127==t||0===r&&t>=48&&57>=t||1===r&&t>=48&&57>=t&&45===u?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(r):"\\"+n.charAt(r)}return a},h=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},m=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=o-t-n,o>=0?o:0},p=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},v=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},g=function(t,n){history.pushState&&(n||"true"===n)&&history.pushState(null,null,[e.location.protocol,"//",e.location.host,e.location.pathname,e.location.search,t].join(""))},b=function(e){return null===e?0:f(e)+e.offsetTop};a.animateScroll=function(t,n,a){var u=l(u||c,a||{}),i=v(t?t.getAttribute("data-options"):null);u=l(u,i),n="#"+d(n.substr(1));var s="#"===n?document.documentElement:document.querySelector(n),f=e.pageYOffset;o||(o=document.querySelector("[data-scroll-header]")),r||(r=b(o));var O,y,I,S=m(s,r,parseInt(u.offset,10)),E=S-f,H=p(),A=0;g(n,u.updateURL);var L=function(o,r,a){var c=e.pageYOffset;(o==r||c==r||e.innerHeight+c>=H)&&(clearInterval(a),s.focus(),u.callbackAfter(t,n))},Q=function(){A+=16,y=A/parseInt(u.speed,10),y=y>1?1:y,I=f+E*h(u.easing,y),e.scrollTo(0,Math.floor(I)),L(I,S,O)},C=function(){u.callbackBefore(t,n),O=setInterval(Q,16)};0===e.pageYOffset&&e.scrollTo(0,0),C()};var O=function(e){var n=s(e.target,"[data-scroll]");n&&"a"===n.tagName.toLowerCase()&&(e.preventDefault(),a.animateScroll(n,n.hash,t))},y=function(){n||(n=setTimeout(function(){n=null,r=b(o)},66))};return a.destroy=function(){t&&(document.removeEventListener("click",O,!1),e.removeEventListener("resize",y,!1),t=null,n=null,o=null,r=null)},a.init=function(n){u&&(a.destroy(),t=l(c,n||{}),o=document.querySelector("[data-scroll-header]"),r=b(o),document.addEventListener("click",O,!1),o&&e.addEventListener("resize",y,!1))},a}); \ No newline at end of file diff --git a/docs/dist/js/smooth-scroll.js b/docs/dist/js/smooth-scroll.js index 67d154f..1218660 100755 --- a/docs/dist/js/smooth-scroll.js +++ b/docs/dist/js/smooth-scroll.js @@ -1,5 +1,5 @@ /** - * smooth-scroll v5.3.5 + * smooth-scroll v5.3.6 * Animate scrolling to anchor links, by Chris Ferdinandi. * http://github.com/cferdinandi/smooth-scroll * @@ -9,9 +9,9 @@ (function (root, factory) { if ( typeof define === 'function' && define.amd ) { - define([], factory); + define([], factory(root)); } else if ( typeof exports === 'object' ) { - module.exports = factory; + module.exports = factory(root); } else { root.smoothScroll = factory(root); } diff --git a/docs/dist/js/smooth-scroll.min.js b/docs/dist/js/smooth-scroll.min.js index 5cb87a0..01d9d9c 100755 --- a/docs/dist/js/smooth-scroll.min.js +++ b/docs/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ -/** smooth-scroll v5.3.5, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ -!function(e,t){"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?module.exports=t:e.smoothScroll=t(e)}(this,function(e){"use strict";var t,n,o,r,a={},u=!!document.querySelector&&!!e.addEventListener,c={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},i=function(e,t,n){if("[object Object]"===Object.prototype.toString.call(e))for(var o in e)Object.prototype.hasOwnProperty.call(e,o)&&t.call(n,e[o],o,e);else for(var r=0,a=e.length;a>r;r++)t.call(n,e[r],r,e)},l=function(e,t){var n={};return i(e,function(t,o){n[o]=e[o]}),i(t,function(e,o){n[o]=t[o]}),n},s=function(e,t){for(var n=t.charAt(0);e&&e!==document;e=e.parentNode)if("."===n){if(e.classList.contains(t.substr(1)))return e}else if("#"===n){if(e.id===t.substr(1))return e}else if("["===n&&e.hasAttribute(t.substr(1,t.length-2)))return e;return!1},f=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},d=function(e){for(var t,n=String(e),o=n.length,r=-1,a="",u=n.charCodeAt(0);++r=1&&31>=t||127==t||0===r&&t>=48&&57>=t||1===r&&t>=48&&57>=t&&45===u?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(r):"\\"+n.charAt(r)}return a},h=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},m=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=o-t-n,o>=0?o:0},p=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},v=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},g=function(t,n){history.pushState&&(n||"true"===n)&&history.pushState(null,null,[e.location.protocol,"//",e.location.host,e.location.pathname,e.location.search,t].join(""))},b=function(e){return null===e?0:f(e)+e.offsetTop};a.animateScroll=function(t,n,a){var u=l(u||c,a||{}),i=v(t?t.getAttribute("data-options"):null);u=l(u,i),n="#"+d(n.substr(1));var s="#"===n?document.documentElement:document.querySelector(n),f=e.pageYOffset;o||(o=document.querySelector("[data-scroll-header]")),r||(r=b(o));var O,y,I,S=m(s,r,parseInt(u.offset,10)),E=S-f,H=p(),A=0;g(n,u.updateURL);var L=function(o,r,a){var c=e.pageYOffset;(o==r||c==r||e.innerHeight+c>=H)&&(clearInterval(a),s.focus(),u.callbackAfter(t,n))},Q=function(){A+=16,y=A/parseInt(u.speed,10),y=y>1?1:y,I=f+E*h(u.easing,y),e.scrollTo(0,Math.floor(I)),L(I,S,O)},C=function(){u.callbackBefore(t,n),O=setInterval(Q,16)};0===e.pageYOffset&&e.scrollTo(0,0),C()};var O=function(e){var n=s(e.target,"[data-scroll]");n&&"a"===n.tagName.toLowerCase()&&(e.preventDefault(),a.animateScroll(n,n.hash,t))},y=function(){n||(n=setTimeout(function(){n=null,r=b(o)},66))};return a.destroy=function(){t&&(document.removeEventListener("click",O,!1),e.removeEventListener("resize",y,!1),t=null,n=null,o=null,r=null)},a.init=function(n){u&&(a.destroy(),t=l(c,n||{}),o=document.querySelector("[data-scroll-header]"),r=b(o),document.addEventListener("click",O,!1),o&&e.addEventListener("resize",y,!1))},a}); \ No newline at end of file +/** smooth-scroll v5.3.6, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ +!function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)}(this,function(e){"use strict";var t,n,o,r,a={},u=!!document.querySelector&&!!e.addEventListener,c={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},i=function(e,t,n){if("[object Object]"===Object.prototype.toString.call(e))for(var o in e)Object.prototype.hasOwnProperty.call(e,o)&&t.call(n,e[o],o,e);else for(var r=0,a=e.length;a>r;r++)t.call(n,e[r],r,e)},l=function(e,t){var n={};return i(e,function(t,o){n[o]=e[o]}),i(t,function(e,o){n[o]=t[o]}),n},s=function(e,t){for(var n=t.charAt(0);e&&e!==document;e=e.parentNode)if("."===n){if(e.classList.contains(t.substr(1)))return e}else if("#"===n){if(e.id===t.substr(1))return e}else if("["===n&&e.hasAttribute(t.substr(1,t.length-2)))return e;return!1},f=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},d=function(e){for(var t,n=String(e),o=n.length,r=-1,a="",u=n.charCodeAt(0);++r=1&&31>=t||127==t||0===r&&t>=48&&57>=t||1===r&&t>=48&&57>=t&&45===u?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(r):"\\"+n.charAt(r)}return a},h=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},m=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=o-t-n,o>=0?o:0},p=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},v=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},g=function(t,n){history.pushState&&(n||"true"===n)&&history.pushState(null,null,[e.location.protocol,"//",e.location.host,e.location.pathname,e.location.search,t].join(""))},b=function(e){return null===e?0:f(e)+e.offsetTop};a.animateScroll=function(t,n,a){var u=l(u||c,a||{}),i=v(t?t.getAttribute("data-options"):null);u=l(u,i),n="#"+d(n.substr(1));var s="#"===n?document.documentElement:document.querySelector(n),f=e.pageYOffset;o||(o=document.querySelector("[data-scroll-header]")),r||(r=b(o));var O,y,I,S=m(s,r,parseInt(u.offset,10)),E=S-f,H=p(),A=0;g(n,u.updateURL);var L=function(o,r,a){var c=e.pageYOffset;(o==r||c==r||e.innerHeight+c>=H)&&(clearInterval(a),s.focus(),u.callbackAfter(t,n))},Q=function(){A+=16,y=A/parseInt(u.speed,10),y=y>1?1:y,I=f+E*h(u.easing,y),e.scrollTo(0,Math.floor(I)),L(I,S,O)},C=function(){u.callbackBefore(t,n),O=setInterval(Q,16)};0===e.pageYOffset&&e.scrollTo(0,0),C()};var O=function(e){var n=s(e.target,"[data-scroll]");n&&"a"===n.tagName.toLowerCase()&&(e.preventDefault(),a.animateScroll(n,n.hash,t))},y=function(){n||(n=setTimeout(function(){n=null,r=b(o)},66))};return a.destroy=function(){t&&(document.removeEventListener("click",O,!1),e.removeEventListener("resize",y,!1),t=null,n=null,o=null,r=null)},a.init=function(n){u&&(a.destroy(),t=l(c,n||{}),o=document.querySelector("[data-scroll-header]"),r=b(o),document.addEventListener("click",O,!1),o&&e.addEventListener("resize",y,!1))},a}); \ No newline at end of file diff --git a/package.json b/package.json index 95aca5d..07eecd0 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "smooth-scroll", - "version": "5.3.5", + "version": "5.3.6", "description": "Animate scrolling to anchor links", "main": "./dist/js/smooth-scroll.js", "author": { diff --git a/src/js/smooth-scroll.js b/src/js/smooth-scroll.js index 64effe5..b9aa20f 100755 --- a/src/js/smooth-scroll.js +++ b/src/js/smooth-scroll.js @@ -1,8 +1,8 @@ (function (root, factory) { if ( typeof define === 'function' && define.amd ) { - define([], factory); + define([], factory(root)); } else if ( typeof exports === 'object' ) { - module.exports = factory; + module.exports = factory(root); } else { root.smoothScroll = factory(root); } From af07101f520bd676dcf53bac6c9402ac5b0b1b50 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Mon, 9 Mar 2015 21:43:53 -0400 Subject: [PATCH 134/285] Really fixed UMD wrapper --- dist/js/smooth-scroll.js | 26 +++++++++++++------------- dist/js/smooth-scroll.min.js | 2 +- docs/dist/js/smooth-scroll.js | 26 +++++++++++++------------- docs/dist/js/smooth-scroll.min.js | 2 +- src/js/smooth-scroll.js | 26 +++++++++++++------------- 5 files changed, 41 insertions(+), 41 deletions(-) diff --git a/dist/js/smooth-scroll.js b/dist/js/smooth-scroll.js index 1218660..1399a31 100755 --- a/dist/js/smooth-scroll.js +++ b/dist/js/smooth-scroll.js @@ -9,13 +9,13 @@ (function (root, factory) { if ( typeof define === 'function' && define.amd ) { - define([], factory(root)); + define([], factory); } else if ( typeof exports === 'object' ) { - module.exports = factory(root); + module.exports = factory; } else { root.smoothScroll = factory(root); } -})(this, function (window) { +})(this, function (root) { 'use strict'; @@ -24,7 +24,7 @@ // var smoothScroll = {}; // Object for public APIs - var supports = !!document.querySelector && !!window.addEventListener; // Feature test + var supports = !!document.querySelector && !!root.addEventListener; // Feature test var settings, eventTimeout, fixedHeader, headerHeight; // Default settings @@ -265,7 +265,7 @@ */ var updateUrl = function ( anchor, url ) { if ( history.pushState && (url || url === 'true') ) { - history.pushState( null, null, [window.location.protocol, '//', window.location.host, window.location.pathname, window.location.search, anchor].join('') ); + history.pushState( null, null, [root.location.protocol, '//', root.location.host, root.location.pathname, root.location.search, anchor].join('') ); } }; @@ -290,7 +290,7 @@ // Selectors and variables var anchorElem = anchor === '#' ? document.documentElement : document.querySelector(anchor); - var startLocation = window.pageYOffset; // Current location on the page + 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 if ( !headerHeight ) { headerHeight = getHeaderHeight( fixedHeader ); } // Get the height of a fixed header if one exists and not already set var endLocation = getEndLocation( anchorElem, headerHeight, parseInt(settings.offset, 10) ); // Scroll to location @@ -311,8 +311,8 @@ * @param {Number} animationInterval How much to scroll on this loop */ var stopAnimateScroll = function (position, endLocation, animationInterval) { - var currentLocation = window.pageYOffset; - if ( position == endLocation || currentLocation == endLocation || ( (window.innerHeight + currentLocation) >= documentHeight ) ) { + var currentLocation = root.pageYOffset; + if ( position == endLocation || currentLocation == endLocation || ( (root.innerHeight + currentLocation) >= documentHeight ) ) { clearInterval(animationInterval); anchorElem.focus(); settings.callbackAfter( toggle, anchor ); // Run callbacks after animation complete @@ -328,7 +328,7 @@ percentage = ( timeLapsed / parseInt(settings.speed, 10) ); percentage = ( percentage > 1 ) ? 1 : percentage; position = startLocation + ( distance * easingPattern(settings.easing, percentage) ); - window.scrollTo( 0, Math.floor(position) ); + root.scrollTo( 0, Math.floor(position) ); stopAnimateScroll(position, endLocation, animationInterval); }; @@ -345,8 +345,8 @@ * Reset position to fix weird iOS bug * @link https://github.com/cferdinandi/smooth-scroll/issues/45 */ - if ( window.pageYOffset === 0 ) { - window.scrollTo( 0, 0 ); + if ( root.pageYOffset === 0 ) { + root.scrollTo( 0, 0 ); } // Start scrolling animation @@ -392,7 +392,7 @@ // Remove event listeners document.removeEventListener( 'click', eventHandler, false ); - window.removeEventListener( 'resize', eventThrottler, false ); + root.removeEventListener( 'resize', eventThrottler, false ); // Reset varaibles settings = null; @@ -421,7 +421,7 @@ // When a toggle is clicked, run the click handler document.addEventListener('click', eventHandler, false ); - if ( fixedHeader ) { window.addEventListener( 'resize', eventThrottler, false ); } + if ( fixedHeader ) { root.addEventListener( 'resize', eventThrottler, false ); } }; diff --git a/dist/js/smooth-scroll.min.js b/dist/js/smooth-scroll.min.js index 01d9d9c..7984ce7 100755 --- a/dist/js/smooth-scroll.min.js +++ b/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ /** smooth-scroll v5.3.6, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ -!function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)}(this,function(e){"use strict";var t,n,o,r,a={},u=!!document.querySelector&&!!e.addEventListener,c={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},i=function(e,t,n){if("[object Object]"===Object.prototype.toString.call(e))for(var o in e)Object.prototype.hasOwnProperty.call(e,o)&&t.call(n,e[o],o,e);else for(var r=0,a=e.length;a>r;r++)t.call(n,e[r],r,e)},l=function(e,t){var n={};return i(e,function(t,o){n[o]=e[o]}),i(t,function(e,o){n[o]=t[o]}),n},s=function(e,t){for(var n=t.charAt(0);e&&e!==document;e=e.parentNode)if("."===n){if(e.classList.contains(t.substr(1)))return e}else if("#"===n){if(e.id===t.substr(1))return e}else if("["===n&&e.hasAttribute(t.substr(1,t.length-2)))return e;return!1},f=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},d=function(e){for(var t,n=String(e),o=n.length,r=-1,a="",u=n.charCodeAt(0);++r=1&&31>=t||127==t||0===r&&t>=48&&57>=t||1===r&&t>=48&&57>=t&&45===u?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(r):"\\"+n.charAt(r)}return a},h=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},m=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=o-t-n,o>=0?o:0},p=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},v=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},g=function(t,n){history.pushState&&(n||"true"===n)&&history.pushState(null,null,[e.location.protocol,"//",e.location.host,e.location.pathname,e.location.search,t].join(""))},b=function(e){return null===e?0:f(e)+e.offsetTop};a.animateScroll=function(t,n,a){var u=l(u||c,a||{}),i=v(t?t.getAttribute("data-options"):null);u=l(u,i),n="#"+d(n.substr(1));var s="#"===n?document.documentElement:document.querySelector(n),f=e.pageYOffset;o||(o=document.querySelector("[data-scroll-header]")),r||(r=b(o));var O,y,I,S=m(s,r,parseInt(u.offset,10)),E=S-f,H=p(),A=0;g(n,u.updateURL);var L=function(o,r,a){var c=e.pageYOffset;(o==r||c==r||e.innerHeight+c>=H)&&(clearInterval(a),s.focus(),u.callbackAfter(t,n))},Q=function(){A+=16,y=A/parseInt(u.speed,10),y=y>1?1:y,I=f+E*h(u.easing,y),e.scrollTo(0,Math.floor(I)),L(I,S,O)},C=function(){u.callbackBefore(t,n),O=setInterval(Q,16)};0===e.pageYOffset&&e.scrollTo(0,0),C()};var O=function(e){var n=s(e.target,"[data-scroll]");n&&"a"===n.tagName.toLowerCase()&&(e.preventDefault(),a.animateScroll(n,n.hash,t))},y=function(){n||(n=setTimeout(function(){n=null,r=b(o)},66))};return a.destroy=function(){t&&(document.removeEventListener("click",O,!1),e.removeEventListener("resize",y,!1),t=null,n=null,o=null,r=null)},a.init=function(n){u&&(a.destroy(),t=l(c,n||{}),o=document.querySelector("[data-scroll-header]"),r=b(o),document.addEventListener("click",O,!1),o&&e.addEventListener("resize",y,!1))},a}); \ No newline at end of file +!function(e,t){"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?module.exports=t:e.smoothScroll=t(e)}(this,function(e){"use strict";var t,n,o,r,a={},u=!!document.querySelector&&!!e.addEventListener,c={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},i=function(e,t,n){if("[object Object]"===Object.prototype.toString.call(e))for(var o in e)Object.prototype.hasOwnProperty.call(e,o)&&t.call(n,e[o],o,e);else for(var r=0,a=e.length;a>r;r++)t.call(n,e[r],r,e)},l=function(e,t){var n={};return i(e,function(t,o){n[o]=e[o]}),i(t,function(e,o){n[o]=t[o]}),n},s=function(e,t){for(var n=t.charAt(0);e&&e!==document;e=e.parentNode)if("."===n){if(e.classList.contains(t.substr(1)))return e}else if("#"===n){if(e.id===t.substr(1))return e}else if("["===n&&e.hasAttribute(t.substr(1,t.length-2)))return e;return!1},f=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},d=function(e){for(var t,n=String(e),o=n.length,r=-1,a="",u=n.charCodeAt(0);++r=1&&31>=t||127==t||0===r&&t>=48&&57>=t||1===r&&t>=48&&57>=t&&45===u?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(r):"\\"+n.charAt(r)}return a},h=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},m=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=o-t-n,o>=0?o:0},p=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},v=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},g=function(t,n){history.pushState&&(n||"true"===n)&&history.pushState(null,null,[e.location.protocol,"//",e.location.host,e.location.pathname,e.location.search,t].join(""))},b=function(e){return null===e?0:f(e)+e.offsetTop};a.animateScroll=function(t,n,a){var u=l(u||c,a||{}),i=v(t?t.getAttribute("data-options"):null);u=l(u,i),n="#"+d(n.substr(1));var s="#"===n?document.documentElement:document.querySelector(n),f=e.pageYOffset;o||(o=document.querySelector("[data-scroll-header]")),r||(r=b(o));var O,y,I,S=m(s,r,parseInt(u.offset,10)),E=S-f,H=p(),A=0;g(n,u.updateURL);var L=function(o,r,a){var c=e.pageYOffset;(o==r||c==r||e.innerHeight+c>=H)&&(clearInterval(a),s.focus(),u.callbackAfter(t,n))},Q=function(){A+=16,y=A/parseInt(u.speed,10),y=y>1?1:y,I=f+E*h(u.easing,y),e.scrollTo(0,Math.floor(I)),L(I,S,O)},C=function(){u.callbackBefore(t,n),O=setInterval(Q,16)};0===e.pageYOffset&&e.scrollTo(0,0),C()};var O=function(e){var n=s(e.target,"[data-scroll]");n&&"a"===n.tagName.toLowerCase()&&(e.preventDefault(),a.animateScroll(n,n.hash,t))},y=function(){n||(n=setTimeout(function(){n=null,r=b(o)},66))};return a.destroy=function(){t&&(document.removeEventListener("click",O,!1),e.removeEventListener("resize",y,!1),t=null,n=null,o=null,r=null)},a.init=function(n){u&&(a.destroy(),t=l(c,n||{}),o=document.querySelector("[data-scroll-header]"),r=b(o),document.addEventListener("click",O,!1),o&&e.addEventListener("resize",y,!1))},a}); \ No newline at end of file diff --git a/docs/dist/js/smooth-scroll.js b/docs/dist/js/smooth-scroll.js index 1218660..1399a31 100755 --- a/docs/dist/js/smooth-scroll.js +++ b/docs/dist/js/smooth-scroll.js @@ -9,13 +9,13 @@ (function (root, factory) { if ( typeof define === 'function' && define.amd ) { - define([], factory(root)); + define([], factory); } else if ( typeof exports === 'object' ) { - module.exports = factory(root); + module.exports = factory; } else { root.smoothScroll = factory(root); } -})(this, function (window) { +})(this, function (root) { 'use strict'; @@ -24,7 +24,7 @@ // var smoothScroll = {}; // Object for public APIs - var supports = !!document.querySelector && !!window.addEventListener; // Feature test + var supports = !!document.querySelector && !!root.addEventListener; // Feature test var settings, eventTimeout, fixedHeader, headerHeight; // Default settings @@ -265,7 +265,7 @@ */ var updateUrl = function ( anchor, url ) { if ( history.pushState && (url || url === 'true') ) { - history.pushState( null, null, [window.location.protocol, '//', window.location.host, window.location.pathname, window.location.search, anchor].join('') ); + history.pushState( null, null, [root.location.protocol, '//', root.location.host, root.location.pathname, root.location.search, anchor].join('') ); } }; @@ -290,7 +290,7 @@ // Selectors and variables var anchorElem = anchor === '#' ? document.documentElement : document.querySelector(anchor); - var startLocation = window.pageYOffset; // Current location on the page + 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 if ( !headerHeight ) { headerHeight = getHeaderHeight( fixedHeader ); } // Get the height of a fixed header if one exists and not already set var endLocation = getEndLocation( anchorElem, headerHeight, parseInt(settings.offset, 10) ); // Scroll to location @@ -311,8 +311,8 @@ * @param {Number} animationInterval How much to scroll on this loop */ var stopAnimateScroll = function (position, endLocation, animationInterval) { - var currentLocation = window.pageYOffset; - if ( position == endLocation || currentLocation == endLocation || ( (window.innerHeight + currentLocation) >= documentHeight ) ) { + var currentLocation = root.pageYOffset; + if ( position == endLocation || currentLocation == endLocation || ( (root.innerHeight + currentLocation) >= documentHeight ) ) { clearInterval(animationInterval); anchorElem.focus(); settings.callbackAfter( toggle, anchor ); // Run callbacks after animation complete @@ -328,7 +328,7 @@ percentage = ( timeLapsed / parseInt(settings.speed, 10) ); percentage = ( percentage > 1 ) ? 1 : percentage; position = startLocation + ( distance * easingPattern(settings.easing, percentage) ); - window.scrollTo( 0, Math.floor(position) ); + root.scrollTo( 0, Math.floor(position) ); stopAnimateScroll(position, endLocation, animationInterval); }; @@ -345,8 +345,8 @@ * Reset position to fix weird iOS bug * @link https://github.com/cferdinandi/smooth-scroll/issues/45 */ - if ( window.pageYOffset === 0 ) { - window.scrollTo( 0, 0 ); + if ( root.pageYOffset === 0 ) { + root.scrollTo( 0, 0 ); } // Start scrolling animation @@ -392,7 +392,7 @@ // Remove event listeners document.removeEventListener( 'click', eventHandler, false ); - window.removeEventListener( 'resize', eventThrottler, false ); + root.removeEventListener( 'resize', eventThrottler, false ); // Reset varaibles settings = null; @@ -421,7 +421,7 @@ // When a toggle is clicked, run the click handler document.addEventListener('click', eventHandler, false ); - if ( fixedHeader ) { window.addEventListener( 'resize', eventThrottler, false ); } + if ( fixedHeader ) { root.addEventListener( 'resize', eventThrottler, false ); } }; diff --git a/docs/dist/js/smooth-scroll.min.js b/docs/dist/js/smooth-scroll.min.js index 01d9d9c..7984ce7 100755 --- a/docs/dist/js/smooth-scroll.min.js +++ b/docs/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ /** smooth-scroll v5.3.6, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ -!function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)}(this,function(e){"use strict";var t,n,o,r,a={},u=!!document.querySelector&&!!e.addEventListener,c={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},i=function(e,t,n){if("[object Object]"===Object.prototype.toString.call(e))for(var o in e)Object.prototype.hasOwnProperty.call(e,o)&&t.call(n,e[o],o,e);else for(var r=0,a=e.length;a>r;r++)t.call(n,e[r],r,e)},l=function(e,t){var n={};return i(e,function(t,o){n[o]=e[o]}),i(t,function(e,o){n[o]=t[o]}),n},s=function(e,t){for(var n=t.charAt(0);e&&e!==document;e=e.parentNode)if("."===n){if(e.classList.contains(t.substr(1)))return e}else if("#"===n){if(e.id===t.substr(1))return e}else if("["===n&&e.hasAttribute(t.substr(1,t.length-2)))return e;return!1},f=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},d=function(e){for(var t,n=String(e),o=n.length,r=-1,a="",u=n.charCodeAt(0);++r=1&&31>=t||127==t||0===r&&t>=48&&57>=t||1===r&&t>=48&&57>=t&&45===u?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(r):"\\"+n.charAt(r)}return a},h=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},m=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=o-t-n,o>=0?o:0},p=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},v=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},g=function(t,n){history.pushState&&(n||"true"===n)&&history.pushState(null,null,[e.location.protocol,"//",e.location.host,e.location.pathname,e.location.search,t].join(""))},b=function(e){return null===e?0:f(e)+e.offsetTop};a.animateScroll=function(t,n,a){var u=l(u||c,a||{}),i=v(t?t.getAttribute("data-options"):null);u=l(u,i),n="#"+d(n.substr(1));var s="#"===n?document.documentElement:document.querySelector(n),f=e.pageYOffset;o||(o=document.querySelector("[data-scroll-header]")),r||(r=b(o));var O,y,I,S=m(s,r,parseInt(u.offset,10)),E=S-f,H=p(),A=0;g(n,u.updateURL);var L=function(o,r,a){var c=e.pageYOffset;(o==r||c==r||e.innerHeight+c>=H)&&(clearInterval(a),s.focus(),u.callbackAfter(t,n))},Q=function(){A+=16,y=A/parseInt(u.speed,10),y=y>1?1:y,I=f+E*h(u.easing,y),e.scrollTo(0,Math.floor(I)),L(I,S,O)},C=function(){u.callbackBefore(t,n),O=setInterval(Q,16)};0===e.pageYOffset&&e.scrollTo(0,0),C()};var O=function(e){var n=s(e.target,"[data-scroll]");n&&"a"===n.tagName.toLowerCase()&&(e.preventDefault(),a.animateScroll(n,n.hash,t))},y=function(){n||(n=setTimeout(function(){n=null,r=b(o)},66))};return a.destroy=function(){t&&(document.removeEventListener("click",O,!1),e.removeEventListener("resize",y,!1),t=null,n=null,o=null,r=null)},a.init=function(n){u&&(a.destroy(),t=l(c,n||{}),o=document.querySelector("[data-scroll-header]"),r=b(o),document.addEventListener("click",O,!1),o&&e.addEventListener("resize",y,!1))},a}); \ No newline at end of file +!function(e,t){"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?module.exports=t:e.smoothScroll=t(e)}(this,function(e){"use strict";var t,n,o,r,a={},u=!!document.querySelector&&!!e.addEventListener,c={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},i=function(e,t,n){if("[object Object]"===Object.prototype.toString.call(e))for(var o in e)Object.prototype.hasOwnProperty.call(e,o)&&t.call(n,e[o],o,e);else for(var r=0,a=e.length;a>r;r++)t.call(n,e[r],r,e)},l=function(e,t){var n={};return i(e,function(t,o){n[o]=e[o]}),i(t,function(e,o){n[o]=t[o]}),n},s=function(e,t){for(var n=t.charAt(0);e&&e!==document;e=e.parentNode)if("."===n){if(e.classList.contains(t.substr(1)))return e}else if("#"===n){if(e.id===t.substr(1))return e}else if("["===n&&e.hasAttribute(t.substr(1,t.length-2)))return e;return!1},f=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},d=function(e){for(var t,n=String(e),o=n.length,r=-1,a="",u=n.charCodeAt(0);++r=1&&31>=t||127==t||0===r&&t>=48&&57>=t||1===r&&t>=48&&57>=t&&45===u?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(r):"\\"+n.charAt(r)}return a},h=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},m=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=o-t-n,o>=0?o:0},p=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},v=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},g=function(t,n){history.pushState&&(n||"true"===n)&&history.pushState(null,null,[e.location.protocol,"//",e.location.host,e.location.pathname,e.location.search,t].join(""))},b=function(e){return null===e?0:f(e)+e.offsetTop};a.animateScroll=function(t,n,a){var u=l(u||c,a||{}),i=v(t?t.getAttribute("data-options"):null);u=l(u,i),n="#"+d(n.substr(1));var s="#"===n?document.documentElement:document.querySelector(n),f=e.pageYOffset;o||(o=document.querySelector("[data-scroll-header]")),r||(r=b(o));var O,y,I,S=m(s,r,parseInt(u.offset,10)),E=S-f,H=p(),A=0;g(n,u.updateURL);var L=function(o,r,a){var c=e.pageYOffset;(o==r||c==r||e.innerHeight+c>=H)&&(clearInterval(a),s.focus(),u.callbackAfter(t,n))},Q=function(){A+=16,y=A/parseInt(u.speed,10),y=y>1?1:y,I=f+E*h(u.easing,y),e.scrollTo(0,Math.floor(I)),L(I,S,O)},C=function(){u.callbackBefore(t,n),O=setInterval(Q,16)};0===e.pageYOffset&&e.scrollTo(0,0),C()};var O=function(e){var n=s(e.target,"[data-scroll]");n&&"a"===n.tagName.toLowerCase()&&(e.preventDefault(),a.animateScroll(n,n.hash,t))},y=function(){n||(n=setTimeout(function(){n=null,r=b(o)},66))};return a.destroy=function(){t&&(document.removeEventListener("click",O,!1),e.removeEventListener("resize",y,!1),t=null,n=null,o=null,r=null)},a.init=function(n){u&&(a.destroy(),t=l(c,n||{}),o=document.querySelector("[data-scroll-header]"),r=b(o),document.addEventListener("click",O,!1),o&&e.addEventListener("resize",y,!1))},a}); \ No newline at end of file diff --git a/src/js/smooth-scroll.js b/src/js/smooth-scroll.js index b9aa20f..534b2f9 100755 --- a/src/js/smooth-scroll.js +++ b/src/js/smooth-scroll.js @@ -1,12 +1,12 @@ (function (root, factory) { if ( typeof define === 'function' && define.amd ) { - define([], factory(root)); + define([], factory); } else if ( typeof exports === 'object' ) { - module.exports = factory(root); + module.exports = factory; } else { root.smoothScroll = factory(root); } -})(this, function (window) { +})(this, function (root) { 'use strict'; @@ -15,7 +15,7 @@ // var smoothScroll = {}; // Object for public APIs - var supports = !!document.querySelector && !!window.addEventListener; // Feature test + var supports = !!document.querySelector && !!root.addEventListener; // Feature test var settings, eventTimeout, fixedHeader, headerHeight; // Default settings @@ -256,7 +256,7 @@ */ var updateUrl = function ( anchor, url ) { if ( history.pushState && (url || url === 'true') ) { - history.pushState( null, null, [window.location.protocol, '//', window.location.host, window.location.pathname, window.location.search, anchor].join('') ); + history.pushState( null, null, [root.location.protocol, '//', root.location.host, root.location.pathname, root.location.search, anchor].join('') ); } }; @@ -281,7 +281,7 @@ // Selectors and variables var anchorElem = anchor === '#' ? document.documentElement : document.querySelector(anchor); - var startLocation = window.pageYOffset; // Current location on the page + 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 if ( !headerHeight ) { headerHeight = getHeaderHeight( fixedHeader ); } // Get the height of a fixed header if one exists and not already set var endLocation = getEndLocation( anchorElem, headerHeight, parseInt(settings.offset, 10) ); // Scroll to location @@ -302,8 +302,8 @@ * @param {Number} animationInterval How much to scroll on this loop */ var stopAnimateScroll = function (position, endLocation, animationInterval) { - var currentLocation = window.pageYOffset; - if ( position == endLocation || currentLocation == endLocation || ( (window.innerHeight + currentLocation) >= documentHeight ) ) { + var currentLocation = root.pageYOffset; + if ( position == endLocation || currentLocation == endLocation || ( (root.innerHeight + currentLocation) >= documentHeight ) ) { clearInterval(animationInterval); anchorElem.focus(); settings.callbackAfter( toggle, anchor ); // Run callbacks after animation complete @@ -319,7 +319,7 @@ percentage = ( timeLapsed / parseInt(settings.speed, 10) ); percentage = ( percentage > 1 ) ? 1 : percentage; position = startLocation + ( distance * easingPattern(settings.easing, percentage) ); - window.scrollTo( 0, Math.floor(position) ); + root.scrollTo( 0, Math.floor(position) ); stopAnimateScroll(position, endLocation, animationInterval); }; @@ -336,8 +336,8 @@ * Reset position to fix weird iOS bug * @link https://github.com/cferdinandi/smooth-scroll/issues/45 */ - if ( window.pageYOffset === 0 ) { - window.scrollTo( 0, 0 ); + if ( root.pageYOffset === 0 ) { + root.scrollTo( 0, 0 ); } // Start scrolling animation @@ -383,7 +383,7 @@ // Remove event listeners document.removeEventListener( 'click', eventHandler, false ); - window.removeEventListener( 'resize', eventThrottler, false ); + root.removeEventListener( 'resize', eventThrottler, false ); // Reset varaibles settings = null; @@ -412,7 +412,7 @@ // When a toggle is clicked, run the click handler document.addEventListener('click', eventHandler, false ); - if ( fixedHeader ) { window.addEventListener( 'resize', eventThrottler, false ); } + if ( fixedHeader ) { root.addEventListener( 'resize', eventThrottler, false ); } }; From 78bf650fdc569366e02022beba69f4018c52bb84 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Mon, 9 Mar 2015 21:52:55 -0400 Subject: [PATCH 135/285] Really fixed UMD wrapper --- dist/js/smooth-scroll.js | 4 ++-- dist/js/smooth-scroll.min.js | 2 +- docs/dist/js/smooth-scroll.js | 4 ++-- docs/dist/js/smooth-scroll.min.js | 2 +- src/js/smooth-scroll.js | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dist/js/smooth-scroll.js b/dist/js/smooth-scroll.js index 1399a31..bf39e5a 100755 --- a/dist/js/smooth-scroll.js +++ b/dist/js/smooth-scroll.js @@ -9,9 +9,9 @@ (function (root, factory) { if ( typeof define === 'function' && define.amd ) { - define([], factory); + define([], factory(root)); } else if ( typeof exports === 'object' ) { - module.exports = factory; + module.exports = factory(root); } else { root.smoothScroll = factory(root); } diff --git a/dist/js/smooth-scroll.min.js b/dist/js/smooth-scroll.min.js index 7984ce7..01d9d9c 100755 --- a/dist/js/smooth-scroll.min.js +++ b/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ /** smooth-scroll v5.3.6, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ -!function(e,t){"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?module.exports=t:e.smoothScroll=t(e)}(this,function(e){"use strict";var t,n,o,r,a={},u=!!document.querySelector&&!!e.addEventListener,c={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},i=function(e,t,n){if("[object Object]"===Object.prototype.toString.call(e))for(var o in e)Object.prototype.hasOwnProperty.call(e,o)&&t.call(n,e[o],o,e);else for(var r=0,a=e.length;a>r;r++)t.call(n,e[r],r,e)},l=function(e,t){var n={};return i(e,function(t,o){n[o]=e[o]}),i(t,function(e,o){n[o]=t[o]}),n},s=function(e,t){for(var n=t.charAt(0);e&&e!==document;e=e.parentNode)if("."===n){if(e.classList.contains(t.substr(1)))return e}else if("#"===n){if(e.id===t.substr(1))return e}else if("["===n&&e.hasAttribute(t.substr(1,t.length-2)))return e;return!1},f=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},d=function(e){for(var t,n=String(e),o=n.length,r=-1,a="",u=n.charCodeAt(0);++r=1&&31>=t||127==t||0===r&&t>=48&&57>=t||1===r&&t>=48&&57>=t&&45===u?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(r):"\\"+n.charAt(r)}return a},h=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},m=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=o-t-n,o>=0?o:0},p=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},v=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},g=function(t,n){history.pushState&&(n||"true"===n)&&history.pushState(null,null,[e.location.protocol,"//",e.location.host,e.location.pathname,e.location.search,t].join(""))},b=function(e){return null===e?0:f(e)+e.offsetTop};a.animateScroll=function(t,n,a){var u=l(u||c,a||{}),i=v(t?t.getAttribute("data-options"):null);u=l(u,i),n="#"+d(n.substr(1));var s="#"===n?document.documentElement:document.querySelector(n),f=e.pageYOffset;o||(o=document.querySelector("[data-scroll-header]")),r||(r=b(o));var O,y,I,S=m(s,r,parseInt(u.offset,10)),E=S-f,H=p(),A=0;g(n,u.updateURL);var L=function(o,r,a){var c=e.pageYOffset;(o==r||c==r||e.innerHeight+c>=H)&&(clearInterval(a),s.focus(),u.callbackAfter(t,n))},Q=function(){A+=16,y=A/parseInt(u.speed,10),y=y>1?1:y,I=f+E*h(u.easing,y),e.scrollTo(0,Math.floor(I)),L(I,S,O)},C=function(){u.callbackBefore(t,n),O=setInterval(Q,16)};0===e.pageYOffset&&e.scrollTo(0,0),C()};var O=function(e){var n=s(e.target,"[data-scroll]");n&&"a"===n.tagName.toLowerCase()&&(e.preventDefault(),a.animateScroll(n,n.hash,t))},y=function(){n||(n=setTimeout(function(){n=null,r=b(o)},66))};return a.destroy=function(){t&&(document.removeEventListener("click",O,!1),e.removeEventListener("resize",y,!1),t=null,n=null,o=null,r=null)},a.init=function(n){u&&(a.destroy(),t=l(c,n||{}),o=document.querySelector("[data-scroll-header]"),r=b(o),document.addEventListener("click",O,!1),o&&e.addEventListener("resize",y,!1))},a}); \ No newline at end of file +!function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)}(this,function(e){"use strict";var t,n,o,r,a={},u=!!document.querySelector&&!!e.addEventListener,c={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},i=function(e,t,n){if("[object Object]"===Object.prototype.toString.call(e))for(var o in e)Object.prototype.hasOwnProperty.call(e,o)&&t.call(n,e[o],o,e);else for(var r=0,a=e.length;a>r;r++)t.call(n,e[r],r,e)},l=function(e,t){var n={};return i(e,function(t,o){n[o]=e[o]}),i(t,function(e,o){n[o]=t[o]}),n},s=function(e,t){for(var n=t.charAt(0);e&&e!==document;e=e.parentNode)if("."===n){if(e.classList.contains(t.substr(1)))return e}else if("#"===n){if(e.id===t.substr(1))return e}else if("["===n&&e.hasAttribute(t.substr(1,t.length-2)))return e;return!1},f=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},d=function(e){for(var t,n=String(e),o=n.length,r=-1,a="",u=n.charCodeAt(0);++r=1&&31>=t||127==t||0===r&&t>=48&&57>=t||1===r&&t>=48&&57>=t&&45===u?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(r):"\\"+n.charAt(r)}return a},h=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},m=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=o-t-n,o>=0?o:0},p=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},v=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},g=function(t,n){history.pushState&&(n||"true"===n)&&history.pushState(null,null,[e.location.protocol,"//",e.location.host,e.location.pathname,e.location.search,t].join(""))},b=function(e){return null===e?0:f(e)+e.offsetTop};a.animateScroll=function(t,n,a){var u=l(u||c,a||{}),i=v(t?t.getAttribute("data-options"):null);u=l(u,i),n="#"+d(n.substr(1));var s="#"===n?document.documentElement:document.querySelector(n),f=e.pageYOffset;o||(o=document.querySelector("[data-scroll-header]")),r||(r=b(o));var O,y,I,S=m(s,r,parseInt(u.offset,10)),E=S-f,H=p(),A=0;g(n,u.updateURL);var L=function(o,r,a){var c=e.pageYOffset;(o==r||c==r||e.innerHeight+c>=H)&&(clearInterval(a),s.focus(),u.callbackAfter(t,n))},Q=function(){A+=16,y=A/parseInt(u.speed,10),y=y>1?1:y,I=f+E*h(u.easing,y),e.scrollTo(0,Math.floor(I)),L(I,S,O)},C=function(){u.callbackBefore(t,n),O=setInterval(Q,16)};0===e.pageYOffset&&e.scrollTo(0,0),C()};var O=function(e){var n=s(e.target,"[data-scroll]");n&&"a"===n.tagName.toLowerCase()&&(e.preventDefault(),a.animateScroll(n,n.hash,t))},y=function(){n||(n=setTimeout(function(){n=null,r=b(o)},66))};return a.destroy=function(){t&&(document.removeEventListener("click",O,!1),e.removeEventListener("resize",y,!1),t=null,n=null,o=null,r=null)},a.init=function(n){u&&(a.destroy(),t=l(c,n||{}),o=document.querySelector("[data-scroll-header]"),r=b(o),document.addEventListener("click",O,!1),o&&e.addEventListener("resize",y,!1))},a}); \ No newline at end of file diff --git a/docs/dist/js/smooth-scroll.js b/docs/dist/js/smooth-scroll.js index 1399a31..bf39e5a 100755 --- a/docs/dist/js/smooth-scroll.js +++ b/docs/dist/js/smooth-scroll.js @@ -9,9 +9,9 @@ (function (root, factory) { if ( typeof define === 'function' && define.amd ) { - define([], factory); + define([], factory(root)); } else if ( typeof exports === 'object' ) { - module.exports = factory; + module.exports = factory(root); } else { root.smoothScroll = factory(root); } diff --git a/docs/dist/js/smooth-scroll.min.js b/docs/dist/js/smooth-scroll.min.js index 7984ce7..01d9d9c 100755 --- a/docs/dist/js/smooth-scroll.min.js +++ b/docs/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ /** smooth-scroll v5.3.6, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ -!function(e,t){"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?module.exports=t:e.smoothScroll=t(e)}(this,function(e){"use strict";var t,n,o,r,a={},u=!!document.querySelector&&!!e.addEventListener,c={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},i=function(e,t,n){if("[object Object]"===Object.prototype.toString.call(e))for(var o in e)Object.prototype.hasOwnProperty.call(e,o)&&t.call(n,e[o],o,e);else for(var r=0,a=e.length;a>r;r++)t.call(n,e[r],r,e)},l=function(e,t){var n={};return i(e,function(t,o){n[o]=e[o]}),i(t,function(e,o){n[o]=t[o]}),n},s=function(e,t){for(var n=t.charAt(0);e&&e!==document;e=e.parentNode)if("."===n){if(e.classList.contains(t.substr(1)))return e}else if("#"===n){if(e.id===t.substr(1))return e}else if("["===n&&e.hasAttribute(t.substr(1,t.length-2)))return e;return!1},f=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},d=function(e){for(var t,n=String(e),o=n.length,r=-1,a="",u=n.charCodeAt(0);++r=1&&31>=t||127==t||0===r&&t>=48&&57>=t||1===r&&t>=48&&57>=t&&45===u?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(r):"\\"+n.charAt(r)}return a},h=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},m=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=o-t-n,o>=0?o:0},p=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},v=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},g=function(t,n){history.pushState&&(n||"true"===n)&&history.pushState(null,null,[e.location.protocol,"//",e.location.host,e.location.pathname,e.location.search,t].join(""))},b=function(e){return null===e?0:f(e)+e.offsetTop};a.animateScroll=function(t,n,a){var u=l(u||c,a||{}),i=v(t?t.getAttribute("data-options"):null);u=l(u,i),n="#"+d(n.substr(1));var s="#"===n?document.documentElement:document.querySelector(n),f=e.pageYOffset;o||(o=document.querySelector("[data-scroll-header]")),r||(r=b(o));var O,y,I,S=m(s,r,parseInt(u.offset,10)),E=S-f,H=p(),A=0;g(n,u.updateURL);var L=function(o,r,a){var c=e.pageYOffset;(o==r||c==r||e.innerHeight+c>=H)&&(clearInterval(a),s.focus(),u.callbackAfter(t,n))},Q=function(){A+=16,y=A/parseInt(u.speed,10),y=y>1?1:y,I=f+E*h(u.easing,y),e.scrollTo(0,Math.floor(I)),L(I,S,O)},C=function(){u.callbackBefore(t,n),O=setInterval(Q,16)};0===e.pageYOffset&&e.scrollTo(0,0),C()};var O=function(e){var n=s(e.target,"[data-scroll]");n&&"a"===n.tagName.toLowerCase()&&(e.preventDefault(),a.animateScroll(n,n.hash,t))},y=function(){n||(n=setTimeout(function(){n=null,r=b(o)},66))};return a.destroy=function(){t&&(document.removeEventListener("click",O,!1),e.removeEventListener("resize",y,!1),t=null,n=null,o=null,r=null)},a.init=function(n){u&&(a.destroy(),t=l(c,n||{}),o=document.querySelector("[data-scroll-header]"),r=b(o),document.addEventListener("click",O,!1),o&&e.addEventListener("resize",y,!1))},a}); \ No newline at end of file +!function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)}(this,function(e){"use strict";var t,n,o,r,a={},u=!!document.querySelector&&!!e.addEventListener,c={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},i=function(e,t,n){if("[object Object]"===Object.prototype.toString.call(e))for(var o in e)Object.prototype.hasOwnProperty.call(e,o)&&t.call(n,e[o],o,e);else for(var r=0,a=e.length;a>r;r++)t.call(n,e[r],r,e)},l=function(e,t){var n={};return i(e,function(t,o){n[o]=e[o]}),i(t,function(e,o){n[o]=t[o]}),n},s=function(e,t){for(var n=t.charAt(0);e&&e!==document;e=e.parentNode)if("."===n){if(e.classList.contains(t.substr(1)))return e}else if("#"===n){if(e.id===t.substr(1))return e}else if("["===n&&e.hasAttribute(t.substr(1,t.length-2)))return e;return!1},f=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},d=function(e){for(var t,n=String(e),o=n.length,r=-1,a="",u=n.charCodeAt(0);++r=1&&31>=t||127==t||0===r&&t>=48&&57>=t||1===r&&t>=48&&57>=t&&45===u?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(r):"\\"+n.charAt(r)}return a},h=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},m=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=o-t-n,o>=0?o:0},p=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},v=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},g=function(t,n){history.pushState&&(n||"true"===n)&&history.pushState(null,null,[e.location.protocol,"//",e.location.host,e.location.pathname,e.location.search,t].join(""))},b=function(e){return null===e?0:f(e)+e.offsetTop};a.animateScroll=function(t,n,a){var u=l(u||c,a||{}),i=v(t?t.getAttribute("data-options"):null);u=l(u,i),n="#"+d(n.substr(1));var s="#"===n?document.documentElement:document.querySelector(n),f=e.pageYOffset;o||(o=document.querySelector("[data-scroll-header]")),r||(r=b(o));var O,y,I,S=m(s,r,parseInt(u.offset,10)),E=S-f,H=p(),A=0;g(n,u.updateURL);var L=function(o,r,a){var c=e.pageYOffset;(o==r||c==r||e.innerHeight+c>=H)&&(clearInterval(a),s.focus(),u.callbackAfter(t,n))},Q=function(){A+=16,y=A/parseInt(u.speed,10),y=y>1?1:y,I=f+E*h(u.easing,y),e.scrollTo(0,Math.floor(I)),L(I,S,O)},C=function(){u.callbackBefore(t,n),O=setInterval(Q,16)};0===e.pageYOffset&&e.scrollTo(0,0),C()};var O=function(e){var n=s(e.target,"[data-scroll]");n&&"a"===n.tagName.toLowerCase()&&(e.preventDefault(),a.animateScroll(n,n.hash,t))},y=function(){n||(n=setTimeout(function(){n=null,r=b(o)},66))};return a.destroy=function(){t&&(document.removeEventListener("click",O,!1),e.removeEventListener("resize",y,!1),t=null,n=null,o=null,r=null)},a.init=function(n){u&&(a.destroy(),t=l(c,n||{}),o=document.querySelector("[data-scroll-header]"),r=b(o),document.addEventListener("click",O,!1),o&&e.addEventListener("resize",y,!1))},a}); \ No newline at end of file diff --git a/src/js/smooth-scroll.js b/src/js/smooth-scroll.js index 534b2f9..5999b4d 100755 --- a/src/js/smooth-scroll.js +++ b/src/js/smooth-scroll.js @@ -1,8 +1,8 @@ (function (root, factory) { if ( typeof define === 'function' && define.amd ) { - define([], factory); + define([], factory(root)); } else if ( typeof exports === 'object' ) { - module.exports = factory; + module.exports = factory(root); } else { root.smoothScroll = factory(root); } From a768d33cf3dc0d378c5e4756c8a7b722c7959d8e Mon Sep 17 00:00:00 2001 From: alexanderbeletsky Date: Mon, 11 May 2015 23:00:45 +0200 Subject: [PATCH 136/285] definition of and scoping --- src/js/smooth-scroll.js | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/js/smooth-scroll.js b/src/js/smooth-scroll.js index 5999b4d..7a9ff28 100755 --- a/src/js/smooth-scroll.js +++ b/src/js/smooth-scroll.js @@ -6,7 +6,7 @@ } else { root.smoothScroll = factory(root); } -})(this, function (root) { +})(typeof global !== "undefined" ? global : this.window || this.global, function (root) { 'use strict'; @@ -15,7 +15,7 @@ // var smoothScroll = {}; // Object for public APIs - var supports = !!document.querySelector && !!root.addEventListener; // Feature test + var supports = !!root.document.querySelector && !!root.addEventListener; // Feature test var settings, eventTimeout, fixedHeader, headerHeight; // Default settings @@ -80,7 +80,7 @@ */ var getClosest = function (elem, selector) { var firstChar = selector.charAt(0); - for ( ; elem && elem !== document; elem = elem.parentNode ) { + for ( ; elem && elem !== root.document; elem = elem.parentNode ) { if ( firstChar === '.' ) { if ( elem.classList.contains( selector.substr(1) ) ) { return elem; @@ -232,9 +232,9 @@ */ var getDocumentHeight = function () { return Math.max( - document.body.scrollHeight, document.documentElement.scrollHeight, - document.body.offsetHeight, document.documentElement.offsetHeight, - document.body.clientHeight, document.documentElement.clientHeight + root.document.body.scrollHeight, root.document.documentElement.scrollHeight, + root.document.body.offsetHeight, root.document.documentElement.offsetHeight, + root.document.body.clientHeight, root.document.documentElement.clientHeight ); }; @@ -255,8 +255,8 @@ * @param {Boolean} url Whether or not to update the URL history */ var updateUrl = function ( anchor, url ) { - if ( history.pushState && (url || url === 'true') ) { - history.pushState( null, null, [root.location.protocol, '//', root.location.host, root.location.pathname, root.location.search, anchor].join('') ); + if ( root.history.pushState && (url || url === 'true') ) { + root.history.pushState( null, null, [root.location.protocol, '//', root.location.host, root.location.pathname, root.location.search, anchor].join('') ); } }; @@ -280,9 +280,9 @@ anchor = '#' + escapeCharacters(anchor.substr(1)); // Escape special characters and leading numbers // Selectors and variables - var anchorElem = anchor === '#' ? document.documentElement : document.querySelector(anchor); + var anchorElem = anchor === '#' ? root.document.documentElement : root.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 + if ( !fixedHeader ) { fixedHeader = root.document.querySelector('[data-scroll-header]'); } // 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 = getEndLocation( anchorElem, headerHeight, parseInt(settings.offset, 10) ); // Scroll to location var animationInterval; // interval timer @@ -382,7 +382,7 @@ if ( !settings ) return; // Remove event listeners - document.removeEventListener( 'click', eventHandler, false ); + root.document.removeEventListener( 'click', eventHandler, false ); root.removeEventListener( 'resize', eventThrottler, false ); // Reset varaibles @@ -407,11 +407,11 @@ // Selectors and variables settings = extend( defaults, options || {} ); // Merge user options with defaults - fixedHeader = document.querySelector('[data-scroll-header]'); // Get the fixed header + fixedHeader = root.document.querySelector('[data-scroll-header]'); // Get the fixed header headerHeight = getHeaderHeight( fixedHeader ); // When a toggle is clicked, run the click handler - document.addEventListener('click', eventHandler, false ); + root.document.addEventListener('click', eventHandler, false ); if ( fixedHeader ) { root.addEventListener( 'resize', eventThrottler, false ); } }; From 517e7e65be1eda4e9637e3114ba57ad64bc1e86d Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Tue, 12 May 2015 20:44:59 -0400 Subject: [PATCH 137/285] Updated readme, ran build --- README.md | 3 +++ dist/js/smooth-scroll.js | 28 ++++++++++++++-------------- dist/js/smooth-scroll.min.js | 4 ++-- docs/dist/js/smooth-scroll.js | 28 ++++++++++++++-------------- docs/dist/js/smooth-scroll.min.js | 4 ++-- package.json | 2 +- 6 files changed, 36 insertions(+), 33 deletions(-) diff --git a/README.md b/README.md index ad2a667..45aa788 100755 --- a/README.md +++ b/README.md @@ -236,6 +236,7 @@ If the `` element has been assigned a height of `100%`, Smooth Scroll is u * Query string fix when updating URL by [Qu Yatong](https://github.com/quyatong). * Scroll to top support by [Robbert Broersma](https://github.com/robbert). * Unit tests by [Thibaud Colas](https://github.com/ThibWeb). +* Browserify support by [Alexander Beletsky](https://github.com/alexbeletsky). @@ -254,6 +255,8 @@ Smooth Scroll is licensed under the [MIT License](http://gomakethings.com/mit/). Smooth Scroll uses [semantic versioning](http://semver.org/). +* v5.3.7 - May 12, 2015 + * Fixed `this` and `root` bug with Browserify. * v5.3.6 - March 9, 2015 * REALLY fixed UMD wrapper. * v5.3.5 - March 7, 2015 diff --git a/dist/js/smooth-scroll.js b/dist/js/smooth-scroll.js index bf39e5a..c38271b 100755 --- a/dist/js/smooth-scroll.js +++ b/dist/js/smooth-scroll.js @@ -1,5 +1,5 @@ /** - * smooth-scroll v5.3.6 + * smooth-scroll v5.3.7 * Animate scrolling to anchor links, by Chris Ferdinandi. * http://github.com/cferdinandi/smooth-scroll * @@ -15,7 +15,7 @@ } else { root.smoothScroll = factory(root); } -})(this, function (root) { +})(typeof global !== "undefined" ? global : this.window || this.global, function (root) { 'use strict'; @@ -24,7 +24,7 @@ // var smoothScroll = {}; // Object for public APIs - var supports = !!document.querySelector && !!root.addEventListener; // Feature test + var supports = !!root.document.querySelector && !!root.addEventListener; // Feature test var settings, eventTimeout, fixedHeader, headerHeight; // Default settings @@ -89,7 +89,7 @@ */ var getClosest = function (elem, selector) { var firstChar = selector.charAt(0); - for ( ; elem && elem !== document; elem = elem.parentNode ) { + for ( ; elem && elem !== root.document; elem = elem.parentNode ) { if ( firstChar === '.' ) { if ( elem.classList.contains( selector.substr(1) ) ) { return elem; @@ -241,9 +241,9 @@ */ var getDocumentHeight = function () { return Math.max( - document.body.scrollHeight, document.documentElement.scrollHeight, - document.body.offsetHeight, document.documentElement.offsetHeight, - document.body.clientHeight, document.documentElement.clientHeight + root.document.body.scrollHeight, root.document.documentElement.scrollHeight, + root.document.body.offsetHeight, root.document.documentElement.offsetHeight, + root.document.body.clientHeight, root.document.documentElement.clientHeight ); }; @@ -264,8 +264,8 @@ * @param {Boolean} url Whether or not to update the URL history */ var updateUrl = function ( anchor, url ) { - if ( history.pushState && (url || url === 'true') ) { - history.pushState( null, null, [root.location.protocol, '//', root.location.host, root.location.pathname, root.location.search, anchor].join('') ); + if ( root.history.pushState && (url || url === 'true') ) { + root.history.pushState( null, null, [root.location.protocol, '//', root.location.host, root.location.pathname, root.location.search, anchor].join('') ); } }; @@ -289,9 +289,9 @@ anchor = '#' + escapeCharacters(anchor.substr(1)); // Escape special characters and leading numbers // Selectors and variables - var anchorElem = anchor === '#' ? document.documentElement : document.querySelector(anchor); + var anchorElem = anchor === '#' ? root.document.documentElement : root.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 + if ( !fixedHeader ) { fixedHeader = root.document.querySelector('[data-scroll-header]'); } // 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 = getEndLocation( anchorElem, headerHeight, parseInt(settings.offset, 10) ); // Scroll to location var animationInterval; // interval timer @@ -391,7 +391,7 @@ if ( !settings ) return; // Remove event listeners - document.removeEventListener( 'click', eventHandler, false ); + root.document.removeEventListener( 'click', eventHandler, false ); root.removeEventListener( 'resize', eventThrottler, false ); // Reset varaibles @@ -416,11 +416,11 @@ // Selectors and variables settings = extend( defaults, options || {} ); // Merge user options with defaults - fixedHeader = document.querySelector('[data-scroll-header]'); // Get the fixed header + fixedHeader = root.document.querySelector('[data-scroll-header]'); // Get the fixed header headerHeight = getHeaderHeight( fixedHeader ); // When a toggle is clicked, run the click handler - document.addEventListener('click', eventHandler, false ); + root.document.addEventListener('click', eventHandler, false ); if ( fixedHeader ) { root.addEventListener( 'resize', eventThrottler, false ); } }; diff --git a/dist/js/smooth-scroll.min.js b/dist/js/smooth-scroll.min.js index 01d9d9c..4290904 100755 --- a/dist/js/smooth-scroll.min.js +++ b/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ -/** smooth-scroll v5.3.6, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ -!function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)}(this,function(e){"use strict";var t,n,o,r,a={},u=!!document.querySelector&&!!e.addEventListener,c={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},i=function(e,t,n){if("[object Object]"===Object.prototype.toString.call(e))for(var o in e)Object.prototype.hasOwnProperty.call(e,o)&&t.call(n,e[o],o,e);else for(var r=0,a=e.length;a>r;r++)t.call(n,e[r],r,e)},l=function(e,t){var n={};return i(e,function(t,o){n[o]=e[o]}),i(t,function(e,o){n[o]=t[o]}),n},s=function(e,t){for(var n=t.charAt(0);e&&e!==document;e=e.parentNode)if("."===n){if(e.classList.contains(t.substr(1)))return e}else if("#"===n){if(e.id===t.substr(1))return e}else if("["===n&&e.hasAttribute(t.substr(1,t.length-2)))return e;return!1},f=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},d=function(e){for(var t,n=String(e),o=n.length,r=-1,a="",u=n.charCodeAt(0);++r=1&&31>=t||127==t||0===r&&t>=48&&57>=t||1===r&&t>=48&&57>=t&&45===u?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(r):"\\"+n.charAt(r)}return a},h=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},m=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=o-t-n,o>=0?o:0},p=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},v=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},g=function(t,n){history.pushState&&(n||"true"===n)&&history.pushState(null,null,[e.location.protocol,"//",e.location.host,e.location.pathname,e.location.search,t].join(""))},b=function(e){return null===e?0:f(e)+e.offsetTop};a.animateScroll=function(t,n,a){var u=l(u||c,a||{}),i=v(t?t.getAttribute("data-options"):null);u=l(u,i),n="#"+d(n.substr(1));var s="#"===n?document.documentElement:document.querySelector(n),f=e.pageYOffset;o||(o=document.querySelector("[data-scroll-header]")),r||(r=b(o));var O,y,I,S=m(s,r,parseInt(u.offset,10)),E=S-f,H=p(),A=0;g(n,u.updateURL);var L=function(o,r,a){var c=e.pageYOffset;(o==r||c==r||e.innerHeight+c>=H)&&(clearInterval(a),s.focus(),u.callbackAfter(t,n))},Q=function(){A+=16,y=A/parseInt(u.speed,10),y=y>1?1:y,I=f+E*h(u.easing,y),e.scrollTo(0,Math.floor(I)),L(I,S,O)},C=function(){u.callbackBefore(t,n),O=setInterval(Q,16)};0===e.pageYOffset&&e.scrollTo(0,0),C()};var O=function(e){var n=s(e.target,"[data-scroll]");n&&"a"===n.tagName.toLowerCase()&&(e.preventDefault(),a.animateScroll(n,n.hash,t))},y=function(){n||(n=setTimeout(function(){n=null,r=b(o)},66))};return a.destroy=function(){t&&(document.removeEventListener("click",O,!1),e.removeEventListener("resize",y,!1),t=null,n=null,o=null,r=null)},a.init=function(n){u&&(a.destroy(),t=l(c,n||{}),o=document.querySelector("[data-scroll-header]"),r=b(o),document.addEventListener("click",O,!1),o&&e.addEventListener("resize",y,!1))},a}); \ No newline at end of file +/** smooth-scroll v5.3.7, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ +!function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)}("undefined"!=typeof global?global:this.window||this.global,function(e){"use strict";var t,n,o,r,a={},u=!!e.document.querySelector&&!!e.addEventListener,c={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},i=function(e,t,n){if("[object Object]"===Object.prototype.toString.call(e))for(var o in e)Object.prototype.hasOwnProperty.call(e,o)&&t.call(n,e[o],o,e);else for(var r=0,a=e.length;a>r;r++)t.call(n,e[r],r,e)},l=function(e,t){var n={};return i(e,function(t,o){n[o]=e[o]}),i(t,function(e,o){n[o]=t[o]}),n},s=function(t,n){for(var o=n.charAt(0);t&&t!==e.document;t=t.parentNode)if("."===o){if(t.classList.contains(n.substr(1)))return t}else if("#"===o){if(t.id===n.substr(1))return t}else if("["===o&&t.hasAttribute(n.substr(1,n.length-2)))return t;return!1},f=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},d=function(e){for(var t,n=String(e),o=n.length,r=-1,a="",u=n.charCodeAt(0);++r=1&&31>=t||127==t||0===r&&t>=48&&57>=t||1===r&&t>=48&&57>=t&&45===u?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(r):"\\"+n.charAt(r)}return a},h=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},m=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=o-t-n,o>=0?o:0},p=function(){return Math.max(e.document.body.scrollHeight,e.document.documentElement.scrollHeight,e.document.body.offsetHeight,e.document.documentElement.offsetHeight,e.document.body.clientHeight,e.document.documentElement.clientHeight)},g=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},v=function(t,n){e.history.pushState&&(n||"true"===n)&&e.history.pushState(null,null,[e.location.protocol,"//",e.location.host,e.location.pathname,e.location.search,t].join(""))},b=function(e){return null===e?0:f(e)+e.offsetTop};a.animateScroll=function(t,n,a){var u=l(u||c,a||{}),i=g(t?t.getAttribute("data-options"):null);u=l(u,i),n="#"+d(n.substr(1));var s="#"===n?e.document.documentElement:e.document.querySelector(n),f=e.pageYOffset;o||(o=e.document.querySelector("[data-scroll-header]")),r||(r=b(o));var y,O,I,S=m(s,r,parseInt(u.offset,10)),E=S-f,H=p(),A=0;v(n,u.updateURL);var L=function(o,r,a){var c=e.pageYOffset;(o==r||c==r||e.innerHeight+c>=H)&&(clearInterval(a),s.focus(),u.callbackAfter(t,n))},Q=function(){A+=16,O=A/parseInt(u.speed,10),O=O>1?1:O,I=f+E*h(u.easing,O),e.scrollTo(0,Math.floor(I)),L(I,S,y)},C=function(){u.callbackBefore(t,n),y=setInterval(Q,16)};0===e.pageYOffset&&e.scrollTo(0,0),C()};var y=function(e){var n=s(e.target,"[data-scroll]");n&&"a"===n.tagName.toLowerCase()&&(e.preventDefault(),a.animateScroll(n,n.hash,t))},O=function(){n||(n=setTimeout(function(){n=null,r=b(o)},66))};return a.destroy=function(){t&&(e.document.removeEventListener("click",y,!1),e.removeEventListener("resize",O,!1),t=null,n=null,o=null,r=null)},a.init=function(n){u&&(a.destroy(),t=l(c,n||{}),o=e.document.querySelector("[data-scroll-header]"),r=b(o),e.document.addEventListener("click",y,!1),o&&e.addEventListener("resize",O,!1))},a}); \ No newline at end of file diff --git a/docs/dist/js/smooth-scroll.js b/docs/dist/js/smooth-scroll.js index bf39e5a..c38271b 100755 --- a/docs/dist/js/smooth-scroll.js +++ b/docs/dist/js/smooth-scroll.js @@ -1,5 +1,5 @@ /** - * smooth-scroll v5.3.6 + * smooth-scroll v5.3.7 * Animate scrolling to anchor links, by Chris Ferdinandi. * http://github.com/cferdinandi/smooth-scroll * @@ -15,7 +15,7 @@ } else { root.smoothScroll = factory(root); } -})(this, function (root) { +})(typeof global !== "undefined" ? global : this.window || this.global, function (root) { 'use strict'; @@ -24,7 +24,7 @@ // var smoothScroll = {}; // Object for public APIs - var supports = !!document.querySelector && !!root.addEventListener; // Feature test + var supports = !!root.document.querySelector && !!root.addEventListener; // Feature test var settings, eventTimeout, fixedHeader, headerHeight; // Default settings @@ -89,7 +89,7 @@ */ var getClosest = function (elem, selector) { var firstChar = selector.charAt(0); - for ( ; elem && elem !== document; elem = elem.parentNode ) { + for ( ; elem && elem !== root.document; elem = elem.parentNode ) { if ( firstChar === '.' ) { if ( elem.classList.contains( selector.substr(1) ) ) { return elem; @@ -241,9 +241,9 @@ */ var getDocumentHeight = function () { return Math.max( - document.body.scrollHeight, document.documentElement.scrollHeight, - document.body.offsetHeight, document.documentElement.offsetHeight, - document.body.clientHeight, document.documentElement.clientHeight + root.document.body.scrollHeight, root.document.documentElement.scrollHeight, + root.document.body.offsetHeight, root.document.documentElement.offsetHeight, + root.document.body.clientHeight, root.document.documentElement.clientHeight ); }; @@ -264,8 +264,8 @@ * @param {Boolean} url Whether or not to update the URL history */ var updateUrl = function ( anchor, url ) { - if ( history.pushState && (url || url === 'true') ) { - history.pushState( null, null, [root.location.protocol, '//', root.location.host, root.location.pathname, root.location.search, anchor].join('') ); + if ( root.history.pushState && (url || url === 'true') ) { + root.history.pushState( null, null, [root.location.protocol, '//', root.location.host, root.location.pathname, root.location.search, anchor].join('') ); } }; @@ -289,9 +289,9 @@ anchor = '#' + escapeCharacters(anchor.substr(1)); // Escape special characters and leading numbers // Selectors and variables - var anchorElem = anchor === '#' ? document.documentElement : document.querySelector(anchor); + var anchorElem = anchor === '#' ? root.document.documentElement : root.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 + if ( !fixedHeader ) { fixedHeader = root.document.querySelector('[data-scroll-header]'); } // 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 = getEndLocation( anchorElem, headerHeight, parseInt(settings.offset, 10) ); // Scroll to location var animationInterval; // interval timer @@ -391,7 +391,7 @@ if ( !settings ) return; // Remove event listeners - document.removeEventListener( 'click', eventHandler, false ); + root.document.removeEventListener( 'click', eventHandler, false ); root.removeEventListener( 'resize', eventThrottler, false ); // Reset varaibles @@ -416,11 +416,11 @@ // Selectors and variables settings = extend( defaults, options || {} ); // Merge user options with defaults - fixedHeader = document.querySelector('[data-scroll-header]'); // Get the fixed header + fixedHeader = root.document.querySelector('[data-scroll-header]'); // Get the fixed header headerHeight = getHeaderHeight( fixedHeader ); // When a toggle is clicked, run the click handler - document.addEventListener('click', eventHandler, false ); + root.document.addEventListener('click', eventHandler, false ); if ( fixedHeader ) { root.addEventListener( 'resize', eventThrottler, false ); } }; diff --git a/docs/dist/js/smooth-scroll.min.js b/docs/dist/js/smooth-scroll.min.js index 01d9d9c..4290904 100755 --- a/docs/dist/js/smooth-scroll.min.js +++ b/docs/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ -/** smooth-scroll v5.3.6, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ -!function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)}(this,function(e){"use strict";var t,n,o,r,a={},u=!!document.querySelector&&!!e.addEventListener,c={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},i=function(e,t,n){if("[object Object]"===Object.prototype.toString.call(e))for(var o in e)Object.prototype.hasOwnProperty.call(e,o)&&t.call(n,e[o],o,e);else for(var r=0,a=e.length;a>r;r++)t.call(n,e[r],r,e)},l=function(e,t){var n={};return i(e,function(t,o){n[o]=e[o]}),i(t,function(e,o){n[o]=t[o]}),n},s=function(e,t){for(var n=t.charAt(0);e&&e!==document;e=e.parentNode)if("."===n){if(e.classList.contains(t.substr(1)))return e}else if("#"===n){if(e.id===t.substr(1))return e}else if("["===n&&e.hasAttribute(t.substr(1,t.length-2)))return e;return!1},f=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},d=function(e){for(var t,n=String(e),o=n.length,r=-1,a="",u=n.charCodeAt(0);++r=1&&31>=t||127==t||0===r&&t>=48&&57>=t||1===r&&t>=48&&57>=t&&45===u?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(r):"\\"+n.charAt(r)}return a},h=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},m=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=o-t-n,o>=0?o:0},p=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},v=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},g=function(t,n){history.pushState&&(n||"true"===n)&&history.pushState(null,null,[e.location.protocol,"//",e.location.host,e.location.pathname,e.location.search,t].join(""))},b=function(e){return null===e?0:f(e)+e.offsetTop};a.animateScroll=function(t,n,a){var u=l(u||c,a||{}),i=v(t?t.getAttribute("data-options"):null);u=l(u,i),n="#"+d(n.substr(1));var s="#"===n?document.documentElement:document.querySelector(n),f=e.pageYOffset;o||(o=document.querySelector("[data-scroll-header]")),r||(r=b(o));var O,y,I,S=m(s,r,parseInt(u.offset,10)),E=S-f,H=p(),A=0;g(n,u.updateURL);var L=function(o,r,a){var c=e.pageYOffset;(o==r||c==r||e.innerHeight+c>=H)&&(clearInterval(a),s.focus(),u.callbackAfter(t,n))},Q=function(){A+=16,y=A/parseInt(u.speed,10),y=y>1?1:y,I=f+E*h(u.easing,y),e.scrollTo(0,Math.floor(I)),L(I,S,O)},C=function(){u.callbackBefore(t,n),O=setInterval(Q,16)};0===e.pageYOffset&&e.scrollTo(0,0),C()};var O=function(e){var n=s(e.target,"[data-scroll]");n&&"a"===n.tagName.toLowerCase()&&(e.preventDefault(),a.animateScroll(n,n.hash,t))},y=function(){n||(n=setTimeout(function(){n=null,r=b(o)},66))};return a.destroy=function(){t&&(document.removeEventListener("click",O,!1),e.removeEventListener("resize",y,!1),t=null,n=null,o=null,r=null)},a.init=function(n){u&&(a.destroy(),t=l(c,n||{}),o=document.querySelector("[data-scroll-header]"),r=b(o),document.addEventListener("click",O,!1),o&&e.addEventListener("resize",y,!1))},a}); \ No newline at end of file +/** smooth-scroll v5.3.7, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ +!function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)}("undefined"!=typeof global?global:this.window||this.global,function(e){"use strict";var t,n,o,r,a={},u=!!e.document.querySelector&&!!e.addEventListener,c={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},i=function(e,t,n){if("[object Object]"===Object.prototype.toString.call(e))for(var o in e)Object.prototype.hasOwnProperty.call(e,o)&&t.call(n,e[o],o,e);else for(var r=0,a=e.length;a>r;r++)t.call(n,e[r],r,e)},l=function(e,t){var n={};return i(e,function(t,o){n[o]=e[o]}),i(t,function(e,o){n[o]=t[o]}),n},s=function(t,n){for(var o=n.charAt(0);t&&t!==e.document;t=t.parentNode)if("."===o){if(t.classList.contains(n.substr(1)))return t}else if("#"===o){if(t.id===n.substr(1))return t}else if("["===o&&t.hasAttribute(n.substr(1,n.length-2)))return t;return!1},f=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},d=function(e){for(var t,n=String(e),o=n.length,r=-1,a="",u=n.charCodeAt(0);++r=1&&31>=t||127==t||0===r&&t>=48&&57>=t||1===r&&t>=48&&57>=t&&45===u?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(r):"\\"+n.charAt(r)}return a},h=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},m=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=o-t-n,o>=0?o:0},p=function(){return Math.max(e.document.body.scrollHeight,e.document.documentElement.scrollHeight,e.document.body.offsetHeight,e.document.documentElement.offsetHeight,e.document.body.clientHeight,e.document.documentElement.clientHeight)},g=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},v=function(t,n){e.history.pushState&&(n||"true"===n)&&e.history.pushState(null,null,[e.location.protocol,"//",e.location.host,e.location.pathname,e.location.search,t].join(""))},b=function(e){return null===e?0:f(e)+e.offsetTop};a.animateScroll=function(t,n,a){var u=l(u||c,a||{}),i=g(t?t.getAttribute("data-options"):null);u=l(u,i),n="#"+d(n.substr(1));var s="#"===n?e.document.documentElement:e.document.querySelector(n),f=e.pageYOffset;o||(o=e.document.querySelector("[data-scroll-header]")),r||(r=b(o));var y,O,I,S=m(s,r,parseInt(u.offset,10)),E=S-f,H=p(),A=0;v(n,u.updateURL);var L=function(o,r,a){var c=e.pageYOffset;(o==r||c==r||e.innerHeight+c>=H)&&(clearInterval(a),s.focus(),u.callbackAfter(t,n))},Q=function(){A+=16,O=A/parseInt(u.speed,10),O=O>1?1:O,I=f+E*h(u.easing,O),e.scrollTo(0,Math.floor(I)),L(I,S,y)},C=function(){u.callbackBefore(t,n),y=setInterval(Q,16)};0===e.pageYOffset&&e.scrollTo(0,0),C()};var y=function(e){var n=s(e.target,"[data-scroll]");n&&"a"===n.tagName.toLowerCase()&&(e.preventDefault(),a.animateScroll(n,n.hash,t))},O=function(){n||(n=setTimeout(function(){n=null,r=b(o)},66))};return a.destroy=function(){t&&(e.document.removeEventListener("click",y,!1),e.removeEventListener("resize",O,!1),t=null,n=null,o=null,r=null)},a.init=function(n){u&&(a.destroy(),t=l(c,n||{}),o=e.document.querySelector("[data-scroll-header]"),r=b(o),e.document.addEventListener("click",y,!1),o&&e.addEventListener("resize",O,!1))},a}); \ No newline at end of file diff --git a/package.json b/package.json index 07eecd0..95c1262 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "smooth-scroll", - "version": "5.3.6", + "version": "5.3.7", "description": "Animate scrolling to anchor links", "main": "./dist/js/smooth-scroll.js", "author": { From 2c367e3571686981bda56d65e9a22fe1b6a42405 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Thu, 14 May 2015 23:50:13 -0400 Subject: [PATCH 138/285] Updated readme --- README.md | 160 +----------------------------------------------------- 1 file changed, 1 insertion(+), 159 deletions(-) diff --git a/README.md b/README.md index 45aa788..8155151 100755 --- a/README.md +++ b/README.md @@ -14,8 +14,7 @@ A lightweight script to animate scrolling to anchor links. Smooth Scroll works g 7. [Contributors](#contributors) 8. [How to Contribute](#how-to-contribute) 9. [License](#license) -10. [Changelog](#changelog) -11. [Older Docs](#older-docs) +10. [Older Docs](#older-docs) @@ -251,163 +250,6 @@ Smooth Scroll is licensed under the [MIT License](http://gomakethings.com/mit/). -## Changelog - -Smooth Scroll uses [semantic versioning](http://semver.org/). - -* v5.3.7 - May 12, 2015 - * Fixed `this` and `root` bug with Browserify. -* v5.3.6 - March 9, 2015 - * REALLY fixed UMD wrapper. -* v5.3.5 - March 7, 2015 - * Fixed UMD wrapper. -* v5.3.4 - March 6, 2015 - * Fixed `headerHeight` error with fixed headers. (https://github.com/cferdinandi/smooth-scroll/issues/149) -* 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 node height more accurately. -* v5.3.1 - December 20, 2014 - * Cache header height for better performance. -* v5.3.0 - December 20, 2014 - * Now supports scrolling to the top with an empty hash (#). -* v5.2.2 - December 13, 2014 - * Updating URL now accounts for query strings. -* v5.2.1 - December 13, 2014 - * Added unit tests. -* v5.2.0 - November 21, 2014 - * Add focus to scrolled to anchor if focusable. -* v5.1.4 - October 18, 2014 - * Removed `.bind` dependency and polyfill. - * Updated `gulpfile.js` tasks and namespacing. -* v5.1.3 - September 29, 2014 - * Fixed CommonJS module bug. -* v5.1.2 - August 31, 2014 - * Fixed event listener filter to account for sub elements. - * Removed unused `event` argument from `animateScroll` -* v5.1.1 - August 21, 2014 - * Passed in `event` variable to `eventHandler` method, fixing Firefox bug. -* v5.1.0 - August 18, 2014 - * Added `destroy` method. - * Converted to event bubbling approach for better performance. - * Switched to Ruby Sass. -* v5.0.4 - August 15, 2014 - * Added fix for UMD structure. -* v5.0.3 - August 13, 2014 - * Replaced character escaping method with [`CSS.escape`](https://github.com/mathiasbynens/CSS.escape) for more robust character escaping. -* v5.0.2 - August 12, 2014 - * Added character escaping when first character in anchor ID is a number. -* v5.0.1 - August 8, 2014 - * Added polyfill for `Functions.prototype.bind`. - * Removed Sass paths from `gulpfile.js`. -* v5.0.0 - July 21, 2014 - * Updated `data-options` functionality to JSON. - * Fixed update URL bug. - * Set update URL to `true` by default. -* v4.8.2 - June 28, 2014 - * Fixed `extend()` method. -* v4.8.1 - June 27, 2014 - * Fixed problem with `toggles` containing a URL before the fragment identifier -* v4.8.0 - June 21, 2014 - * Converted to gulp.js workflow. - * Added unit testing. - * Added minified versions of files. -* v4.7.2 - June 19, 2014 - * Fixed typo that broke scroll. -* v4.7.1 - June 19, 2014 - * Fixed factory/root/UMD definition. -* v4.7.0 - June 7, 2014 - * Added AMD support. - * Moved public APIs to `exports` variable. - * Improved feature test. - * Replaced `Array.prototype.forEach` hack with proper `forEach` function. - * Added a more well supported `trim` function. - * General code optimizations for better minification and performance. - * Updated to JSDoc documentation (sort of). - * Updated to three number versioning system. - * Added package manager installation info. -* v4.6 - March 21, 2014 - * [Fixed scroll-to-top bug for links at the bottom of the page](https://github.com/cferdinandi/smooth-scroll/issues/49). -* v4.5 - March 20, 2014 - * Added `offset` to `options` -* v4.4 - March 15, 2014 - * [Fixed iOS scroll-to-top bug](https://github.com/cferdinandi/smooth-scroll/issues/45). -* v4.3 - March 5, 2014 - * Added arguments to callback functions for greater versatility. [44](https://github.com/cferdinandi/smooth-scroll/pull/44) -* v4.2 - February 27, 2014 - * Fixed error for null `toggle` argument in `animateScroll` function ([43](https://github.com/cferdinandi/smooth-scroll/issues/43)). -* v4.1 - February 27, 2014 - * Converted `_defaults` to a literal object -* v4.0 - February 21, 2014 - * Better public/private method namespacing. - * Require `init()` call to run. - * New API exposes additional methods for use in your own scripts. - * Better documentation. -* v3.3 - February 19, 2014 - * [Add `offsettTop` to `offsetHeigh`t for `scrollHeader`. Allows for multiple fixed headers, or a fixed header that sits slightly below the top of the page.](https://github.com/cferdinandi/smooth-scroll/pull/36) -* v3.2 - February 10, 2014 - * [Fixes iOS infinite loop](https://github.com/cferdinandi/smooth-scroll/pull/35) and [Chrome browser zoom](https://github.com/cferdinandi/smooth-scroll/issues/31) bugs. -* v3.1 - February 4, 2014 - * Reverted to `Array.protype.foreach` loops. -* v3.0 - January 28, 2014 - * Switched to a data attribute for the toggle selector. - * Added namespacing to IIFE. - * Updated looping method and event listener. -* v2.19 - January 23, 2014 - * [Fix back button behavior in Chrome.](https://github.com/cferdinandi/smooth-scroll/issues/26#issuecomment-33172325) -* v2.18 - January 23, 2014 - * [Update URL before animation.](https://github.com/cferdinandi/smooth-scroll/pull/27) - * [Fix back button behavior in Firefox.](https://github.com/cferdinandi/smooth-scroll/issues/26) -* v2.17 - January 17, 2014 - * [Fixed back button behavior when using `data-url` feature.](https://github.com/cferdinandi/smooth-scroll/pull/18) -* v2.16 - January 16, 2014 - * [Updated variables for more accurate easing math when scrolling to top of page.](https://github.com/cferdinandi/smooth-scroll/pull/25#issuecomment-32566729) -* v2.15 - January 16, 2014 - * [Fixed bug that caused "scroll-to-top" animation to create endless loop.](https://github.com/cferdinandi/smooth-scroll/issues/24) -* v2.14 - January 15, 2014 - * [Fixed bug that caused animation to stop several pixels short.](https://github.com/cferdinandi/smooth-scroll/pull/15#issuecomment-32380770) -* v2.12 - January 7, 2014 - * [Added fixed header support.](https://github.com/cferdinandi/smooth-scroll/pull/20#issuecomment-31773547) -* v2.11 - January 4, 2014 - * [Change `offsetHeight` to `scrollHeight` to fix fixed/absolute positioning issues.](https://github.com/cferdinandi/smooth-scroll/pull/14) -* v2.10 - December 31, 2013 - * [Added URL history support.](https://github.com/cferdinandi/smooth-scroll/pull/17) -* v2.9 - December 9, 2013 - * [Added fixed for infinite loop when scrolling up.](https://github.com/cferdinandi/smooth-scroll/issues/13) -* v2.8 - December 3, 2013 - * [Fixed false distance reading.](https://github.com/cferdinandi/smooth-scroll/issues/11) - * Added linear easing as fallback when easing pattern not recognized to prevent script from failing. -* v2.7 - November 25, 2013 - * Converted naming conventions back to mathmatical roots (ex. `easeInCubic`) to remain consistent with development community language. -* v2.6 - November 26, 2013 - * Missing character was causing certain easing functions to break. -* v2.5 - November 22, 2013 - * Changed the default easing to `easeInOutNormal`. -* v2.4 - November 21, 2013 - * Added easing support with contributions from [Willem Liu](https://github.com/willemliu) and code from [Gaëtan Renaudeau](https://gist.github.com/gre/1650294). -* v2.3 - August 27, 2013 - * Added missing semicolons. - * Defined `animationStop` variable once, add values later. - * Activated strict mode. - * Wrapped in IIFE. -* v2.2 - August 17, 2013 - * Now you can set the animation speed with the `data-speed` attribute. (ex. `data-speed="400"`) -* v2.1 - August 17, 2013 - * Improvement animation function interval for smoother animation. - * Updated to allow for scrolling up the page. -* v2.0 - August 14, 2013 - * Converted to vanilla JavaScript. - * Removed dependency on jQuery. -* v1.1 - June 7, 2013 - * Switched to MIT license. -* v1.1 - May 18, 2013 - * Added jQuery noConflict mode. - * Updated tutorial. -* v1.0 - January 24, 2013 - * Initial release. - - - ## Older Docs * [Version 3](http://cferdinandi.github.io/smooth-scroll/archive/v3/) From c943ca1753427ab627f40798bf5b2bd0267cdade Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Mon, 18 May 2015 14:28:09 -0400 Subject: [PATCH 139/285] Updated readme --- LICENSE.md | 21 ++++++++++++++++++ README.md | 62 +++++++++++++++++++++++------------------------------- 2 files changed, 47 insertions(+), 36 deletions(-) create mode 100755 LICENSE.md diff --git a/LICENSE.md b/LICENSE.md new file mode 100755 index 0000000..b5e8ef7 --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,21 @@ +# The MIT License (MIT) + +Copyright (c) Go Make Things, LLC + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/README.md b/README.md index 8155151..54849fd 100755 --- a/README.md +++ b/README.md @@ -11,10 +11,8 @@ A lightweight script to animate scrolling to anchor links. Smooth Scroll works g 4. [Options & Settings](#options-and-settings) 5. [Browser Compatibility](#browser-compatibility) 6. [Known Issues](#known-issues) -7. [Contributors](#contributors) -8. [How to Contribute](#how-to-contribute) -9. [License](#license) -10. [Older Docs](#older-docs) +7. [How to Contribute](#how-to-contribute) +8. [License](#license) @@ -145,11 +143,11 @@ Smooth Scroll also lets you override global settings on a link-by-link basis usi ```html Anchor Link @@ -204,6 +202,24 @@ Add a `[data-scroll-header]` data attribute to fixed headers. Smooth Scroll will ``` +### Animating links to other pages + +Smooth Scroll does not include an option to animate scrolling to links on other pages, but you can easily add this functionality using the API. + +1. Do *not* add the `data-scroll` attribute to links to other pages. Treat them like normal links, and include your anchor link hash as normal. + ```markup + + ``` +2. Add the following script to the footer of your page, after the `smoothScroll.init()` function. + ```markup + + ``` + ## Browser Compatibility @@ -219,26 +235,6 @@ If the `` element has been assigned a height of `100%`, Smooth Scroll is u -## Contributors - -* Easing support contributed by [Willem Liu](https://github.com/willemliu). -* Easing functions forked from [Gaëtan Renaudeau](https://gist.github.com/gre/1650294). -* URL history support contributed by [Robert Pate](https://github.com/robertpateii). -* Fixed header support contributed by [Arndt von Lucadou](https://github.com/a-v-l). -* Infinite loop bugs in iOS and Chrome (when zoomed) by [Alex Guzman](https://github.com/alexguzman). -* IE10 rounding error fixed by [Luke Siedle](https://github.com/luke-siedle). -* Enhanced callback functions by [Constant Meiring](https://github.com/constantm). -* Scroll-to-top bug for links at the bottom of the page by [Jonas Havers](https://github.com/JonasHavers). -* AMD support and numerous code improvements by [Todd Motto](https://github.com/toddmotto). -* Push State bug fix by [Yanick Witschi](https://github.com/Toflar). -* CommonJS module support by [Riku Rouvila](https://github.com/rikukissa). -* Query string fix when updating URL by [Qu Yatong](https://github.com/quyatong). -* Scroll to top support by [Robbert Broersma](https://github.com/robbert). -* Unit tests by [Thibaud Colas](https://github.com/ThibWeb). -* Browserify support by [Alexander Beletsky](https://github.com/alexbeletsky). - - - ## How to Contribute In lieu of a formal style guide, take care to maintain the existing coding style. Don't forget to update the version number, the changelog (in the `readme.md` file), and when applicable, the documentation. @@ -246,11 +242,5 @@ In lieu of a formal style guide, take care to maintain the existing coding style ## License -Smooth Scroll is licensed under the [MIT License](http://gomakethings.com/mit/). - - - -## Older Docs -* [Version 3](http://cferdinandi.github.io/smooth-scroll/archive/v3/) -* [Version 1](https://github.com/cferdinandi/smooth-scroll/tree/archive-v1) \ No newline at end of file +The code is available under the [MIT License](LICENSE.md). \ No newline at end of file From dc591b2d755b4ccfaf0caa54bce9508735d83234 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Wed, 1 Jul 2015 22:09:53 -0400 Subject: [PATCH 140/285] Updated readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 54849fd..5dab460 100755 --- a/README.md +++ b/README.md @@ -237,7 +237,7 @@ If the `` element has been assigned a height of `100%`, Smooth Scroll is u ## How to Contribute -In lieu of a formal style guide, take care to maintain the existing coding style. Don't forget to update the version number, the changelog (in the `readme.md` file), and when applicable, the documentation. +In lieu of a formal style guide, take care to maintain the existing coding style. Please apply fixes to both the development and production code. Don't forget to update the version number, and when applicable, the documentation. From ab2ff6720f9c4f334dd2a8739a69823fc1dad7ea Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Thu, 2 Jul 2015 20:44:00 -0400 Subject: [PATCH 141/285] v6.0.0 Added Buoy.js. --- README.md | 23 +- dist/js/buoy.js | 337 ++++++++++++++++++++++++++++++ dist/js/buoy.min.js | 2 + dist/js/smooth-scroll.js | 94 +-------- dist/js/smooth-scroll.min.js | 4 +- docs/dist/js/buoy.js | 337 ++++++++++++++++++++++++++++++ docs/dist/js/buoy.min.js | 2 + docs/dist/js/smooth-scroll.js | 94 +-------- docs/dist/js/smooth-scroll.min.js | 4 +- gulpfile.js | 8 +- package.json | 54 ++--- src/js/buoy.js | 328 +++++++++++++++++++++++++++++ src/js/smooth-scroll.js | 92 +------- 13 files changed, 1087 insertions(+), 292 deletions(-) create mode 100755 dist/js/buoy.js create mode 100755 dist/js/buoy.min.js create mode 100755 docs/dist/js/buoy.js create mode 100755 docs/dist/js/buoy.min.js create mode 100755 src/js/buoy.js diff --git a/README.md b/README.md index 5dab460..0af370d 100755 --- a/README.md +++ b/README.md @@ -23,9 +23,12 @@ Compiled and production-ready code can be found in the `dist` directory. The `sr ### 1. Include Smooth Scroll on your site. ```html + ``` +Smooth Scroll requires [Buoy](https://github.com/cferdinandi/buoy), a lightweight collection of helper methods for getting stuff done with native JavaScript. + ### 2. Add the markup to your HTML. ```html @@ -66,7 +69,6 @@ If you would prefer, you can work with the development code in the `src` directo Make sure these are installed first. * [Node.js](http://nodejs.org) -* [Ruby Sass](http://sass-lang.com/install) * [Gulp](http://gulpjs.com) `sudo npm install -g gulp` ### Quick Start @@ -75,8 +77,7 @@ Make sure these are installed first. 2. Run `npm install` to install required files. 3. When it's done installing, run one of the task runners to get going: * `gulp` manually compiles files. - * `gulp watch` automatically compiles files when changes are made. - * `gulp reload` automatically compiles files and applies changes using [LiveReload](http://livereload.com/). + * `gulp watch` automatically compiles files when changes are made and applies changes using [LiveReload](http://livereload.com/). @@ -235,6 +236,22 @@ If the `` element has been assigned a height of `100%`, Smooth Scroll is u +## Adding `[data-scroll]` attributes to the `wp_nav_menu()` in WordPress + +Add this to your `functions.php` file: + +```js +function YOURPREFIX_custom_nav_attributes ( $atts, $item, $args ) { + $atts['data-scroll'] = 'true'; + return $atts; +} +add_filter( 'nav_menu_link_attributes', 'YOURPREFIX_custom_nav_attributes', 10, 3 ); +``` + +**Source:** http://wordpress.stackexchange.com/questions/121123/how-to-add-a-data-attribute-to-a-wordpress-menu-item + + + ## How to Contribute In lieu of a formal style guide, take care to maintain the existing coding style. Please apply fixes to both the development and production code. Don't forget to update the version number, and when applicable, the documentation. diff --git a/dist/js/buoy.js b/dist/js/buoy.js new file mode 100755 index 0000000..8a71d67 --- /dev/null +++ b/dist/js/buoy.js @@ -0,0 +1,337 @@ +/** + * smooth-scroll v6.0.0 + * Animate scrolling to anchor links, by Chris Ferdinandi. + * http://github.com/cferdinandi/smooth-scroll + * + * Free to use under the MIT License. + * http://gomakethings.com/mit/ + */ + +(function (root, factory) { + if ( typeof define === 'function' && define.amd ) { + define([], factory(root)); + } else if ( typeof exports === 'object' ) { + module.exports = factory(root); + } else { + root.buoy = factory(root); + } +})(typeof global !== 'undefined' ? global : this.window || this.global, function (root) { + + 'use strict'; + + // Object for public APIs + var buoy = {}; + + + // + // Methods + // + + /** + * Wait until the DOM is ready before executing code + * @param {Function} fn The function to execute when the DOM is ready + */ + buoy.ready = function ( fn ) { + + // Sanity check + if ( typeof fn !== 'function' ) return; + + // If document is already loaded, run method + if ( document.readyState === 'complete' ) { + return fn(); + } + + // Otherwise, wait until document is loaded + document.addEventListener( 'DOMContentLoaded', fn, false ); + + }; + + /** + * A simple forEach() implementation for Arrays, Objects and NodeLists. + * @author Todd Motto + * @link https://github.com/toddmotto/foreach + * @param {Array|Object|NodeList} collection Collection of items to iterate + * @param {Function} callback Callback function for each iteration + * @param {Array|Object|NodeList} scope Object/NodeList/Array that forEach is iterating over (aka `this`) + */ + buoy.forEach = function ( collection, callback, scope ) { + if ( Object.prototype.toString.call( collection ) === '[object Object]' ) { + for ( var prop in collection ) { + if ( Object.prototype.hasOwnProperty.call( collection, prop ) ) { + callback.call( scope, collection[prop], prop, collection ); + } + } + } else { + for ( var i = 0, len = collection.length; i < len; i++ ) { + callback.call( scope, collection[i], i, collection ); + } + } + }; + + /** + * Merge two or more objects. Returns a new object. + * @param {Boolean} deep If true, do a deep (or recursive) merge [optional] + * @param {Object} objects The objects to merge together + * @returns {Object} Merged values of defaults and options + */ + buoy.extend = function () { + + // Variables + var extended = {}; + var deep = false; + var i = 0; + var length = arguments.length; + + // Check if a deep merge + if ( Object.prototype.toString.call( arguments[0] ) === '[object Boolean]' ) { + deep = arguments[0]; + i++; + } + + // Merge the object into the extended object + var merge = function (obj) { + for ( var prop in obj ) { + if ( Object.prototype.hasOwnProperty.call( obj, prop ) ) { + // If deep merge and property is an object, merge properties + if ( deep && Object.prototype.toString.call(obj[prop]) === '[object Object]' ) { + extended[prop] = buoy.extend( true, extended[prop], obj[prop] ); + } else { + extended[prop] = obj[prop]; + } + } + } + }; + + // Loop through each object and conduct a merge + for ( ; i < length; i++ ) { + var obj = arguments[i]; + merge(obj); + } + + return extended; + + }; + + /** + * Get the height of an element. + * @param {Node} elem The element to get the height of + * @return {Number} The element's height in pixels + */ + buoy.getHeight = function ( elem ) { + return Math.max( elem.scrollHeight, elem.offsetHeight, elem.clientHeight ); + }; + + /** + * Get an element's distance from the top of the Document. + * @param {Node} elem The element + * @return {Number} Distance from the top in pixels + */ + buoy.getOffsetTop = function ( elem ) { + var location = 0; + if (elem.offsetParent) { + do { + location += elem.offsetTop; + elem = elem.offsetParent; + } while (elem); + } + return location >= 0 ? location : 0; + }; + + /** + * Get the closest matching element up the DOM tree. + * @param {Element} elem Starting element + * @param {String} selector Selector to match against (class, ID, data attribute, or tag) + * @return {Boolean|Element} Returns null if not match found + */ + buoy.getClosest = function ( elem, selector ) { + + // Variables + var firstChar = selector.charAt(0); + var supports = 'classList' in document.documentElement; + var attribute, value; + + // If selector is a data attribute, split attribute from value + if ( firstChar === '[' ) { + selector = selector.substr(1, selector.length - 2); + attribute = selector.split( '=' ); + + if ( attribute.length > 1 ) { + value = true; + attribute[1] = attribute[1].replace( /"/g, '' ).replace( /'/g, '' ); + } + } + + // Get closest match + for ( ; elem && elem !== document; elem = elem.parentNode ) { + + // If selector is a class + if ( firstChar === '.' ) { + if ( supports ) { + if ( elem.classList.contains( selector.substr(1) ) ) { + return elem; + } + } else { + if ( new RegExp('(^|\\s)' + selector.substr(1) + '(\\s|$)').test( elem.className ) ) { + return elem; + } + } + } + + // If selector is an ID + if ( firstChar === '#' ) { + if ( elem.id === selector.substr(1) ) { + return elem; + } + } + + // If selector is a data attribute + if ( firstChar === '[' ) { + if ( elem.hasAttribute( attribute[0] ) ) { + if ( value ) { + if ( elem.getAttribute( attribute[0] ) === attribute[1] ) { + return elem; + } + } else { + return elem; + } + } + } + + // If selector is a tag + if ( elem.tagName.toLowerCase() === selector ) { + return elem; + } + + } + + return null; + + }; + + /** + * Get an element's parents. + * @param {Node} elem The element + * @param {String} selector Selector to match against (class, ID, data attribute, or tag) + * @return {Array} An array of matching nodes + */ + buoy.getParents = function ( elem, selector ) { + + // Variables + var parents = []; + var supports = 'classList' in document.documentElement; + var firstChar, attribute, value; + + // If selector is a data attribute, split attribute from value + if ( selector ) { + firstChar = selector.charAt(0); + if ( firstChar === '[' ) { + selector = selector.substr(1, selector.length - 2); + attribute = selector.split( '=' ); + + if ( attribute.length > 1 ) { + value = true; + attribute[1] = attribute[1].replace( /"/g, '' ).replace( /'/g, '' ); + } + } + } + + // Get matches + for ( ; elem && elem !== document; elem = elem.parentNode ) { + if ( selector ) { + + // If selector is a class + if ( firstChar === '.' ) { + if ( supports ) { + if ( elem.classList.contains( selector.substr(1) ) ) { + parents.push( elem ); + } + } else { + if ( new RegExp('(^|\\s)' + selector.substr(1) + '(\\s|$)').test( elem.className ) ) { + parents.push( elem ); + } + } + } + + // If selector is an ID + if ( firstChar === '#' ) { + if ( elem.id === selector.substr(1) ) { + parents.push( elem ); + } + } + + // If selector is a data attribute + if ( firstChar === '[' ) { + if ( elem.hasAttribute( attribute[0] ) ) { + if ( value ) { + if ( elem.getAttribute( attribute[0] ) === attribute[1] ) { + parents.push( elem ); + } + } else { + parents.push( elem ); + } + } + } + + // If selector is a tag + if ( elem.tagName.toLowerCase() === selector ) { + parents.push( elem ); + } + + } else { + parents.push( elem ); + } + + } + + // Return parents if any exist + if ( parents.length === 0 ) { + return null; + } else { + return parents; + } + + }; + + /** + * Get an element's siblings. + * @param {Node} elem The element + * @return {Array} An array of sibling nodes + */ + buoy.getSiblings = function ( elem ) { + + // Variables + var siblings = []; + var sibling = elem.parentNode.firstChild; + + // Loop through all sibling nodes + for ( ; sibling; sibling = sibling.nextSibling ) { + if ( sibling.nodeType === 1 && sibling !== elem ) { + siblings.push( sibling ); + } + } + + return siblings; + + }; + + /** + * Get data from a URL query string. + * @param {String} field The field to get from the URL + * @param {String} url The URL to parse + * @return {String} The field value + */ + buoy.getQueryString = function ( field, url ) { + var href = url ? url : window.location.href; + var reg = new RegExp( '[?&]' + field + '=([^&#]*)', 'i' ); + var string = reg.exec(href); + return string ? string[1] : null; + }; + + + // + // Public APIs + // + + return buoy; + +}); \ No newline at end of file diff --git a/dist/js/buoy.min.js b/dist/js/buoy.min.js new file mode 100755 index 0000000..4b5b6e3 --- /dev/null +++ b/dist/js/buoy.min.js @@ -0,0 +1,2 @@ +/** smooth-scroll v6.0.0, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ +!function(t,e){"function"==typeof define&&define.amd?define([],e(t)):"object"==typeof exports?module.exports=e(t):t.buoy=e(t)}("undefined"!=typeof global?global:this.window||this.global,function(t){"use strict";var e={};return e.ready=function(t){return"function"==typeof t?"complete"===document.readyState?t():void document.addEventListener("DOMContentLoaded",t,!1):void 0},e.forEach=function(t,e,n){if("[object Object]"===Object.prototype.toString.call(t))for(var r in t)Object.prototype.hasOwnProperty.call(t,r)&&e.call(n,t[r],r,t);else for(var o=0,s=t.length;s>o;o++)e.call(n,t[o],o,t)},e.extend=function(){var t={},n=!1,r=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(n=arguments[0],r++);for(var s=function(r){for(var o in r)Object.prototype.hasOwnProperty.call(r,o)&&(t[o]=n&&"[object Object]"===Object.prototype.toString.call(r[o])?e.extend(!0,t[o],r[o]):r[o])};o>r;r++){var i=arguments[r];s(i)}return t},e.getHeight=function(t){return Math.max(t.scrollHeight,t.offsetHeight,t.clientHeight)},e.getOffsetTop=function(t){var e=0;if(t.offsetParent)do e+=t.offsetTop,t=t.offsetParent;while(t);return e>=0?e:0},e.getClosest=function(t,e){var n,r,o=e.charAt(0),s="classList"in document.documentElement;for("["===o&&(e=e.substr(1,e.length-2),n=e.split("="),n.length>1&&(r=!0,n[1]=n[1].replace(/"/g,"").replace(/'/g,"")));t&&t!==document;t=t.parentNode){if("."===o)if(s){if(t.classList.contains(e.substr(1)))return t}else if(new RegExp("(^|\\s)"+e.substr(1)+"(\\s|$)").test(t.className))return t;if("#"===o&&t.id===e.substr(1))return t;if("["===o&&t.hasAttribute(n[0])){if(!r)return t;if(t.getAttribute(n[0])===n[1])return t}if(t.tagName.toLowerCase()===e)return t}return null},e.getParents=function(t,e){var n,r,o,s=[],i="classList"in document.documentElement;for(e&&(n=e.charAt(0),"["===n&&(e=e.substr(1,e.length-2),r=e.split("="),r.length>1&&(o=!0,r[1]=r[1].replace(/"/g,"").replace(/'/g,""))));t&&t!==document;t=t.parentNode)e?("."===n&&(i?t.classList.contains(e.substr(1))&&s.push(t):new RegExp("(^|\\s)"+e.substr(1)+"(\\s|$)").test(t.className)&&s.push(t)),"#"===n&&t.id===e.substr(1)&&s.push(t),"["===n&&t.hasAttribute(r[0])&&(o?t.getAttribute(r[0])===r[1]&&s.push(t):s.push(t)),t.tagName.toLowerCase()===e&&s.push(t)):s.push(t);return 0===s.length?null:s},e.getSiblings=function(t){for(var e=[],n=t.parentNode.firstChild;n;n=n.nextSibling)1===n.nodeType&&n!==t&&e.push(n);return e},e.getQueryString=function(t,e){var n=e?e:window.location.href,r=new RegExp("[?&]"+t+"=([^&#]*)","i"),o=r.exec(n);return o?o[1]:null},e}); \ No newline at end of file diff --git a/dist/js/smooth-scroll.js b/dist/js/smooth-scroll.js index c38271b..84028d1 100755 --- a/dist/js/smooth-scroll.js +++ b/dist/js/smooth-scroll.js @@ -1,5 +1,5 @@ /** - * smooth-scroll v5.3.7 + * smooth-scroll v6.0.0 * Animate scrolling to anchor links, by Chris Ferdinandi. * http://github.com/cferdinandi/smooth-scroll * @@ -9,13 +9,13 @@ (function (root, factory) { if ( typeof define === 'function' && define.amd ) { - define([], factory(root)); + define(['buoy'], factory(root)); } else if ( typeof exports === 'object' ) { - module.exports = factory(root); + module.exports = factory(root, require('buoy')); } else { - root.smoothScroll = factory(root); + root.smoothScroll = factory(root, root.buoy); } -})(typeof global !== "undefined" ? global : this.window || this.global, function (root) { +})(typeof global !== 'undefined' ? global : this.window || this.global, function (root) { 'use strict'; @@ -42,81 +42,6 @@ // Methods // - /** - * A simple forEach() implementation for Arrays, Objects and NodeLists - * @private - * @param {Array|Object|NodeList} collection Collection of items to iterate - * @param {Function} callback Callback function for each iteration - * @param {Array|Object|NodeList} scope Object/NodeList/Array that forEach is iterating over (aka `this`) - */ - var forEach = function (collection, callback, scope) { - if (Object.prototype.toString.call(collection) === '[object Object]') { - for (var prop in collection) { - if (Object.prototype.hasOwnProperty.call(collection, prop)) { - callback.call(scope, collection[prop], prop, collection); - } - } - } else { - for (var i = 0, len = collection.length; i < len; i++) { - callback.call(scope, collection[i], i, collection); - } - } - }; - - /** - * Merge defaults with user options - * @private - * @param {Object} defaults Default settings - * @param {Object} options User options - * @returns {Object} Merged values of defaults and options - */ - var extend = function ( defaults, options ) { - var extended = {}; - forEach(defaults, function (value, prop) { - extended[prop] = defaults[prop]; - }); - forEach(options, function (value, prop) { - extended[prop] = options[prop]; - }); - return extended; - }; - - /** - * Get the closest matching element up the DOM tree - * @param {Element} elem Starting element - * @param {String} selector Selector to match against (class, ID, or data attribute) - * @return {Boolean|Element} Returns false if not match found - */ - var getClosest = function (elem, selector) { - var firstChar = selector.charAt(0); - for ( ; elem && elem !== root.document; elem = elem.parentNode ) { - if ( firstChar === '.' ) { - if ( elem.classList.contains( selector.substr(1) ) ) { - return elem; - } - } else if ( firstChar === '#' ) { - if ( elem.id === selector.substr(1) ) { - return elem; - } - } else if ( firstChar === '[' ) { - if ( elem.hasAttribute( selector.substr(1, selector.length - 2) ) ) { - return elem; - } - } - } - return false; - }; - - /** - * Get the height of an element - * @private - * @param {Node]} elem The element - * @return {Number} The element's height - */ - var getHeight = function (elem) { - return Math.max( elem.scrollHeight, elem.offsetHeight, elem.clientHeight ); - }; - /** * Escape special characters for use with querySelector * @private @@ -270,7 +195,7 @@ }; var getHeaderHeight = function ( header ) { - return header === null ? 0 : ( getHeight( header ) + header.offsetTop ); + return header === null ? 0 : ( buoy.getHeight( header ) + header.offsetTop ); }; /** @@ -283,9 +208,8 @@ smoothScroll.animateScroll = function ( toggle, anchor, options ) { // Options and overrides - var settings = extend( settings || defaults, options || {} ); // Merge user options with defaults var overrides = getDataOptions( toggle ? toggle.getAttribute('data-options') : null ); - settings = extend( settings, overrides ); + var settings = buoy.extend( settings || defaults, options || {}, overrides ); // Merge user options with defaults anchor = '#' + escapeCharacters(anchor.substr(1)); // Escape special characters and leading numbers // Selectors and variables @@ -359,7 +283,7 @@ * @private */ var eventHandler = function (event) { - var toggle = getClosest(event.target, '[data-scroll]'); + var toggle = buoy.getClosest(event.target, '[data-scroll]'); if ( toggle && toggle.tagName.toLowerCase() === 'a' ) { event.preventDefault(); // Prevent default click event smoothScroll.animateScroll( toggle, toggle.hash, settings); // Animate scroll @@ -415,7 +339,7 @@ smoothScroll.destroy(); // Selectors and variables - settings = extend( defaults, options || {} ); // Merge user options with defaults + settings = buoy.extend( defaults, options || {} ); // Merge user options with defaults fixedHeader = root.document.querySelector('[data-scroll-header]'); // Get the fixed header headerHeight = getHeaderHeight( fixedHeader ); diff --git a/dist/js/smooth-scroll.min.js b/dist/js/smooth-scroll.min.js index 4290904..f0f2d0e 100755 --- a/dist/js/smooth-scroll.min.js +++ b/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ -/** smooth-scroll v5.3.7, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ -!function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)}("undefined"!=typeof global?global:this.window||this.global,function(e){"use strict";var t,n,o,r,a={},u=!!e.document.querySelector&&!!e.addEventListener,c={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},i=function(e,t,n){if("[object Object]"===Object.prototype.toString.call(e))for(var o in e)Object.prototype.hasOwnProperty.call(e,o)&&t.call(n,e[o],o,e);else for(var r=0,a=e.length;a>r;r++)t.call(n,e[r],r,e)},l=function(e,t){var n={};return i(e,function(t,o){n[o]=e[o]}),i(t,function(e,o){n[o]=t[o]}),n},s=function(t,n){for(var o=n.charAt(0);t&&t!==e.document;t=t.parentNode)if("."===o){if(t.classList.contains(n.substr(1)))return t}else if("#"===o){if(t.id===n.substr(1))return t}else if("["===o&&t.hasAttribute(n.substr(1,n.length-2)))return t;return!1},f=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},d=function(e){for(var t,n=String(e),o=n.length,r=-1,a="",u=n.charCodeAt(0);++r=1&&31>=t||127==t||0===r&&t>=48&&57>=t||1===r&&t>=48&&57>=t&&45===u?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(r):"\\"+n.charAt(r)}return a},h=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},m=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=o-t-n,o>=0?o:0},p=function(){return Math.max(e.document.body.scrollHeight,e.document.documentElement.scrollHeight,e.document.body.offsetHeight,e.document.documentElement.offsetHeight,e.document.body.clientHeight,e.document.documentElement.clientHeight)},g=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},v=function(t,n){e.history.pushState&&(n||"true"===n)&&e.history.pushState(null,null,[e.location.protocol,"//",e.location.host,e.location.pathname,e.location.search,t].join(""))},b=function(e){return null===e?0:f(e)+e.offsetTop};a.animateScroll=function(t,n,a){var u=l(u||c,a||{}),i=g(t?t.getAttribute("data-options"):null);u=l(u,i),n="#"+d(n.substr(1));var s="#"===n?e.document.documentElement:e.document.querySelector(n),f=e.pageYOffset;o||(o=e.document.querySelector("[data-scroll-header]")),r||(r=b(o));var y,O,I,S=m(s,r,parseInt(u.offset,10)),E=S-f,H=p(),A=0;v(n,u.updateURL);var L=function(o,r,a){var c=e.pageYOffset;(o==r||c==r||e.innerHeight+c>=H)&&(clearInterval(a),s.focus(),u.callbackAfter(t,n))},Q=function(){A+=16,O=A/parseInt(u.speed,10),O=O>1?1:O,I=f+E*h(u.easing,O),e.scrollTo(0,Math.floor(I)),L(I,S,y)},C=function(){u.callbackBefore(t,n),y=setInterval(Q,16)};0===e.pageYOffset&&e.scrollTo(0,0),C()};var y=function(e){var n=s(e.target,"[data-scroll]");n&&"a"===n.tagName.toLowerCase()&&(e.preventDefault(),a.animateScroll(n,n.hash,t))},O=function(){n||(n=setTimeout(function(){n=null,r=b(o)},66))};return a.destroy=function(){t&&(e.document.removeEventListener("click",y,!1),e.removeEventListener("resize",O,!1),t=null,n=null,o=null,r=null)},a.init=function(n){u&&(a.destroy(),t=l(c,n||{}),o=e.document.querySelector("[data-scroll-header]"),r=b(o),e.document.addEventListener("click",y,!1),o&&e.addEventListener("resize",O,!1))},a}); \ No newline at end of file +/** smooth-scroll v6.0.0, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ +!function(e,t){"function"==typeof define&&define.amd?define(["buoy"],t(e)):"object"==typeof exports?module.exports=t(e,require("buoy")):e.smoothScroll=t(e,e.buoy)}("undefined"!=typeof global?global:this.window||this.global,function(e){"use strict";var t,n,o,a,r={},u=!!e.document.querySelector&&!!e.addEventListener,c={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},i=function(e){for(var t,n=String(e),o=n.length,a=-1,r="",u=n.charCodeAt(0);++a=1&&31>=t||127==t||0===a&&t>=48&&57>=t||1===a&&t>=48&&57>=t&&45===u?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(a):"\\"+n.charAt(a)}return r},l=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},s=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=o-t-n,o>=0?o:0},f=function(){return Math.max(e.document.body.scrollHeight,e.document.documentElement.scrollHeight,e.document.body.offsetHeight,e.document.documentElement.offsetHeight,e.document.body.clientHeight,e.document.documentElement.clientHeight)},d=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},h=function(t,n){e.history.pushState&&(n||"true"===n)&&e.history.pushState(null,null,[e.location.protocol,"//",e.location.host,e.location.pathname,e.location.search,t].join(""))},m=function(e){return null===e?0:buoy.getHeight(e)+e.offsetTop};r.animateScroll=function(t,n,r){var u=d(t?t.getAttribute("data-options"):null),p=buoy.extend(p||c,r||{},u);n="#"+i(n.substr(1));var b="#"===n?e.document.documentElement:e.document.querySelector(n),g=e.pageYOffset;o||(o=e.document.querySelector("[data-scroll-header]")),a||(a=m(o));var v,y,I,O=s(b,a,parseInt(p.offset,10)),S=O-g,E=f(),C=0;h(n,p.updateURL);var Q=function(o,a,r){var u=e.pageYOffset;(o==a||u==a||e.innerHeight+u>=E)&&(clearInterval(r),b.focus(),p.callbackAfter(t,n))},H=function(){C+=16,y=C/parseInt(p.speed,10),y=y>1?1:y,I=g+S*l(p.easing,y),e.scrollTo(0,Math.floor(I)),Q(I,O,v)},L=function(){p.callbackBefore(t,n),v=setInterval(H,16)};0===e.pageYOffset&&e.scrollTo(0,0),L()};var p=function(e){var n=buoy.getClosest(e.target,"[data-scroll]");n&&"a"===n.tagName.toLowerCase()&&(e.preventDefault(),r.animateScroll(n,n.hash,t))},b=function(e){n||(n=setTimeout(function(){n=null,a=m(o)},66))};return r.destroy=function(){t&&(e.document.removeEventListener("click",p,!1),e.removeEventListener("resize",b,!1),t=null,n=null,o=null,a=null)},r.init=function(n){u&&(r.destroy(),t=buoy.extend(c,n||{}),o=e.document.querySelector("[data-scroll-header]"),a=m(o),e.document.addEventListener("click",p,!1),o&&e.addEventListener("resize",b,!1))},r}); \ No newline at end of file diff --git a/docs/dist/js/buoy.js b/docs/dist/js/buoy.js new file mode 100755 index 0000000..8a71d67 --- /dev/null +++ b/docs/dist/js/buoy.js @@ -0,0 +1,337 @@ +/** + * smooth-scroll v6.0.0 + * Animate scrolling to anchor links, by Chris Ferdinandi. + * http://github.com/cferdinandi/smooth-scroll + * + * Free to use under the MIT License. + * http://gomakethings.com/mit/ + */ + +(function (root, factory) { + if ( typeof define === 'function' && define.amd ) { + define([], factory(root)); + } else if ( typeof exports === 'object' ) { + module.exports = factory(root); + } else { + root.buoy = factory(root); + } +})(typeof global !== 'undefined' ? global : this.window || this.global, function (root) { + + 'use strict'; + + // Object for public APIs + var buoy = {}; + + + // + // Methods + // + + /** + * Wait until the DOM is ready before executing code + * @param {Function} fn The function to execute when the DOM is ready + */ + buoy.ready = function ( fn ) { + + // Sanity check + if ( typeof fn !== 'function' ) return; + + // If document is already loaded, run method + if ( document.readyState === 'complete' ) { + return fn(); + } + + // Otherwise, wait until document is loaded + document.addEventListener( 'DOMContentLoaded', fn, false ); + + }; + + /** + * A simple forEach() implementation for Arrays, Objects and NodeLists. + * @author Todd Motto + * @link https://github.com/toddmotto/foreach + * @param {Array|Object|NodeList} collection Collection of items to iterate + * @param {Function} callback Callback function for each iteration + * @param {Array|Object|NodeList} scope Object/NodeList/Array that forEach is iterating over (aka `this`) + */ + buoy.forEach = function ( collection, callback, scope ) { + if ( Object.prototype.toString.call( collection ) === '[object Object]' ) { + for ( var prop in collection ) { + if ( Object.prototype.hasOwnProperty.call( collection, prop ) ) { + callback.call( scope, collection[prop], prop, collection ); + } + } + } else { + for ( var i = 0, len = collection.length; i < len; i++ ) { + callback.call( scope, collection[i], i, collection ); + } + } + }; + + /** + * Merge two or more objects. Returns a new object. + * @param {Boolean} deep If true, do a deep (or recursive) merge [optional] + * @param {Object} objects The objects to merge together + * @returns {Object} Merged values of defaults and options + */ + buoy.extend = function () { + + // Variables + var extended = {}; + var deep = false; + var i = 0; + var length = arguments.length; + + // Check if a deep merge + if ( Object.prototype.toString.call( arguments[0] ) === '[object Boolean]' ) { + deep = arguments[0]; + i++; + } + + // Merge the object into the extended object + var merge = function (obj) { + for ( var prop in obj ) { + if ( Object.prototype.hasOwnProperty.call( obj, prop ) ) { + // If deep merge and property is an object, merge properties + if ( deep && Object.prototype.toString.call(obj[prop]) === '[object Object]' ) { + extended[prop] = buoy.extend( true, extended[prop], obj[prop] ); + } else { + extended[prop] = obj[prop]; + } + } + } + }; + + // Loop through each object and conduct a merge + for ( ; i < length; i++ ) { + var obj = arguments[i]; + merge(obj); + } + + return extended; + + }; + + /** + * Get the height of an element. + * @param {Node} elem The element to get the height of + * @return {Number} The element's height in pixels + */ + buoy.getHeight = function ( elem ) { + return Math.max( elem.scrollHeight, elem.offsetHeight, elem.clientHeight ); + }; + + /** + * Get an element's distance from the top of the Document. + * @param {Node} elem The element + * @return {Number} Distance from the top in pixels + */ + buoy.getOffsetTop = function ( elem ) { + var location = 0; + if (elem.offsetParent) { + do { + location += elem.offsetTop; + elem = elem.offsetParent; + } while (elem); + } + return location >= 0 ? location : 0; + }; + + /** + * Get the closest matching element up the DOM tree. + * @param {Element} elem Starting element + * @param {String} selector Selector to match against (class, ID, data attribute, or tag) + * @return {Boolean|Element} Returns null if not match found + */ + buoy.getClosest = function ( elem, selector ) { + + // Variables + var firstChar = selector.charAt(0); + var supports = 'classList' in document.documentElement; + var attribute, value; + + // If selector is a data attribute, split attribute from value + if ( firstChar === '[' ) { + selector = selector.substr(1, selector.length - 2); + attribute = selector.split( '=' ); + + if ( attribute.length > 1 ) { + value = true; + attribute[1] = attribute[1].replace( /"/g, '' ).replace( /'/g, '' ); + } + } + + // Get closest match + for ( ; elem && elem !== document; elem = elem.parentNode ) { + + // If selector is a class + if ( firstChar === '.' ) { + if ( supports ) { + if ( elem.classList.contains( selector.substr(1) ) ) { + return elem; + } + } else { + if ( new RegExp('(^|\\s)' + selector.substr(1) + '(\\s|$)').test( elem.className ) ) { + return elem; + } + } + } + + // If selector is an ID + if ( firstChar === '#' ) { + if ( elem.id === selector.substr(1) ) { + return elem; + } + } + + // If selector is a data attribute + if ( firstChar === '[' ) { + if ( elem.hasAttribute( attribute[0] ) ) { + if ( value ) { + if ( elem.getAttribute( attribute[0] ) === attribute[1] ) { + return elem; + } + } else { + return elem; + } + } + } + + // If selector is a tag + if ( elem.tagName.toLowerCase() === selector ) { + return elem; + } + + } + + return null; + + }; + + /** + * Get an element's parents. + * @param {Node} elem The element + * @param {String} selector Selector to match against (class, ID, data attribute, or tag) + * @return {Array} An array of matching nodes + */ + buoy.getParents = function ( elem, selector ) { + + // Variables + var parents = []; + var supports = 'classList' in document.documentElement; + var firstChar, attribute, value; + + // If selector is a data attribute, split attribute from value + if ( selector ) { + firstChar = selector.charAt(0); + if ( firstChar === '[' ) { + selector = selector.substr(1, selector.length - 2); + attribute = selector.split( '=' ); + + if ( attribute.length > 1 ) { + value = true; + attribute[1] = attribute[1].replace( /"/g, '' ).replace( /'/g, '' ); + } + } + } + + // Get matches + for ( ; elem && elem !== document; elem = elem.parentNode ) { + if ( selector ) { + + // If selector is a class + if ( firstChar === '.' ) { + if ( supports ) { + if ( elem.classList.contains( selector.substr(1) ) ) { + parents.push( elem ); + } + } else { + if ( new RegExp('(^|\\s)' + selector.substr(1) + '(\\s|$)').test( elem.className ) ) { + parents.push( elem ); + } + } + } + + // If selector is an ID + if ( firstChar === '#' ) { + if ( elem.id === selector.substr(1) ) { + parents.push( elem ); + } + } + + // If selector is a data attribute + if ( firstChar === '[' ) { + if ( elem.hasAttribute( attribute[0] ) ) { + if ( value ) { + if ( elem.getAttribute( attribute[0] ) === attribute[1] ) { + parents.push( elem ); + } + } else { + parents.push( elem ); + } + } + } + + // If selector is a tag + if ( elem.tagName.toLowerCase() === selector ) { + parents.push( elem ); + } + + } else { + parents.push( elem ); + } + + } + + // Return parents if any exist + if ( parents.length === 0 ) { + return null; + } else { + return parents; + } + + }; + + /** + * Get an element's siblings. + * @param {Node} elem The element + * @return {Array} An array of sibling nodes + */ + buoy.getSiblings = function ( elem ) { + + // Variables + var siblings = []; + var sibling = elem.parentNode.firstChild; + + // Loop through all sibling nodes + for ( ; sibling; sibling = sibling.nextSibling ) { + if ( sibling.nodeType === 1 && sibling !== elem ) { + siblings.push( sibling ); + } + } + + return siblings; + + }; + + /** + * Get data from a URL query string. + * @param {String} field The field to get from the URL + * @param {String} url The URL to parse + * @return {String} The field value + */ + buoy.getQueryString = function ( field, url ) { + var href = url ? url : window.location.href; + var reg = new RegExp( '[?&]' + field + '=([^&#]*)', 'i' ); + var string = reg.exec(href); + return string ? string[1] : null; + }; + + + // + // Public APIs + // + + return buoy; + +}); \ No newline at end of file diff --git a/docs/dist/js/buoy.min.js b/docs/dist/js/buoy.min.js new file mode 100755 index 0000000..4b5b6e3 --- /dev/null +++ b/docs/dist/js/buoy.min.js @@ -0,0 +1,2 @@ +/** smooth-scroll v6.0.0, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ +!function(t,e){"function"==typeof define&&define.amd?define([],e(t)):"object"==typeof exports?module.exports=e(t):t.buoy=e(t)}("undefined"!=typeof global?global:this.window||this.global,function(t){"use strict";var e={};return e.ready=function(t){return"function"==typeof t?"complete"===document.readyState?t():void document.addEventListener("DOMContentLoaded",t,!1):void 0},e.forEach=function(t,e,n){if("[object Object]"===Object.prototype.toString.call(t))for(var r in t)Object.prototype.hasOwnProperty.call(t,r)&&e.call(n,t[r],r,t);else for(var o=0,s=t.length;s>o;o++)e.call(n,t[o],o,t)},e.extend=function(){var t={},n=!1,r=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(n=arguments[0],r++);for(var s=function(r){for(var o in r)Object.prototype.hasOwnProperty.call(r,o)&&(t[o]=n&&"[object Object]"===Object.prototype.toString.call(r[o])?e.extend(!0,t[o],r[o]):r[o])};o>r;r++){var i=arguments[r];s(i)}return t},e.getHeight=function(t){return Math.max(t.scrollHeight,t.offsetHeight,t.clientHeight)},e.getOffsetTop=function(t){var e=0;if(t.offsetParent)do e+=t.offsetTop,t=t.offsetParent;while(t);return e>=0?e:0},e.getClosest=function(t,e){var n,r,o=e.charAt(0),s="classList"in document.documentElement;for("["===o&&(e=e.substr(1,e.length-2),n=e.split("="),n.length>1&&(r=!0,n[1]=n[1].replace(/"/g,"").replace(/'/g,"")));t&&t!==document;t=t.parentNode){if("."===o)if(s){if(t.classList.contains(e.substr(1)))return t}else if(new RegExp("(^|\\s)"+e.substr(1)+"(\\s|$)").test(t.className))return t;if("#"===o&&t.id===e.substr(1))return t;if("["===o&&t.hasAttribute(n[0])){if(!r)return t;if(t.getAttribute(n[0])===n[1])return t}if(t.tagName.toLowerCase()===e)return t}return null},e.getParents=function(t,e){var n,r,o,s=[],i="classList"in document.documentElement;for(e&&(n=e.charAt(0),"["===n&&(e=e.substr(1,e.length-2),r=e.split("="),r.length>1&&(o=!0,r[1]=r[1].replace(/"/g,"").replace(/'/g,""))));t&&t!==document;t=t.parentNode)e?("."===n&&(i?t.classList.contains(e.substr(1))&&s.push(t):new RegExp("(^|\\s)"+e.substr(1)+"(\\s|$)").test(t.className)&&s.push(t)),"#"===n&&t.id===e.substr(1)&&s.push(t),"["===n&&t.hasAttribute(r[0])&&(o?t.getAttribute(r[0])===r[1]&&s.push(t):s.push(t)),t.tagName.toLowerCase()===e&&s.push(t)):s.push(t);return 0===s.length?null:s},e.getSiblings=function(t){for(var e=[],n=t.parentNode.firstChild;n;n=n.nextSibling)1===n.nodeType&&n!==t&&e.push(n);return e},e.getQueryString=function(t,e){var n=e?e:window.location.href,r=new RegExp("[?&]"+t+"=([^&#]*)","i"),o=r.exec(n);return o?o[1]:null},e}); \ No newline at end of file diff --git a/docs/dist/js/smooth-scroll.js b/docs/dist/js/smooth-scroll.js index c38271b..84028d1 100755 --- a/docs/dist/js/smooth-scroll.js +++ b/docs/dist/js/smooth-scroll.js @@ -1,5 +1,5 @@ /** - * smooth-scroll v5.3.7 + * smooth-scroll v6.0.0 * Animate scrolling to anchor links, by Chris Ferdinandi. * http://github.com/cferdinandi/smooth-scroll * @@ -9,13 +9,13 @@ (function (root, factory) { if ( typeof define === 'function' && define.amd ) { - define([], factory(root)); + define(['buoy'], factory(root)); } else if ( typeof exports === 'object' ) { - module.exports = factory(root); + module.exports = factory(root, require('buoy')); } else { - root.smoothScroll = factory(root); + root.smoothScroll = factory(root, root.buoy); } -})(typeof global !== "undefined" ? global : this.window || this.global, function (root) { +})(typeof global !== 'undefined' ? global : this.window || this.global, function (root) { 'use strict'; @@ -42,81 +42,6 @@ // Methods // - /** - * A simple forEach() implementation for Arrays, Objects and NodeLists - * @private - * @param {Array|Object|NodeList} collection Collection of items to iterate - * @param {Function} callback Callback function for each iteration - * @param {Array|Object|NodeList} scope Object/NodeList/Array that forEach is iterating over (aka `this`) - */ - var forEach = function (collection, callback, scope) { - if (Object.prototype.toString.call(collection) === '[object Object]') { - for (var prop in collection) { - if (Object.prototype.hasOwnProperty.call(collection, prop)) { - callback.call(scope, collection[prop], prop, collection); - } - } - } else { - for (var i = 0, len = collection.length; i < len; i++) { - callback.call(scope, collection[i], i, collection); - } - } - }; - - /** - * Merge defaults with user options - * @private - * @param {Object} defaults Default settings - * @param {Object} options User options - * @returns {Object} Merged values of defaults and options - */ - var extend = function ( defaults, options ) { - var extended = {}; - forEach(defaults, function (value, prop) { - extended[prop] = defaults[prop]; - }); - forEach(options, function (value, prop) { - extended[prop] = options[prop]; - }); - return extended; - }; - - /** - * Get the closest matching element up the DOM tree - * @param {Element} elem Starting element - * @param {String} selector Selector to match against (class, ID, or data attribute) - * @return {Boolean|Element} Returns false if not match found - */ - var getClosest = function (elem, selector) { - var firstChar = selector.charAt(0); - for ( ; elem && elem !== root.document; elem = elem.parentNode ) { - if ( firstChar === '.' ) { - if ( elem.classList.contains( selector.substr(1) ) ) { - return elem; - } - } else if ( firstChar === '#' ) { - if ( elem.id === selector.substr(1) ) { - return elem; - } - } else if ( firstChar === '[' ) { - if ( elem.hasAttribute( selector.substr(1, selector.length - 2) ) ) { - return elem; - } - } - } - return false; - }; - - /** - * Get the height of an element - * @private - * @param {Node]} elem The element - * @return {Number} The element's height - */ - var getHeight = function (elem) { - return Math.max( elem.scrollHeight, elem.offsetHeight, elem.clientHeight ); - }; - /** * Escape special characters for use with querySelector * @private @@ -270,7 +195,7 @@ }; var getHeaderHeight = function ( header ) { - return header === null ? 0 : ( getHeight( header ) + header.offsetTop ); + return header === null ? 0 : ( buoy.getHeight( header ) + header.offsetTop ); }; /** @@ -283,9 +208,8 @@ smoothScroll.animateScroll = function ( toggle, anchor, options ) { // Options and overrides - var settings = extend( settings || defaults, options || {} ); // Merge user options with defaults var overrides = getDataOptions( toggle ? toggle.getAttribute('data-options') : null ); - settings = extend( settings, overrides ); + var settings = buoy.extend( settings || defaults, options || {}, overrides ); // Merge user options with defaults anchor = '#' + escapeCharacters(anchor.substr(1)); // Escape special characters and leading numbers // Selectors and variables @@ -359,7 +283,7 @@ * @private */ var eventHandler = function (event) { - var toggle = getClosest(event.target, '[data-scroll]'); + var toggle = buoy.getClosest(event.target, '[data-scroll]'); if ( toggle && toggle.tagName.toLowerCase() === 'a' ) { event.preventDefault(); // Prevent default click event smoothScroll.animateScroll( toggle, toggle.hash, settings); // Animate scroll @@ -415,7 +339,7 @@ smoothScroll.destroy(); // Selectors and variables - settings = extend( defaults, options || {} ); // Merge user options with defaults + settings = buoy.extend( defaults, options || {} ); // Merge user options with defaults fixedHeader = root.document.querySelector('[data-scroll-header]'); // Get the fixed header headerHeight = getHeaderHeight( fixedHeader ); diff --git a/docs/dist/js/smooth-scroll.min.js b/docs/dist/js/smooth-scroll.min.js index 4290904..f0f2d0e 100755 --- a/docs/dist/js/smooth-scroll.min.js +++ b/docs/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ -/** smooth-scroll v5.3.7, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ -!function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)}("undefined"!=typeof global?global:this.window||this.global,function(e){"use strict";var t,n,o,r,a={},u=!!e.document.querySelector&&!!e.addEventListener,c={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},i=function(e,t,n){if("[object Object]"===Object.prototype.toString.call(e))for(var o in e)Object.prototype.hasOwnProperty.call(e,o)&&t.call(n,e[o],o,e);else for(var r=0,a=e.length;a>r;r++)t.call(n,e[r],r,e)},l=function(e,t){var n={};return i(e,function(t,o){n[o]=e[o]}),i(t,function(e,o){n[o]=t[o]}),n},s=function(t,n){for(var o=n.charAt(0);t&&t!==e.document;t=t.parentNode)if("."===o){if(t.classList.contains(n.substr(1)))return t}else if("#"===o){if(t.id===n.substr(1))return t}else if("["===o&&t.hasAttribute(n.substr(1,n.length-2)))return t;return!1},f=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},d=function(e){for(var t,n=String(e),o=n.length,r=-1,a="",u=n.charCodeAt(0);++r=1&&31>=t||127==t||0===r&&t>=48&&57>=t||1===r&&t>=48&&57>=t&&45===u?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(r):"\\"+n.charAt(r)}return a},h=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},m=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=o-t-n,o>=0?o:0},p=function(){return Math.max(e.document.body.scrollHeight,e.document.documentElement.scrollHeight,e.document.body.offsetHeight,e.document.documentElement.offsetHeight,e.document.body.clientHeight,e.document.documentElement.clientHeight)},g=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},v=function(t,n){e.history.pushState&&(n||"true"===n)&&e.history.pushState(null,null,[e.location.protocol,"//",e.location.host,e.location.pathname,e.location.search,t].join(""))},b=function(e){return null===e?0:f(e)+e.offsetTop};a.animateScroll=function(t,n,a){var u=l(u||c,a||{}),i=g(t?t.getAttribute("data-options"):null);u=l(u,i),n="#"+d(n.substr(1));var s="#"===n?e.document.documentElement:e.document.querySelector(n),f=e.pageYOffset;o||(o=e.document.querySelector("[data-scroll-header]")),r||(r=b(o));var y,O,I,S=m(s,r,parseInt(u.offset,10)),E=S-f,H=p(),A=0;v(n,u.updateURL);var L=function(o,r,a){var c=e.pageYOffset;(o==r||c==r||e.innerHeight+c>=H)&&(clearInterval(a),s.focus(),u.callbackAfter(t,n))},Q=function(){A+=16,O=A/parseInt(u.speed,10),O=O>1?1:O,I=f+E*h(u.easing,O),e.scrollTo(0,Math.floor(I)),L(I,S,y)},C=function(){u.callbackBefore(t,n),y=setInterval(Q,16)};0===e.pageYOffset&&e.scrollTo(0,0),C()};var y=function(e){var n=s(e.target,"[data-scroll]");n&&"a"===n.tagName.toLowerCase()&&(e.preventDefault(),a.animateScroll(n,n.hash,t))},O=function(){n||(n=setTimeout(function(){n=null,r=b(o)},66))};return a.destroy=function(){t&&(e.document.removeEventListener("click",y,!1),e.removeEventListener("resize",O,!1),t=null,n=null,o=null,r=null)},a.init=function(n){u&&(a.destroy(),t=l(c,n||{}),o=e.document.querySelector("[data-scroll-header]"),r=b(o),e.document.addEventListener("click",y,!1),o&&e.addEventListener("resize",O,!1))},a}); \ No newline at end of file +/** smooth-scroll v6.0.0, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ +!function(e,t){"function"==typeof define&&define.amd?define(["buoy"],t(e)):"object"==typeof exports?module.exports=t(e,require("buoy")):e.smoothScroll=t(e,e.buoy)}("undefined"!=typeof global?global:this.window||this.global,function(e){"use strict";var t,n,o,a,r={},u=!!e.document.querySelector&&!!e.addEventListener,c={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},i=function(e){for(var t,n=String(e),o=n.length,a=-1,r="",u=n.charCodeAt(0);++a=1&&31>=t||127==t||0===a&&t>=48&&57>=t||1===a&&t>=48&&57>=t&&45===u?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(a):"\\"+n.charAt(a)}return r},l=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},s=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=o-t-n,o>=0?o:0},f=function(){return Math.max(e.document.body.scrollHeight,e.document.documentElement.scrollHeight,e.document.body.offsetHeight,e.document.documentElement.offsetHeight,e.document.body.clientHeight,e.document.documentElement.clientHeight)},d=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},h=function(t,n){e.history.pushState&&(n||"true"===n)&&e.history.pushState(null,null,[e.location.protocol,"//",e.location.host,e.location.pathname,e.location.search,t].join(""))},m=function(e){return null===e?0:buoy.getHeight(e)+e.offsetTop};r.animateScroll=function(t,n,r){var u=d(t?t.getAttribute("data-options"):null),p=buoy.extend(p||c,r||{},u);n="#"+i(n.substr(1));var b="#"===n?e.document.documentElement:e.document.querySelector(n),g=e.pageYOffset;o||(o=e.document.querySelector("[data-scroll-header]")),a||(a=m(o));var v,y,I,O=s(b,a,parseInt(p.offset,10)),S=O-g,E=f(),C=0;h(n,p.updateURL);var Q=function(o,a,r){var u=e.pageYOffset;(o==a||u==a||e.innerHeight+u>=E)&&(clearInterval(r),b.focus(),p.callbackAfter(t,n))},H=function(){C+=16,y=C/parseInt(p.speed,10),y=y>1?1:y,I=g+S*l(p.easing,y),e.scrollTo(0,Math.floor(I)),Q(I,O,v)},L=function(){p.callbackBefore(t,n),v=setInterval(H,16)};0===e.pageYOffset&&e.scrollTo(0,0),L()};var p=function(e){var n=buoy.getClosest(e.target,"[data-scroll]");n&&"a"===n.tagName.toLowerCase()&&(e.preventDefault(),r.animateScroll(n,n.hash,t))},b=function(e){n||(n=setTimeout(function(){n=null,a=m(o)},66))};return r.destroy=function(){t&&(e.document.removeEventListener("click",p,!1),e.removeEventListener("resize",b,!1),t=null,n=null,o=null,a=null)},r.init=function(n){u&&(r.destroy(),t=buoy.extend(c,n||{}),o=e.document.querySelector("[data-scroll-header]"),a=m(o),e.document.addEventListener("click",p,!1),o&&e.addEventListener("resize",b,!1))},r}); \ No newline at end of file diff --git a/gulpfile.js b/gulpfile.js index 0a3a0e8..77e3ff6 100755 --- a/gulpfile.js +++ b/gulpfile.js @@ -25,7 +25,7 @@ var uglify = require('gulp-uglify'); var karma = require('gulp-karma'); // Styles -var sass = require('gulp-ruby-sass'); +var sass = require('gulp-sass'); var prefix = require('gulp-autoprefixer'); var minify = require('gulp-minify-css'); @@ -129,10 +129,8 @@ gulp.task('build:styles', ['clean:dist'], function() { return gulp.src(paths.styles.input) .pipe(plumber()) .pipe(sass({ - style: 'expanded', - lineNumbers: true, - noCache: true, - 'sourcemap=none': true + outputStyle: 'expanded', + sourceComments: true })) .pipe(flatten()) .pipe(prefix({ diff --git a/package.json b/package.json index 95c1262..05b0749 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "smooth-scroll", - "version": "5.3.7", + "version": "6.0.0", "description": "Animate scrolling to anchor links", "main": "./dist/js/smooth-scroll.js", "author": { @@ -13,34 +13,36 @@ "url": "http://github.com/cferdinandi/smooth-scroll" }, "devDependencies": { - "gulp": "^3.8.0", + "gulp": "^3.9.0", "node-fs": "^0.1.7", - "del": "^0.1.3", - "lazypipe": "^0.2.2", - "gulp-plumber": "^0.6.2", - "gulp-flatten": "^0.0.2", - "gulp-tap": "^0.1.1", - "gulp-rename": "^1.1.0", - "gulp-header": "^1.1.1", + "del": "^1.2.0", + "lazypipe": "^0.2.4", + "gulp-plumber": "^1.0.1", + "gulp-flatten": "^0.0.4", + "gulp-tap": "^0.1.3", + "gulp-rename": "^1.2.2", + "gulp-header": "^1.2.2", "gulp-footer": "^1.0.5", - "gulp-watch": "^1.1.0", - "gulp-livereload": "^2.1.1", - "gulp-jshint": "^1.6.1", - "jshint-stylish": "^0.2.0", - "gulp-concat": "^2.2.0", - "gulp-uglify": "^0.3.0", + "gulp-watch": "^4.2.4", + "gulp-livereload": "^3.8.0", + "gulp-jshint": "^1.11.1", + "jshint-stylish": "^2.0.1", + "gulp-concat": "^2.6.0", + "gulp-uglify": "^1.2.0", + "karma": "^0.12.37", "gulp-karma": "^0.0.4", - "karma-coverage": "^0.2.4", - "karma-jasmine": "^0.2.0", - "karma-phantomjs-launcher": "^0.1.4", - "karma-spec-reporter": "^0.0.13", - "karma-htmlfile-reporter": "^0.1", - "gulp-ruby-sass": "^0.7.1", - "gulp-minify-css": "^0.3.4", - "gulp-autoprefixer": "^0.0.7", - "gulp-svgmin": "^0.4.6", - "gulp-svgstore": "^2.0.0", + "karma-coverage": "^0.4.2", + "jasmine": "^2.3.1", + "karma-jasmine": "^0.3.6", + "karma-phantomjs-launcher": "^0.2.0", + "karma-spec-reporter": "^0.0.19", + "karma-htmlfile-reporter": "^0.2.1", + "gulp-sass": "^2.0.3", + "gulp-minify-css": "^1.2.0", + "gulp-autoprefixer": "^2.3.1", + "gulp-svgmin": "^1.1.2", + "gulp-svgstore": "^5.0.2", "gulp-markdown": "^1.0.0", - "gulp-file-include": "^0.5.1" + "gulp-file-include": "^0.11.1" } } diff --git a/src/js/buoy.js b/src/js/buoy.js new file mode 100755 index 0000000..b9e4be7 --- /dev/null +++ b/src/js/buoy.js @@ -0,0 +1,328 @@ +(function (root, factory) { + if ( typeof define === 'function' && define.amd ) { + define([], factory(root)); + } else if ( typeof exports === 'object' ) { + module.exports = factory(root); + } else { + root.buoy = factory(root); + } +})(typeof global !== 'undefined' ? global : this.window || this.global, function (root) { + + 'use strict'; + + // Object for public APIs + var buoy = {}; + + + // + // Methods + // + + /** + * Wait until the DOM is ready before executing code + * @param {Function} fn The function to execute when the DOM is ready + */ + buoy.ready = function ( fn ) { + + // Sanity check + if ( typeof fn !== 'function' ) return; + + // If document is already loaded, run method + if ( document.readyState === 'complete' ) { + return fn(); + } + + // Otherwise, wait until document is loaded + document.addEventListener( 'DOMContentLoaded', fn, false ); + + }; + + /** + * A simple forEach() implementation for Arrays, Objects and NodeLists. + * @author Todd Motto + * @link https://github.com/toddmotto/foreach + * @param {Array|Object|NodeList} collection Collection of items to iterate + * @param {Function} callback Callback function for each iteration + * @param {Array|Object|NodeList} scope Object/NodeList/Array that forEach is iterating over (aka `this`) + */ + buoy.forEach = function ( collection, callback, scope ) { + if ( Object.prototype.toString.call( collection ) === '[object Object]' ) { + for ( var prop in collection ) { + if ( Object.prototype.hasOwnProperty.call( collection, prop ) ) { + callback.call( scope, collection[prop], prop, collection ); + } + } + } else { + for ( var i = 0, len = collection.length; i < len; i++ ) { + callback.call( scope, collection[i], i, collection ); + } + } + }; + + /** + * Merge two or more objects. Returns a new object. + * @param {Boolean} deep If true, do a deep (or recursive) merge [optional] + * @param {Object} objects The objects to merge together + * @returns {Object} Merged values of defaults and options + */ + buoy.extend = function () { + + // Variables + var extended = {}; + var deep = false; + var i = 0; + var length = arguments.length; + + // Check if a deep merge + if ( Object.prototype.toString.call( arguments[0] ) === '[object Boolean]' ) { + deep = arguments[0]; + i++; + } + + // Merge the object into the extended object + var merge = function (obj) { + for ( var prop in obj ) { + if ( Object.prototype.hasOwnProperty.call( obj, prop ) ) { + // If deep merge and property is an object, merge properties + if ( deep && Object.prototype.toString.call(obj[prop]) === '[object Object]' ) { + extended[prop] = buoy.extend( true, extended[prop], obj[prop] ); + } else { + extended[prop] = obj[prop]; + } + } + } + }; + + // Loop through each object and conduct a merge + for ( ; i < length; i++ ) { + var obj = arguments[i]; + merge(obj); + } + + return extended; + + }; + + /** + * Get the height of an element. + * @param {Node} elem The element to get the height of + * @return {Number} The element's height in pixels + */ + buoy.getHeight = function ( elem ) { + return Math.max( elem.scrollHeight, elem.offsetHeight, elem.clientHeight ); + }; + + /** + * Get an element's distance from the top of the Document. + * @param {Node} elem The element + * @return {Number} Distance from the top in pixels + */ + buoy.getOffsetTop = function ( elem ) { + var location = 0; + if (elem.offsetParent) { + do { + location += elem.offsetTop; + elem = elem.offsetParent; + } while (elem); + } + return location >= 0 ? location : 0; + }; + + /** + * Get the closest matching element up the DOM tree. + * @param {Element} elem Starting element + * @param {String} selector Selector to match against (class, ID, data attribute, or tag) + * @return {Boolean|Element} Returns null if not match found + */ + buoy.getClosest = function ( elem, selector ) { + + // Variables + var firstChar = selector.charAt(0); + var supports = 'classList' in document.documentElement; + var attribute, value; + + // If selector is a data attribute, split attribute from value + if ( firstChar === '[' ) { + selector = selector.substr(1, selector.length - 2); + attribute = selector.split( '=' ); + + if ( attribute.length > 1 ) { + value = true; + attribute[1] = attribute[1].replace( /"/g, '' ).replace( /'/g, '' ); + } + } + + // Get closest match + for ( ; elem && elem !== document; elem = elem.parentNode ) { + + // If selector is a class + if ( firstChar === '.' ) { + if ( supports ) { + if ( elem.classList.contains( selector.substr(1) ) ) { + return elem; + } + } else { + if ( new RegExp('(^|\\s)' + selector.substr(1) + '(\\s|$)').test( elem.className ) ) { + return elem; + } + } + } + + // If selector is an ID + if ( firstChar === '#' ) { + if ( elem.id === selector.substr(1) ) { + return elem; + } + } + + // If selector is a data attribute + if ( firstChar === '[' ) { + if ( elem.hasAttribute( attribute[0] ) ) { + if ( value ) { + if ( elem.getAttribute( attribute[0] ) === attribute[1] ) { + return elem; + } + } else { + return elem; + } + } + } + + // If selector is a tag + if ( elem.tagName.toLowerCase() === selector ) { + return elem; + } + + } + + return null; + + }; + + /** + * Get an element's parents. + * @param {Node} elem The element + * @param {String} selector Selector to match against (class, ID, data attribute, or tag) + * @return {Array} An array of matching nodes + */ + buoy.getParents = function ( elem, selector ) { + + // Variables + var parents = []; + var supports = 'classList' in document.documentElement; + var firstChar, attribute, value; + + // If selector is a data attribute, split attribute from value + if ( selector ) { + firstChar = selector.charAt(0); + if ( firstChar === '[' ) { + selector = selector.substr(1, selector.length - 2); + attribute = selector.split( '=' ); + + if ( attribute.length > 1 ) { + value = true; + attribute[1] = attribute[1].replace( /"/g, '' ).replace( /'/g, '' ); + } + } + } + + // Get matches + for ( ; elem && elem !== document; elem = elem.parentNode ) { + if ( selector ) { + + // If selector is a class + if ( firstChar === '.' ) { + if ( supports ) { + if ( elem.classList.contains( selector.substr(1) ) ) { + parents.push( elem ); + } + } else { + if ( new RegExp('(^|\\s)' + selector.substr(1) + '(\\s|$)').test( elem.className ) ) { + parents.push( elem ); + } + } + } + + // If selector is an ID + if ( firstChar === '#' ) { + if ( elem.id === selector.substr(1) ) { + parents.push( elem ); + } + } + + // If selector is a data attribute + if ( firstChar === '[' ) { + if ( elem.hasAttribute( attribute[0] ) ) { + if ( value ) { + if ( elem.getAttribute( attribute[0] ) === attribute[1] ) { + parents.push( elem ); + } + } else { + parents.push( elem ); + } + } + } + + // If selector is a tag + if ( elem.tagName.toLowerCase() === selector ) { + parents.push( elem ); + } + + } else { + parents.push( elem ); + } + + } + + // Return parents if any exist + if ( parents.length === 0 ) { + return null; + } else { + return parents; + } + + }; + + /** + * Get an element's siblings. + * @param {Node} elem The element + * @return {Array} An array of sibling nodes + */ + buoy.getSiblings = function ( elem ) { + + // Variables + var siblings = []; + var sibling = elem.parentNode.firstChild; + + // Loop through all sibling nodes + for ( ; sibling; sibling = sibling.nextSibling ) { + if ( sibling.nodeType === 1 && sibling !== elem ) { + siblings.push( sibling ); + } + } + + return siblings; + + }; + + /** + * Get data from a URL query string. + * @param {String} field The field to get from the URL + * @param {String} url The URL to parse + * @return {String} The field value + */ + buoy.getQueryString = function ( field, url ) { + var href = url ? url : window.location.href; + var reg = new RegExp( '[?&]' + field + '=([^&#]*)', 'i' ); + var string = reg.exec(href); + return string ? string[1] : null; + }; + + + // + // Public APIs + // + + return buoy; + +}); \ No newline at end of file diff --git a/src/js/smooth-scroll.js b/src/js/smooth-scroll.js index 7a9ff28..aa2624b 100755 --- a/src/js/smooth-scroll.js +++ b/src/js/smooth-scroll.js @@ -1,12 +1,12 @@ (function (root, factory) { if ( typeof define === 'function' && define.amd ) { - define([], factory(root)); + define(['buoy'], factory(root)); } else if ( typeof exports === 'object' ) { - module.exports = factory(root); + module.exports = factory(root, require('buoy')); } else { - root.smoothScroll = factory(root); + root.smoothScroll = factory(root, root.buoy); } -})(typeof global !== "undefined" ? global : this.window || this.global, function (root) { +})(typeof global !== 'undefined' ? global : this.window || this.global, function (root) { 'use strict'; @@ -33,81 +33,6 @@ // Methods // - /** - * A simple forEach() implementation for Arrays, Objects and NodeLists - * @private - * @param {Array|Object|NodeList} collection Collection of items to iterate - * @param {Function} callback Callback function for each iteration - * @param {Array|Object|NodeList} scope Object/NodeList/Array that forEach is iterating over (aka `this`) - */ - var forEach = function (collection, callback, scope) { - if (Object.prototype.toString.call(collection) === '[object Object]') { - for (var prop in collection) { - if (Object.prototype.hasOwnProperty.call(collection, prop)) { - callback.call(scope, collection[prop], prop, collection); - } - } - } else { - for (var i = 0, len = collection.length; i < len; i++) { - callback.call(scope, collection[i], i, collection); - } - } - }; - - /** - * Merge defaults with user options - * @private - * @param {Object} defaults Default settings - * @param {Object} options User options - * @returns {Object} Merged values of defaults and options - */ - var extend = function ( defaults, options ) { - var extended = {}; - forEach(defaults, function (value, prop) { - extended[prop] = defaults[prop]; - }); - forEach(options, function (value, prop) { - extended[prop] = options[prop]; - }); - return extended; - }; - - /** - * Get the closest matching element up the DOM tree - * @param {Element} elem Starting element - * @param {String} selector Selector to match against (class, ID, or data attribute) - * @return {Boolean|Element} Returns false if not match found - */ - var getClosest = function (elem, selector) { - var firstChar = selector.charAt(0); - for ( ; elem && elem !== root.document; elem = elem.parentNode ) { - if ( firstChar === '.' ) { - if ( elem.classList.contains( selector.substr(1) ) ) { - return elem; - } - } else if ( firstChar === '#' ) { - if ( elem.id === selector.substr(1) ) { - return elem; - } - } else if ( firstChar === '[' ) { - if ( elem.hasAttribute( selector.substr(1, selector.length - 2) ) ) { - return elem; - } - } - } - return false; - }; - - /** - * Get the height of an element - * @private - * @param {Node]} elem The element - * @return {Number} The element's height - */ - var getHeight = function (elem) { - return Math.max( elem.scrollHeight, elem.offsetHeight, elem.clientHeight ); - }; - /** * Escape special characters for use with querySelector * @private @@ -261,7 +186,7 @@ }; var getHeaderHeight = function ( header ) { - return header === null ? 0 : ( getHeight( header ) + header.offsetTop ); + return header === null ? 0 : ( buoy.getHeight( header ) + header.offsetTop ); }; /** @@ -274,9 +199,8 @@ smoothScroll.animateScroll = function ( toggle, anchor, options ) { // Options and overrides - var settings = extend( settings || defaults, options || {} ); // Merge user options with defaults var overrides = getDataOptions( toggle ? toggle.getAttribute('data-options') : null ); - settings = extend( settings, overrides ); + var settings = buoy.extend( settings || defaults, options || {}, overrides ); // Merge user options with defaults anchor = '#' + escapeCharacters(anchor.substr(1)); // Escape special characters and leading numbers // Selectors and variables @@ -350,7 +274,7 @@ * @private */ var eventHandler = function (event) { - var toggle = getClosest(event.target, '[data-scroll]'); + var toggle = buoy.getClosest(event.target, '[data-scroll]'); if ( toggle && toggle.tagName.toLowerCase() === 'a' ) { event.preventDefault(); // Prevent default click event smoothScroll.animateScroll( toggle, toggle.hash, settings); // Animate scroll @@ -406,7 +330,7 @@ smoothScroll.destroy(); // Selectors and variables - settings = extend( defaults, options || {} ); // Merge user options with defaults + settings = buoy.extend( defaults, options || {} ); // Merge user options with defaults fixedHeader = root.document.querySelector('[data-scroll-header]'); // Get the fixed header headerHeight = getHeaderHeight( fixedHeader ); From a503099f75c9ff3efc9bf6c431616bff27f50ca8 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Thu, 2 Jul 2015 20:51:29 -0400 Subject: [PATCH 142/285] Fixed docs --- docs/index.html | 1 + src/docs/_templates/_footer.html | 1 + 2 files changed, 2 insertions(+) diff --git a/docs/index.html b/docs/index.html index 9866302..adfd08e 100644 --- a/docs/index.html +++ b/docs/index.html @@ -69,6 +69,7 @@

Smooth Scroll

+ ``` -Smooth Scroll requires [Buoy](https://github.com/cferdinandi/buoy), a lightweight collection of helper methods for getting stuff done with native JavaScript. - ### 2. Add the markup to your HTML. ```html @@ -95,8 +92,7 @@ smoothScroll.init({ easing: 'easeInOutCubic', // Easing pattern to use updateURL: true, // Boolean. Whether or not to update the URL with the anchor hash on scroll offset: 0, // Integer. How far to offset the scrolling anchor location in pixels - callbackBefore: function ( toggle, anchor ) {}, // Function to run before scrolling - callbackAfter: function ( toggle, anchor ) {} // Function to run after scrolling + callback: function ( toggle, anchor ) {} // Function to run after scrolling }); ``` diff --git a/dist/js/buoy.js b/dist/js/buoy.js index 8a71d67..ea39a59 100755 --- a/dist/js/buoy.js +++ b/dist/js/buoy.js @@ -1,5 +1,5 @@ /** - * smooth-scroll v6.0.0 + * smooth-scroll v7.0.0 * Animate scrolling to anchor links, by Chris Ferdinandi. * http://github.com/cferdinandi/smooth-scroll * diff --git a/dist/js/buoy.min.js b/dist/js/buoy.min.js index 4b5b6e3..fb59080 100755 --- a/dist/js/buoy.min.js +++ b/dist/js/buoy.min.js @@ -1,2 +1,2 @@ -/** smooth-scroll v6.0.0, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ +/** smooth-scroll v7.0.0, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ !function(t,e){"function"==typeof define&&define.amd?define([],e(t)):"object"==typeof exports?module.exports=e(t):t.buoy=e(t)}("undefined"!=typeof global?global:this.window||this.global,function(t){"use strict";var e={};return e.ready=function(t){return"function"==typeof t?"complete"===document.readyState?t():void document.addEventListener("DOMContentLoaded",t,!1):void 0},e.forEach=function(t,e,n){if("[object Object]"===Object.prototype.toString.call(t))for(var r in t)Object.prototype.hasOwnProperty.call(t,r)&&e.call(n,t[r],r,t);else for(var o=0,s=t.length;s>o;o++)e.call(n,t[o],o,t)},e.extend=function(){var t={},n=!1,r=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(n=arguments[0],r++);for(var s=function(r){for(var o in r)Object.prototype.hasOwnProperty.call(r,o)&&(t[o]=n&&"[object Object]"===Object.prototype.toString.call(r[o])?e.extend(!0,t[o],r[o]):r[o])};o>r;r++){var i=arguments[r];s(i)}return t},e.getHeight=function(t){return Math.max(t.scrollHeight,t.offsetHeight,t.clientHeight)},e.getOffsetTop=function(t){var e=0;if(t.offsetParent)do e+=t.offsetTop,t=t.offsetParent;while(t);return e>=0?e:0},e.getClosest=function(t,e){var n,r,o=e.charAt(0),s="classList"in document.documentElement;for("["===o&&(e=e.substr(1,e.length-2),n=e.split("="),n.length>1&&(r=!0,n[1]=n[1].replace(/"/g,"").replace(/'/g,"")));t&&t!==document;t=t.parentNode){if("."===o)if(s){if(t.classList.contains(e.substr(1)))return t}else if(new RegExp("(^|\\s)"+e.substr(1)+"(\\s|$)").test(t.className))return t;if("#"===o&&t.id===e.substr(1))return t;if("["===o&&t.hasAttribute(n[0])){if(!r)return t;if(t.getAttribute(n[0])===n[1])return t}if(t.tagName.toLowerCase()===e)return t}return null},e.getParents=function(t,e){var n,r,o,s=[],i="classList"in document.documentElement;for(e&&(n=e.charAt(0),"["===n&&(e=e.substr(1,e.length-2),r=e.split("="),r.length>1&&(o=!0,r[1]=r[1].replace(/"/g,"").replace(/'/g,""))));t&&t!==document;t=t.parentNode)e?("."===n&&(i?t.classList.contains(e.substr(1))&&s.push(t):new RegExp("(^|\\s)"+e.substr(1)+"(\\s|$)").test(t.className)&&s.push(t)),"#"===n&&t.id===e.substr(1)&&s.push(t),"["===n&&t.hasAttribute(r[0])&&(o?t.getAttribute(r[0])===r[1]&&s.push(t):s.push(t)),t.tagName.toLowerCase()===e&&s.push(t)):s.push(t);return 0===s.length?null:s},e.getSiblings=function(t){for(var e=[],n=t.parentNode.firstChild;n;n=n.nextSibling)1===n.nodeType&&n!==t&&e.push(n);return e},e.getQueryString=function(t,e){var n=e?e:window.location.href,r=new RegExp("[?&]"+t+"=([^&#]*)","i"),o=r.exec(n);return o?o[1]:null},e}); \ No newline at end of file diff --git a/dist/js/smooth-scroll.js b/dist/js/smooth-scroll.js index 84028d1..3edd05d 100755 --- a/dist/js/smooth-scroll.js +++ b/dist/js/smooth-scroll.js @@ -1,5 +1,5 @@ /** - * smooth-scroll v6.0.0 + * smooth-scroll v7.0.0 * Animate scrolling to anchor links, by Chris Ferdinandi. * http://github.com/cferdinandi/smooth-scroll * @@ -33,8 +33,7 @@ easing: 'easeInOutCubic', offset: 0, updateURL: true, - callbackBefore: function () {}, - callbackAfter: function () {} + callback: function () {} }; @@ -42,6 +41,133 @@ // Methods // + /** + * Merge two or more objects. Returns a new object. + * @private + * @param {Boolean} deep If true, do a deep (or recursive) merge [optional] + * @param {Object} objects The objects to merge together + * @returns {Object} Merged values of defaults and options + */ + var extend = function () { + + // Variables + var extended = {}; + var deep = false; + var i = 0; + var length = arguments.length; + + // Check if a deep merge + if ( Object.prototype.toString.call( arguments[0] ) === '[object Boolean]' ) { + deep = arguments[0]; + i++; + } + + // Merge the object into the extended object + var merge = function (obj) { + for ( var prop in obj ) { + if ( Object.prototype.hasOwnProperty.call( obj, prop ) ) { + // If deep merge and property is an object, merge properties + if ( deep && Object.prototype.toString.call(obj[prop]) === '[object Object]' ) { + extended[prop] = extend( true, extended[prop], obj[prop] ); + } else { + extended[prop] = obj[prop]; + } + } + } + }; + + // Loop through each object and conduct a merge + for ( ; i < length; i++ ) { + var obj = arguments[i]; + merge(obj); + } + + return extended; + + }; + + /** + * Get the height of an element. + * @private + * @param {Node} elem The element to get the height of + * @return {Number} The element's height in pixels + */ + var getHeight = function ( elem ) { + return Math.max( elem.scrollHeight, elem.offsetHeight, elem.clientHeight ); + }; + + /** + * Get the closest matching element up the DOM tree. + * @private + * @param {Element} elem Starting element + * @param {String} selector Selector to match against (class, ID, data attribute, or tag) + * @return {Boolean|Element} Returns null if not match found + */ + var getClosest = function ( elem, selector ) { + + // Variables + var firstChar = selector.charAt(0); + var supports = 'classList' in document.documentElement; + var attribute, value; + + // If selector is a data attribute, split attribute from value + if ( firstChar === '[' ) { + selector = selector.substr(1, selector.length - 2); + attribute = selector.split( '=' ); + + if ( attribute.length > 1 ) { + value = true; + attribute[1] = attribute[1].replace( /"/g, '' ).replace( /'/g, '' ); + } + } + + // Get closest match + for ( ; elem && elem !== document; elem = elem.parentNode ) { + + // If selector is a class + if ( firstChar === '.' ) { + if ( supports ) { + if ( elem.classList.contains( selector.substr(1) ) ) { + return elem; + } + } else { + if ( new RegExp('(^|\\s)' + selector.substr(1) + '(\\s|$)').test( elem.className ) ) { + return elem; + } + } + } + + // If selector is an ID + if ( firstChar === '#' ) { + if ( elem.id === selector.substr(1) ) { + return elem; + } + } + + // If selector is a data attribute + if ( firstChar === '[' ) { + if ( elem.hasAttribute( attribute[0] ) ) { + if ( value ) { + if ( elem.getAttribute( attribute[0] ) === attribute[1] ) { + return elem; + } + } else { + return elem; + } + } + } + + // If selector is a tag + if ( elem.tagName.toLowerCase() === selector ) { + return elem; + } + + } + + return null; + + }; + /** * Escape special characters for use with querySelector * @private @@ -195,7 +321,7 @@ }; var getHeaderHeight = function ( header ) { - return header === null ? 0 : ( buoy.getHeight( header ) + header.offsetTop ); + return header === null ? 0 : ( getHeight( header ) + header.offsetTop ); }; /** @@ -209,7 +335,7 @@ // Options and overrides var overrides = getDataOptions( toggle ? toggle.getAttribute('data-options') : null ); - var settings = buoy.extend( settings || defaults, options || {}, overrides ); // Merge user options with defaults + var settings = extend( settings || defaults, options || {}, overrides ); // Merge user options with defaults anchor = '#' + escapeCharacters(anchor.substr(1)); // Escape special characters and leading numbers // Selectors and variables @@ -239,7 +365,7 @@ if ( position == endLocation || currentLocation == endLocation || ( (root.innerHeight + currentLocation) >= documentHeight ) ) { clearInterval(animationInterval); anchorElem.focus(); - settings.callbackAfter( toggle, anchor ); // Run callbacks after animation complete + settings.callback( toggle, anchor ); // Run callbacks after animation complete } }; @@ -261,7 +387,6 @@ * @private */ var startAnimateScroll = function () { - settings.callbackBefore( toggle, anchor ); // Run callbacks before animating scroll animationInterval = setInterval(loopAnimateScroll, 16); }; @@ -283,7 +408,7 @@ * @private */ var eventHandler = function (event) { - var toggle = buoy.getClosest(event.target, '[data-scroll]'); + var toggle = getClosest(event.target, '[data-scroll]'); if ( toggle && toggle.tagName.toLowerCase() === 'a' ) { event.preventDefault(); // Prevent default click event smoothScroll.animateScroll( toggle, toggle.hash, settings); // Animate scroll @@ -339,7 +464,7 @@ smoothScroll.destroy(); // Selectors and variables - settings = buoy.extend( defaults, options || {} ); // Merge user options with defaults + settings = extend( defaults, options || {} ); // Merge user options with defaults fixedHeader = root.document.querySelector('[data-scroll-header]'); // Get the fixed header headerHeight = getHeaderHeight( fixedHeader ); diff --git a/dist/js/smooth-scroll.min.js b/dist/js/smooth-scroll.min.js index f0f2d0e..31263ee 100755 --- a/dist/js/smooth-scroll.min.js +++ b/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ -/** smooth-scroll v6.0.0, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ -!function(e,t){"function"==typeof define&&define.amd?define(["buoy"],t(e)):"object"==typeof exports?module.exports=t(e,require("buoy")):e.smoothScroll=t(e,e.buoy)}("undefined"!=typeof global?global:this.window||this.global,function(e){"use strict";var t,n,o,a,r={},u=!!e.document.querySelector&&!!e.addEventListener,c={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},i=function(e){for(var t,n=String(e),o=n.length,a=-1,r="",u=n.charCodeAt(0);++a=1&&31>=t||127==t||0===a&&t>=48&&57>=t||1===a&&t>=48&&57>=t&&45===u?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(a):"\\"+n.charAt(a)}return r},l=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},s=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=o-t-n,o>=0?o:0},f=function(){return Math.max(e.document.body.scrollHeight,e.document.documentElement.scrollHeight,e.document.body.offsetHeight,e.document.documentElement.offsetHeight,e.document.body.clientHeight,e.document.documentElement.clientHeight)},d=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},h=function(t,n){e.history.pushState&&(n||"true"===n)&&e.history.pushState(null,null,[e.location.protocol,"//",e.location.host,e.location.pathname,e.location.search,t].join(""))},m=function(e){return null===e?0:buoy.getHeight(e)+e.offsetTop};r.animateScroll=function(t,n,r){var u=d(t?t.getAttribute("data-options"):null),p=buoy.extend(p||c,r||{},u);n="#"+i(n.substr(1));var b="#"===n?e.document.documentElement:e.document.querySelector(n),g=e.pageYOffset;o||(o=e.document.querySelector("[data-scroll-header]")),a||(a=m(o));var v,y,I,O=s(b,a,parseInt(p.offset,10)),S=O-g,E=f(),C=0;h(n,p.updateURL);var Q=function(o,a,r){var u=e.pageYOffset;(o==a||u==a||e.innerHeight+u>=E)&&(clearInterval(r),b.focus(),p.callbackAfter(t,n))},H=function(){C+=16,y=C/parseInt(p.speed,10),y=y>1?1:y,I=g+S*l(p.easing,y),e.scrollTo(0,Math.floor(I)),Q(I,O,v)},L=function(){p.callbackBefore(t,n),v=setInterval(H,16)};0===e.pageYOffset&&e.scrollTo(0,0),L()};var p=function(e){var n=buoy.getClosest(e.target,"[data-scroll]");n&&"a"===n.tagName.toLowerCase()&&(e.preventDefault(),r.animateScroll(n,n.hash,t))},b=function(e){n||(n=setTimeout(function(){n=null,a=m(o)},66))};return r.destroy=function(){t&&(e.document.removeEventListener("click",p,!1),e.removeEventListener("resize",b,!1),t=null,n=null,o=null,a=null)},r.init=function(n){u&&(r.destroy(),t=buoy.extend(c,n||{}),o=e.document.querySelector("[data-scroll-header]"),a=m(o),e.document.addEventListener("click",p,!1),o&&e.addEventListener("resize",b,!1))},r}); \ No newline at end of file +/** smooth-scroll v7.0.0, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ +!function(e,t){"function"==typeof define&&define.amd?define(["buoy"],t(e)):"object"==typeof exports?module.exports=t(e,require("buoy")):e.smoothScroll=t(e,e.buoy)}("undefined"!=typeof global?global:this.window||this.global,function(e){"use strict";var t,n,o,r,a={},u=!!e.document.querySelector&&!!e.addEventListener,c={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callback:function(){}},i=function(){var e={},t=!1,n=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(t=arguments[0],n++);for(var r=function(n){for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(e[o]=t&&"[object Object]"===Object.prototype.toString.call(n[o])?i(!0,e[o],n[o]):n[o])};o>n;n++){var a=arguments[n];r(a)}return e},s=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},l=function(e,t){var n,o,r=t.charAt(0),a="classList"in document.documentElement;for("["===r&&(t=t.substr(1,t.length-2),n=t.split("="),n.length>1&&(o=!0,n[1]=n[1].replace(/"/g,"").replace(/'/g,"")));e&&e!==document;e=e.parentNode){if("."===r)if(a){if(e.classList.contains(t.substr(1)))return e}else if(new RegExp("(^|\\s)"+t.substr(1)+"(\\s|$)").test(e.className))return e;if("#"===r&&e.id===t.substr(1))return e;if("["===r&&e.hasAttribute(n[0])){if(!o)return e;if(e.getAttribute(n[0])===n[1])return e}if(e.tagName.toLowerCase()===t)return e}return null},f=function(e){for(var t,n=String(e),o=n.length,r=-1,a="",u=n.charCodeAt(0);++r=1&&31>=t||127==t||0===r&&t>=48&&57>=t||1===r&&t>=48&&57>=t&&45===u?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(r):"\\"+n.charAt(r)}return a},d=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},h=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=o-t-n,o>=0?o:0},m=function(){return Math.max(e.document.body.scrollHeight,e.document.documentElement.scrollHeight,e.document.body.offsetHeight,e.document.documentElement.offsetHeight,e.document.body.clientHeight,e.document.documentElement.clientHeight)},p=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},g=function(t,n){e.history.pushState&&(n||"true"===n)&&e.history.pushState(null,null,[e.location.protocol,"//",e.location.host,e.location.pathname,e.location.search,t].join(""))},b=function(e){return null===e?0:s(e)+e.offsetTop};a.animateScroll=function(t,n,a){var u=p(t?t.getAttribute("data-options"):null),s=i(s||c,a||{},u);n="#"+f(n.substr(1));var l="#"===n?e.document.documentElement:e.document.querySelector(n),v=e.pageYOffset;o||(o=e.document.querySelector("[data-scroll-header]")),r||(r=b(o));var y,O,S,I=h(l,r,parseInt(s.offset,10)),E=I-v,L=m(),H=0;g(n,s.updateURL);var j=function(o,r,a){var u=e.pageYOffset;(o==r||u==r||e.innerHeight+u>=L)&&(clearInterval(a),l.focus(),s.callback(t,n))},w=function(){H+=16,O=H/parseInt(s.speed,10),O=O>1?1:O,S=v+E*d(s.easing,O),e.scrollTo(0,Math.floor(S)),j(S,I,y)},C=function(){y=setInterval(w,16)};0===e.pageYOffset&&e.scrollTo(0,0),C()};var v=function(e){var n=l(e.target,"[data-scroll]");n&&"a"===n.tagName.toLowerCase()&&(e.preventDefault(),a.animateScroll(n,n.hash,t))},y=function(e){n||(n=setTimeout(function(){n=null,r=b(o)},66))};return a.destroy=function(){t&&(e.document.removeEventListener("click",v,!1),e.removeEventListener("resize",y,!1),t=null,n=null,o=null,r=null)},a.init=function(n){u&&(a.destroy(),t=i(c,n||{}),o=e.document.querySelector("[data-scroll-header]"),r=b(o),e.document.addEventListener("click",v,!1),o&&e.addEventListener("resize",y,!1))},a}); \ No newline at end of file diff --git a/docs/dist/js/buoy.js b/docs/dist/js/buoy.js index 8a71d67..ea39a59 100755 --- a/docs/dist/js/buoy.js +++ b/docs/dist/js/buoy.js @@ -1,5 +1,5 @@ /** - * smooth-scroll v6.0.0 + * smooth-scroll v7.0.0 * Animate scrolling to anchor links, by Chris Ferdinandi. * http://github.com/cferdinandi/smooth-scroll * diff --git a/docs/dist/js/buoy.min.js b/docs/dist/js/buoy.min.js index 4b5b6e3..fb59080 100755 --- a/docs/dist/js/buoy.min.js +++ b/docs/dist/js/buoy.min.js @@ -1,2 +1,2 @@ -/** smooth-scroll v6.0.0, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ +/** smooth-scroll v7.0.0, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ !function(t,e){"function"==typeof define&&define.amd?define([],e(t)):"object"==typeof exports?module.exports=e(t):t.buoy=e(t)}("undefined"!=typeof global?global:this.window||this.global,function(t){"use strict";var e={};return e.ready=function(t){return"function"==typeof t?"complete"===document.readyState?t():void document.addEventListener("DOMContentLoaded",t,!1):void 0},e.forEach=function(t,e,n){if("[object Object]"===Object.prototype.toString.call(t))for(var r in t)Object.prototype.hasOwnProperty.call(t,r)&&e.call(n,t[r],r,t);else for(var o=0,s=t.length;s>o;o++)e.call(n,t[o],o,t)},e.extend=function(){var t={},n=!1,r=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(n=arguments[0],r++);for(var s=function(r){for(var o in r)Object.prototype.hasOwnProperty.call(r,o)&&(t[o]=n&&"[object Object]"===Object.prototype.toString.call(r[o])?e.extend(!0,t[o],r[o]):r[o])};o>r;r++){var i=arguments[r];s(i)}return t},e.getHeight=function(t){return Math.max(t.scrollHeight,t.offsetHeight,t.clientHeight)},e.getOffsetTop=function(t){var e=0;if(t.offsetParent)do e+=t.offsetTop,t=t.offsetParent;while(t);return e>=0?e:0},e.getClosest=function(t,e){var n,r,o=e.charAt(0),s="classList"in document.documentElement;for("["===o&&(e=e.substr(1,e.length-2),n=e.split("="),n.length>1&&(r=!0,n[1]=n[1].replace(/"/g,"").replace(/'/g,"")));t&&t!==document;t=t.parentNode){if("."===o)if(s){if(t.classList.contains(e.substr(1)))return t}else if(new RegExp("(^|\\s)"+e.substr(1)+"(\\s|$)").test(t.className))return t;if("#"===o&&t.id===e.substr(1))return t;if("["===o&&t.hasAttribute(n[0])){if(!r)return t;if(t.getAttribute(n[0])===n[1])return t}if(t.tagName.toLowerCase()===e)return t}return null},e.getParents=function(t,e){var n,r,o,s=[],i="classList"in document.documentElement;for(e&&(n=e.charAt(0),"["===n&&(e=e.substr(1,e.length-2),r=e.split("="),r.length>1&&(o=!0,r[1]=r[1].replace(/"/g,"").replace(/'/g,""))));t&&t!==document;t=t.parentNode)e?("."===n&&(i?t.classList.contains(e.substr(1))&&s.push(t):new RegExp("(^|\\s)"+e.substr(1)+"(\\s|$)").test(t.className)&&s.push(t)),"#"===n&&t.id===e.substr(1)&&s.push(t),"["===n&&t.hasAttribute(r[0])&&(o?t.getAttribute(r[0])===r[1]&&s.push(t):s.push(t)),t.tagName.toLowerCase()===e&&s.push(t)):s.push(t);return 0===s.length?null:s},e.getSiblings=function(t){for(var e=[],n=t.parentNode.firstChild;n;n=n.nextSibling)1===n.nodeType&&n!==t&&e.push(n);return e},e.getQueryString=function(t,e){var n=e?e:window.location.href,r=new RegExp("[?&]"+t+"=([^&#]*)","i"),o=r.exec(n);return o?o[1]:null},e}); \ No newline at end of file diff --git a/docs/dist/js/smooth-scroll.js b/docs/dist/js/smooth-scroll.js index 84028d1..3edd05d 100755 --- a/docs/dist/js/smooth-scroll.js +++ b/docs/dist/js/smooth-scroll.js @@ -1,5 +1,5 @@ /** - * smooth-scroll v6.0.0 + * smooth-scroll v7.0.0 * Animate scrolling to anchor links, by Chris Ferdinandi. * http://github.com/cferdinandi/smooth-scroll * @@ -33,8 +33,7 @@ easing: 'easeInOutCubic', offset: 0, updateURL: true, - callbackBefore: function () {}, - callbackAfter: function () {} + callback: function () {} }; @@ -42,6 +41,133 @@ // Methods // + /** + * Merge two or more objects. Returns a new object. + * @private + * @param {Boolean} deep If true, do a deep (or recursive) merge [optional] + * @param {Object} objects The objects to merge together + * @returns {Object} Merged values of defaults and options + */ + var extend = function () { + + // Variables + var extended = {}; + var deep = false; + var i = 0; + var length = arguments.length; + + // Check if a deep merge + if ( Object.prototype.toString.call( arguments[0] ) === '[object Boolean]' ) { + deep = arguments[0]; + i++; + } + + // Merge the object into the extended object + var merge = function (obj) { + for ( var prop in obj ) { + if ( Object.prototype.hasOwnProperty.call( obj, prop ) ) { + // If deep merge and property is an object, merge properties + if ( deep && Object.prototype.toString.call(obj[prop]) === '[object Object]' ) { + extended[prop] = extend( true, extended[prop], obj[prop] ); + } else { + extended[prop] = obj[prop]; + } + } + } + }; + + // Loop through each object and conduct a merge + for ( ; i < length; i++ ) { + var obj = arguments[i]; + merge(obj); + } + + return extended; + + }; + + /** + * Get the height of an element. + * @private + * @param {Node} elem The element to get the height of + * @return {Number} The element's height in pixels + */ + var getHeight = function ( elem ) { + return Math.max( elem.scrollHeight, elem.offsetHeight, elem.clientHeight ); + }; + + /** + * Get the closest matching element up the DOM tree. + * @private + * @param {Element} elem Starting element + * @param {String} selector Selector to match against (class, ID, data attribute, or tag) + * @return {Boolean|Element} Returns null if not match found + */ + var getClosest = function ( elem, selector ) { + + // Variables + var firstChar = selector.charAt(0); + var supports = 'classList' in document.documentElement; + var attribute, value; + + // If selector is a data attribute, split attribute from value + if ( firstChar === '[' ) { + selector = selector.substr(1, selector.length - 2); + attribute = selector.split( '=' ); + + if ( attribute.length > 1 ) { + value = true; + attribute[1] = attribute[1].replace( /"/g, '' ).replace( /'/g, '' ); + } + } + + // Get closest match + for ( ; elem && elem !== document; elem = elem.parentNode ) { + + // If selector is a class + if ( firstChar === '.' ) { + if ( supports ) { + if ( elem.classList.contains( selector.substr(1) ) ) { + return elem; + } + } else { + if ( new RegExp('(^|\\s)' + selector.substr(1) + '(\\s|$)').test( elem.className ) ) { + return elem; + } + } + } + + // If selector is an ID + if ( firstChar === '#' ) { + if ( elem.id === selector.substr(1) ) { + return elem; + } + } + + // If selector is a data attribute + if ( firstChar === '[' ) { + if ( elem.hasAttribute( attribute[0] ) ) { + if ( value ) { + if ( elem.getAttribute( attribute[0] ) === attribute[1] ) { + return elem; + } + } else { + return elem; + } + } + } + + // If selector is a tag + if ( elem.tagName.toLowerCase() === selector ) { + return elem; + } + + } + + return null; + + }; + /** * Escape special characters for use with querySelector * @private @@ -195,7 +321,7 @@ }; var getHeaderHeight = function ( header ) { - return header === null ? 0 : ( buoy.getHeight( header ) + header.offsetTop ); + return header === null ? 0 : ( getHeight( header ) + header.offsetTop ); }; /** @@ -209,7 +335,7 @@ // Options and overrides var overrides = getDataOptions( toggle ? toggle.getAttribute('data-options') : null ); - var settings = buoy.extend( settings || defaults, options || {}, overrides ); // Merge user options with defaults + var settings = extend( settings || defaults, options || {}, overrides ); // Merge user options with defaults anchor = '#' + escapeCharacters(anchor.substr(1)); // Escape special characters and leading numbers // Selectors and variables @@ -239,7 +365,7 @@ if ( position == endLocation || currentLocation == endLocation || ( (root.innerHeight + currentLocation) >= documentHeight ) ) { clearInterval(animationInterval); anchorElem.focus(); - settings.callbackAfter( toggle, anchor ); // Run callbacks after animation complete + settings.callback( toggle, anchor ); // Run callbacks after animation complete } }; @@ -261,7 +387,6 @@ * @private */ var startAnimateScroll = function () { - settings.callbackBefore( toggle, anchor ); // Run callbacks before animating scroll animationInterval = setInterval(loopAnimateScroll, 16); }; @@ -283,7 +408,7 @@ * @private */ var eventHandler = function (event) { - var toggle = buoy.getClosest(event.target, '[data-scroll]'); + var toggle = getClosest(event.target, '[data-scroll]'); if ( toggle && toggle.tagName.toLowerCase() === 'a' ) { event.preventDefault(); // Prevent default click event smoothScroll.animateScroll( toggle, toggle.hash, settings); // Animate scroll @@ -339,7 +464,7 @@ smoothScroll.destroy(); // Selectors and variables - settings = buoy.extend( defaults, options || {} ); // Merge user options with defaults + settings = extend( defaults, options || {} ); // Merge user options with defaults fixedHeader = root.document.querySelector('[data-scroll-header]'); // Get the fixed header headerHeight = getHeaderHeight( fixedHeader ); diff --git a/docs/dist/js/smooth-scroll.min.js b/docs/dist/js/smooth-scroll.min.js index f0f2d0e..31263ee 100755 --- a/docs/dist/js/smooth-scroll.min.js +++ b/docs/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ -/** smooth-scroll v6.0.0, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ -!function(e,t){"function"==typeof define&&define.amd?define(["buoy"],t(e)):"object"==typeof exports?module.exports=t(e,require("buoy")):e.smoothScroll=t(e,e.buoy)}("undefined"!=typeof global?global:this.window||this.global,function(e){"use strict";var t,n,o,a,r={},u=!!e.document.querySelector&&!!e.addEventListener,c={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callbackBefore:function(){},callbackAfter:function(){}},i=function(e){for(var t,n=String(e),o=n.length,a=-1,r="",u=n.charCodeAt(0);++a=1&&31>=t||127==t||0===a&&t>=48&&57>=t||1===a&&t>=48&&57>=t&&45===u?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(a):"\\"+n.charAt(a)}return r},l=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},s=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=o-t-n,o>=0?o:0},f=function(){return Math.max(e.document.body.scrollHeight,e.document.documentElement.scrollHeight,e.document.body.offsetHeight,e.document.documentElement.offsetHeight,e.document.body.clientHeight,e.document.documentElement.clientHeight)},d=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},h=function(t,n){e.history.pushState&&(n||"true"===n)&&e.history.pushState(null,null,[e.location.protocol,"//",e.location.host,e.location.pathname,e.location.search,t].join(""))},m=function(e){return null===e?0:buoy.getHeight(e)+e.offsetTop};r.animateScroll=function(t,n,r){var u=d(t?t.getAttribute("data-options"):null),p=buoy.extend(p||c,r||{},u);n="#"+i(n.substr(1));var b="#"===n?e.document.documentElement:e.document.querySelector(n),g=e.pageYOffset;o||(o=e.document.querySelector("[data-scroll-header]")),a||(a=m(o));var v,y,I,O=s(b,a,parseInt(p.offset,10)),S=O-g,E=f(),C=0;h(n,p.updateURL);var Q=function(o,a,r){var u=e.pageYOffset;(o==a||u==a||e.innerHeight+u>=E)&&(clearInterval(r),b.focus(),p.callbackAfter(t,n))},H=function(){C+=16,y=C/parseInt(p.speed,10),y=y>1?1:y,I=g+S*l(p.easing,y),e.scrollTo(0,Math.floor(I)),Q(I,O,v)},L=function(){p.callbackBefore(t,n),v=setInterval(H,16)};0===e.pageYOffset&&e.scrollTo(0,0),L()};var p=function(e){var n=buoy.getClosest(e.target,"[data-scroll]");n&&"a"===n.tagName.toLowerCase()&&(e.preventDefault(),r.animateScroll(n,n.hash,t))},b=function(e){n||(n=setTimeout(function(){n=null,a=m(o)},66))};return r.destroy=function(){t&&(e.document.removeEventListener("click",p,!1),e.removeEventListener("resize",b,!1),t=null,n=null,o=null,a=null)},r.init=function(n){u&&(r.destroy(),t=buoy.extend(c,n||{}),o=e.document.querySelector("[data-scroll-header]"),a=m(o),e.document.addEventListener("click",p,!1),o&&e.addEventListener("resize",b,!1))},r}); \ No newline at end of file +/** smooth-scroll v7.0.0, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ +!function(e,t){"function"==typeof define&&define.amd?define(["buoy"],t(e)):"object"==typeof exports?module.exports=t(e,require("buoy")):e.smoothScroll=t(e,e.buoy)}("undefined"!=typeof global?global:this.window||this.global,function(e){"use strict";var t,n,o,r,a={},u=!!e.document.querySelector&&!!e.addEventListener,c={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callback:function(){}},i=function(){var e={},t=!1,n=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(t=arguments[0],n++);for(var r=function(n){for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(e[o]=t&&"[object Object]"===Object.prototype.toString.call(n[o])?i(!0,e[o],n[o]):n[o])};o>n;n++){var a=arguments[n];r(a)}return e},s=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},l=function(e,t){var n,o,r=t.charAt(0),a="classList"in document.documentElement;for("["===r&&(t=t.substr(1,t.length-2),n=t.split("="),n.length>1&&(o=!0,n[1]=n[1].replace(/"/g,"").replace(/'/g,"")));e&&e!==document;e=e.parentNode){if("."===r)if(a){if(e.classList.contains(t.substr(1)))return e}else if(new RegExp("(^|\\s)"+t.substr(1)+"(\\s|$)").test(e.className))return e;if("#"===r&&e.id===t.substr(1))return e;if("["===r&&e.hasAttribute(n[0])){if(!o)return e;if(e.getAttribute(n[0])===n[1])return e}if(e.tagName.toLowerCase()===t)return e}return null},f=function(e){for(var t,n=String(e),o=n.length,r=-1,a="",u=n.charCodeAt(0);++r=1&&31>=t||127==t||0===r&&t>=48&&57>=t||1===r&&t>=48&&57>=t&&45===u?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(r):"\\"+n.charAt(r)}return a},d=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},h=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=o-t-n,o>=0?o:0},m=function(){return Math.max(e.document.body.scrollHeight,e.document.documentElement.scrollHeight,e.document.body.offsetHeight,e.document.documentElement.offsetHeight,e.document.body.clientHeight,e.document.documentElement.clientHeight)},p=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},g=function(t,n){e.history.pushState&&(n||"true"===n)&&e.history.pushState(null,null,[e.location.protocol,"//",e.location.host,e.location.pathname,e.location.search,t].join(""))},b=function(e){return null===e?0:s(e)+e.offsetTop};a.animateScroll=function(t,n,a){var u=p(t?t.getAttribute("data-options"):null),s=i(s||c,a||{},u);n="#"+f(n.substr(1));var l="#"===n?e.document.documentElement:e.document.querySelector(n),v=e.pageYOffset;o||(o=e.document.querySelector("[data-scroll-header]")),r||(r=b(o));var y,O,S,I=h(l,r,parseInt(s.offset,10)),E=I-v,L=m(),H=0;g(n,s.updateURL);var j=function(o,r,a){var u=e.pageYOffset;(o==r||u==r||e.innerHeight+u>=L)&&(clearInterval(a),l.focus(),s.callback(t,n))},w=function(){H+=16,O=H/parseInt(s.speed,10),O=O>1?1:O,S=v+E*d(s.easing,O),e.scrollTo(0,Math.floor(S)),j(S,I,y)},C=function(){y=setInterval(w,16)};0===e.pageYOffset&&e.scrollTo(0,0),C()};var v=function(e){var n=l(e.target,"[data-scroll]");n&&"a"===n.tagName.toLowerCase()&&(e.preventDefault(),a.animateScroll(n,n.hash,t))},y=function(e){n||(n=setTimeout(function(){n=null,r=b(o)},66))};return a.destroy=function(){t&&(e.document.removeEventListener("click",v,!1),e.removeEventListener("resize",y,!1),t=null,n=null,o=null,r=null)},a.init=function(n){u&&(a.destroy(),t=i(c,n||{}),o=e.document.querySelector("[data-scroll-header]"),r=b(o),e.document.addEventListener("click",v,!1),o&&e.addEventListener("resize",y,!1))},a}); \ No newline at end of file diff --git a/docs/index.html b/docs/index.html index adfd08e..ab6d52c 100644 --- a/docs/index.html +++ b/docs/index.html @@ -77,8 +77,7 @@

Smooth Scroll

easing: 'easeInOutCubic', offset: 0, updateURL: true, - callbackBefore: function ( toggle, anchor ) {}, - callbackAfter: function ( toggle, anchor ) {} + callback: function ( toggle, anchor ) {} }); diff --git a/package.json b/package.json index 05b0749..ffc1677 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "smooth-scroll", - "version": "6.0.0", + "version": "7.0.0", "description": "Animate scrolling to anchor links", "main": "./dist/js/smooth-scroll.js", "author": { diff --git a/src/docs/_templates/_footer.html b/src/docs/_templates/_footer.html index 2f3421a..d8d3a12 100644 --- a/src/docs/_templates/_footer.html +++ b/src/docs/_templates/_footer.html @@ -11,8 +11,7 @@ easing: 'easeInOutCubic', offset: 0, updateURL: true, - callbackBefore: function ( toggle, anchor ) {}, - callbackAfter: function ( toggle, anchor ) {} + callback: function ( toggle, anchor ) {} }); diff --git a/src/js/smooth-scroll.js b/src/js/smooth-scroll.js index aa2624b..336c715 100755 --- a/src/js/smooth-scroll.js +++ b/src/js/smooth-scroll.js @@ -24,8 +24,7 @@ easing: 'easeInOutCubic', offset: 0, updateURL: true, - callbackBefore: function () {}, - callbackAfter: function () {} + callback: function () {} }; @@ -33,6 +32,133 @@ // Methods // + /** + * Merge two or more objects. Returns a new object. + * @private + * @param {Boolean} deep If true, do a deep (or recursive) merge [optional] + * @param {Object} objects The objects to merge together + * @returns {Object} Merged values of defaults and options + */ + var extend = function () { + + // Variables + var extended = {}; + var deep = false; + var i = 0; + var length = arguments.length; + + // Check if a deep merge + if ( Object.prototype.toString.call( arguments[0] ) === '[object Boolean]' ) { + deep = arguments[0]; + i++; + } + + // Merge the object into the extended object + var merge = function (obj) { + for ( var prop in obj ) { + if ( Object.prototype.hasOwnProperty.call( obj, prop ) ) { + // If deep merge and property is an object, merge properties + if ( deep && Object.prototype.toString.call(obj[prop]) === '[object Object]' ) { + extended[prop] = extend( true, extended[prop], obj[prop] ); + } else { + extended[prop] = obj[prop]; + } + } + } + }; + + // Loop through each object and conduct a merge + for ( ; i < length; i++ ) { + var obj = arguments[i]; + merge(obj); + } + + return extended; + + }; + + /** + * Get the height of an element. + * @private + * @param {Node} elem The element to get the height of + * @return {Number} The element's height in pixels + */ + var getHeight = function ( elem ) { + return Math.max( elem.scrollHeight, elem.offsetHeight, elem.clientHeight ); + }; + + /** + * Get the closest matching element up the DOM tree. + * @private + * @param {Element} elem Starting element + * @param {String} selector Selector to match against (class, ID, data attribute, or tag) + * @return {Boolean|Element} Returns null if not match found + */ + var getClosest = function ( elem, selector ) { + + // Variables + var firstChar = selector.charAt(0); + var supports = 'classList' in document.documentElement; + var attribute, value; + + // If selector is a data attribute, split attribute from value + if ( firstChar === '[' ) { + selector = selector.substr(1, selector.length - 2); + attribute = selector.split( '=' ); + + if ( attribute.length > 1 ) { + value = true; + attribute[1] = attribute[1].replace( /"/g, '' ).replace( /'/g, '' ); + } + } + + // Get closest match + for ( ; elem && elem !== document; elem = elem.parentNode ) { + + // If selector is a class + if ( firstChar === '.' ) { + if ( supports ) { + if ( elem.classList.contains( selector.substr(1) ) ) { + return elem; + } + } else { + if ( new RegExp('(^|\\s)' + selector.substr(1) + '(\\s|$)').test( elem.className ) ) { + return elem; + } + } + } + + // If selector is an ID + if ( firstChar === '#' ) { + if ( elem.id === selector.substr(1) ) { + return elem; + } + } + + // If selector is a data attribute + if ( firstChar === '[' ) { + if ( elem.hasAttribute( attribute[0] ) ) { + if ( value ) { + if ( elem.getAttribute( attribute[0] ) === attribute[1] ) { + return elem; + } + } else { + return elem; + } + } + } + + // If selector is a tag + if ( elem.tagName.toLowerCase() === selector ) { + return elem; + } + + } + + return null; + + }; + /** * Escape special characters for use with querySelector * @private @@ -186,7 +312,7 @@ }; var getHeaderHeight = function ( header ) { - return header === null ? 0 : ( buoy.getHeight( header ) + header.offsetTop ); + return header === null ? 0 : ( getHeight( header ) + header.offsetTop ); }; /** @@ -200,7 +326,7 @@ // Options and overrides var overrides = getDataOptions( toggle ? toggle.getAttribute('data-options') : null ); - var settings = buoy.extend( settings || defaults, options || {}, overrides ); // Merge user options with defaults + var settings = extend( settings || defaults, options || {}, overrides ); // Merge user options with defaults anchor = '#' + escapeCharacters(anchor.substr(1)); // Escape special characters and leading numbers // Selectors and variables @@ -230,7 +356,7 @@ if ( position == endLocation || currentLocation == endLocation || ( (root.innerHeight + currentLocation) >= documentHeight ) ) { clearInterval(animationInterval); anchorElem.focus(); - settings.callbackAfter( toggle, anchor ); // Run callbacks after animation complete + settings.callback( toggle, anchor ); // Run callbacks after animation complete } }; @@ -252,7 +378,6 @@ * @private */ var startAnimateScroll = function () { - settings.callbackBefore( toggle, anchor ); // Run callbacks before animating scroll animationInterval = setInterval(loopAnimateScroll, 16); }; @@ -274,7 +399,7 @@ * @private */ var eventHandler = function (event) { - var toggle = buoy.getClosest(event.target, '[data-scroll]'); + var toggle = getClosest(event.target, '[data-scroll]'); if ( toggle && toggle.tagName.toLowerCase() === 'a' ) { event.preventDefault(); // Prevent default click event smoothScroll.animateScroll( toggle, toggle.hash, settings); // Animate scroll @@ -330,7 +455,7 @@ smoothScroll.destroy(); // Selectors and variables - settings = buoy.extend( defaults, options || {} ); // Merge user options with defaults + settings = extend( defaults, options || {} ); // Merge user options with defaults fixedHeader = root.document.querySelector('[data-scroll-header]'); // Get the fixed header headerHeight = getHeaderHeight( fixedHeader ); diff --git a/test/spec/spec-smoothScroll.js b/test/spec/spec-smoothScroll.js index 37a9e78..a9f445d 100755 --- a/test/spec/spec-smoothScroll.js +++ b/test/spec/spec-smoothScroll.js @@ -38,8 +38,7 @@ describe('Smooth Scroll', function () { easing: jasmine.any(String), offset: jasmine.any(Number), updateURL: jasmine.any(Boolean), - callbackBefore: jasmine.any(Function), - callbackAfter: jasmine.any(Function) + callback: jasmine.any(Function) }; @@ -121,27 +120,9 @@ describe('Smooth Scroll', function () { smoothScroll.destroy(); }); - it('Should run callback before', function (done) { + it('Should run callback', function (done) { var settings = { - callbackBefore: callback(elt, '#anchor', done) - }; - smoothScroll.init(settings); - simulateClick(elt); - }); - - it('Should run callback after', function (done) { - var settings = { - callbackAfter: callback(elt, '#anchor', done) - }; - smoothScroll.init(settings); - simulateClick(elt); - }); - - it('Should run callbacks in the right order', function (done) { - var settings = { - // The before callback will not trigger done(). - callbackBefore: callback(elt, '#anchor', function () {}), - callbackAfter: callback(elt, '#anchor', done) + callback: callback(elt, '#anchor', done) }; smoothScroll.init(settings); simulateClick(elt); From c4dedeb24cef43d62b230a5c4571958bd7c6982d Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Fri, 10 Jul 2015 15:00:29 -0400 Subject: [PATCH 144/285] v7.0.1 Ran build to fix dependency break. --- dist/js/buoy.js | 2 +- dist/js/buoy.min.js | 2 +- dist/js/smooth-scroll.js | 2 +- dist/js/smooth-scroll.min.js | 2 +- docs/dist/js/buoy.js | 2 +- docs/dist/js/buoy.min.js | 2 +- docs/dist/js/smooth-scroll.js | 2 +- docs/dist/js/smooth-scroll.min.js | 2 +- package.json | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dist/js/buoy.js b/dist/js/buoy.js index ea39a59..00ea0c3 100755 --- a/dist/js/buoy.js +++ b/dist/js/buoy.js @@ -1,5 +1,5 @@ /** - * smooth-scroll v7.0.0 + * smooth-scroll v7.0.1 * Animate scrolling to anchor links, by Chris Ferdinandi. * http://github.com/cferdinandi/smooth-scroll * diff --git a/dist/js/buoy.min.js b/dist/js/buoy.min.js index fb59080..9f277ec 100755 --- a/dist/js/buoy.min.js +++ b/dist/js/buoy.min.js @@ -1,2 +1,2 @@ -/** smooth-scroll v7.0.0, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ +/** smooth-scroll v7.0.1, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ !function(t,e){"function"==typeof define&&define.amd?define([],e(t)):"object"==typeof exports?module.exports=e(t):t.buoy=e(t)}("undefined"!=typeof global?global:this.window||this.global,function(t){"use strict";var e={};return e.ready=function(t){return"function"==typeof t?"complete"===document.readyState?t():void document.addEventListener("DOMContentLoaded",t,!1):void 0},e.forEach=function(t,e,n){if("[object Object]"===Object.prototype.toString.call(t))for(var r in t)Object.prototype.hasOwnProperty.call(t,r)&&e.call(n,t[r],r,t);else for(var o=0,s=t.length;s>o;o++)e.call(n,t[o],o,t)},e.extend=function(){var t={},n=!1,r=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(n=arguments[0],r++);for(var s=function(r){for(var o in r)Object.prototype.hasOwnProperty.call(r,o)&&(t[o]=n&&"[object Object]"===Object.prototype.toString.call(r[o])?e.extend(!0,t[o],r[o]):r[o])};o>r;r++){var i=arguments[r];s(i)}return t},e.getHeight=function(t){return Math.max(t.scrollHeight,t.offsetHeight,t.clientHeight)},e.getOffsetTop=function(t){var e=0;if(t.offsetParent)do e+=t.offsetTop,t=t.offsetParent;while(t);return e>=0?e:0},e.getClosest=function(t,e){var n,r,o=e.charAt(0),s="classList"in document.documentElement;for("["===o&&(e=e.substr(1,e.length-2),n=e.split("="),n.length>1&&(r=!0,n[1]=n[1].replace(/"/g,"").replace(/'/g,"")));t&&t!==document;t=t.parentNode){if("."===o)if(s){if(t.classList.contains(e.substr(1)))return t}else if(new RegExp("(^|\\s)"+e.substr(1)+"(\\s|$)").test(t.className))return t;if("#"===o&&t.id===e.substr(1))return t;if("["===o&&t.hasAttribute(n[0])){if(!r)return t;if(t.getAttribute(n[0])===n[1])return t}if(t.tagName.toLowerCase()===e)return t}return null},e.getParents=function(t,e){var n,r,o,s=[],i="classList"in document.documentElement;for(e&&(n=e.charAt(0),"["===n&&(e=e.substr(1,e.length-2),r=e.split("="),r.length>1&&(o=!0,r[1]=r[1].replace(/"/g,"").replace(/'/g,""))));t&&t!==document;t=t.parentNode)e?("."===n&&(i?t.classList.contains(e.substr(1))&&s.push(t):new RegExp("(^|\\s)"+e.substr(1)+"(\\s|$)").test(t.className)&&s.push(t)),"#"===n&&t.id===e.substr(1)&&s.push(t),"["===n&&t.hasAttribute(r[0])&&(o?t.getAttribute(r[0])===r[1]&&s.push(t):s.push(t)),t.tagName.toLowerCase()===e&&s.push(t)):s.push(t);return 0===s.length?null:s},e.getSiblings=function(t){for(var e=[],n=t.parentNode.firstChild;n;n=n.nextSibling)1===n.nodeType&&n!==t&&e.push(n);return e},e.getQueryString=function(t,e){var n=e?e:window.location.href,r=new RegExp("[?&]"+t+"=([^&#]*)","i"),o=r.exec(n);return o?o[1]:null},e}); \ No newline at end of file diff --git a/dist/js/smooth-scroll.js b/dist/js/smooth-scroll.js index 3edd05d..82f06df 100755 --- a/dist/js/smooth-scroll.js +++ b/dist/js/smooth-scroll.js @@ -1,5 +1,5 @@ /** - * smooth-scroll v7.0.0 + * smooth-scroll v7.0.1 * Animate scrolling to anchor links, by Chris Ferdinandi. * http://github.com/cferdinandi/smooth-scroll * diff --git a/dist/js/smooth-scroll.min.js b/dist/js/smooth-scroll.min.js index 31263ee..edab2a4 100755 --- a/dist/js/smooth-scroll.min.js +++ b/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ -/** smooth-scroll v7.0.0, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ +/** smooth-scroll v7.0.1, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ !function(e,t){"function"==typeof define&&define.amd?define(["buoy"],t(e)):"object"==typeof exports?module.exports=t(e,require("buoy")):e.smoothScroll=t(e,e.buoy)}("undefined"!=typeof global?global:this.window||this.global,function(e){"use strict";var t,n,o,r,a={},u=!!e.document.querySelector&&!!e.addEventListener,c={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callback:function(){}},i=function(){var e={},t=!1,n=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(t=arguments[0],n++);for(var r=function(n){for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(e[o]=t&&"[object Object]"===Object.prototype.toString.call(n[o])?i(!0,e[o],n[o]):n[o])};o>n;n++){var a=arguments[n];r(a)}return e},s=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},l=function(e,t){var n,o,r=t.charAt(0),a="classList"in document.documentElement;for("["===r&&(t=t.substr(1,t.length-2),n=t.split("="),n.length>1&&(o=!0,n[1]=n[1].replace(/"/g,"").replace(/'/g,"")));e&&e!==document;e=e.parentNode){if("."===r)if(a){if(e.classList.contains(t.substr(1)))return e}else if(new RegExp("(^|\\s)"+t.substr(1)+"(\\s|$)").test(e.className))return e;if("#"===r&&e.id===t.substr(1))return e;if("["===r&&e.hasAttribute(n[0])){if(!o)return e;if(e.getAttribute(n[0])===n[1])return e}if(e.tagName.toLowerCase()===t)return e}return null},f=function(e){for(var t,n=String(e),o=n.length,r=-1,a="",u=n.charCodeAt(0);++r=1&&31>=t||127==t||0===r&&t>=48&&57>=t||1===r&&t>=48&&57>=t&&45===u?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(r):"\\"+n.charAt(r)}return a},d=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},h=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=o-t-n,o>=0?o:0},m=function(){return Math.max(e.document.body.scrollHeight,e.document.documentElement.scrollHeight,e.document.body.offsetHeight,e.document.documentElement.offsetHeight,e.document.body.clientHeight,e.document.documentElement.clientHeight)},p=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},g=function(t,n){e.history.pushState&&(n||"true"===n)&&e.history.pushState(null,null,[e.location.protocol,"//",e.location.host,e.location.pathname,e.location.search,t].join(""))},b=function(e){return null===e?0:s(e)+e.offsetTop};a.animateScroll=function(t,n,a){var u=p(t?t.getAttribute("data-options"):null),s=i(s||c,a||{},u);n="#"+f(n.substr(1));var l="#"===n?e.document.documentElement:e.document.querySelector(n),v=e.pageYOffset;o||(o=e.document.querySelector("[data-scroll-header]")),r||(r=b(o));var y,O,S,I=h(l,r,parseInt(s.offset,10)),E=I-v,L=m(),H=0;g(n,s.updateURL);var j=function(o,r,a){var u=e.pageYOffset;(o==r||u==r||e.innerHeight+u>=L)&&(clearInterval(a),l.focus(),s.callback(t,n))},w=function(){H+=16,O=H/parseInt(s.speed,10),O=O>1?1:O,S=v+E*d(s.easing,O),e.scrollTo(0,Math.floor(S)),j(S,I,y)},C=function(){y=setInterval(w,16)};0===e.pageYOffset&&e.scrollTo(0,0),C()};var v=function(e){var n=l(e.target,"[data-scroll]");n&&"a"===n.tagName.toLowerCase()&&(e.preventDefault(),a.animateScroll(n,n.hash,t))},y=function(e){n||(n=setTimeout(function(){n=null,r=b(o)},66))};return a.destroy=function(){t&&(e.document.removeEventListener("click",v,!1),e.removeEventListener("resize",y,!1),t=null,n=null,o=null,r=null)},a.init=function(n){u&&(a.destroy(),t=i(c,n||{}),o=e.document.querySelector("[data-scroll-header]"),r=b(o),e.document.addEventListener("click",v,!1),o&&e.addEventListener("resize",y,!1))},a}); \ No newline at end of file diff --git a/docs/dist/js/buoy.js b/docs/dist/js/buoy.js index ea39a59..00ea0c3 100755 --- a/docs/dist/js/buoy.js +++ b/docs/dist/js/buoy.js @@ -1,5 +1,5 @@ /** - * smooth-scroll v7.0.0 + * smooth-scroll v7.0.1 * Animate scrolling to anchor links, by Chris Ferdinandi. * http://github.com/cferdinandi/smooth-scroll * diff --git a/docs/dist/js/buoy.min.js b/docs/dist/js/buoy.min.js index fb59080..9f277ec 100755 --- a/docs/dist/js/buoy.min.js +++ b/docs/dist/js/buoy.min.js @@ -1,2 +1,2 @@ -/** smooth-scroll v7.0.0, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ +/** smooth-scroll v7.0.1, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ !function(t,e){"function"==typeof define&&define.amd?define([],e(t)):"object"==typeof exports?module.exports=e(t):t.buoy=e(t)}("undefined"!=typeof global?global:this.window||this.global,function(t){"use strict";var e={};return e.ready=function(t){return"function"==typeof t?"complete"===document.readyState?t():void document.addEventListener("DOMContentLoaded",t,!1):void 0},e.forEach=function(t,e,n){if("[object Object]"===Object.prototype.toString.call(t))for(var r in t)Object.prototype.hasOwnProperty.call(t,r)&&e.call(n,t[r],r,t);else for(var o=0,s=t.length;s>o;o++)e.call(n,t[o],o,t)},e.extend=function(){var t={},n=!1,r=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(n=arguments[0],r++);for(var s=function(r){for(var o in r)Object.prototype.hasOwnProperty.call(r,o)&&(t[o]=n&&"[object Object]"===Object.prototype.toString.call(r[o])?e.extend(!0,t[o],r[o]):r[o])};o>r;r++){var i=arguments[r];s(i)}return t},e.getHeight=function(t){return Math.max(t.scrollHeight,t.offsetHeight,t.clientHeight)},e.getOffsetTop=function(t){var e=0;if(t.offsetParent)do e+=t.offsetTop,t=t.offsetParent;while(t);return e>=0?e:0},e.getClosest=function(t,e){var n,r,o=e.charAt(0),s="classList"in document.documentElement;for("["===o&&(e=e.substr(1,e.length-2),n=e.split("="),n.length>1&&(r=!0,n[1]=n[1].replace(/"/g,"").replace(/'/g,"")));t&&t!==document;t=t.parentNode){if("."===o)if(s){if(t.classList.contains(e.substr(1)))return t}else if(new RegExp("(^|\\s)"+e.substr(1)+"(\\s|$)").test(t.className))return t;if("#"===o&&t.id===e.substr(1))return t;if("["===o&&t.hasAttribute(n[0])){if(!r)return t;if(t.getAttribute(n[0])===n[1])return t}if(t.tagName.toLowerCase()===e)return t}return null},e.getParents=function(t,e){var n,r,o,s=[],i="classList"in document.documentElement;for(e&&(n=e.charAt(0),"["===n&&(e=e.substr(1,e.length-2),r=e.split("="),r.length>1&&(o=!0,r[1]=r[1].replace(/"/g,"").replace(/'/g,""))));t&&t!==document;t=t.parentNode)e?("."===n&&(i?t.classList.contains(e.substr(1))&&s.push(t):new RegExp("(^|\\s)"+e.substr(1)+"(\\s|$)").test(t.className)&&s.push(t)),"#"===n&&t.id===e.substr(1)&&s.push(t),"["===n&&t.hasAttribute(r[0])&&(o?t.getAttribute(r[0])===r[1]&&s.push(t):s.push(t)),t.tagName.toLowerCase()===e&&s.push(t)):s.push(t);return 0===s.length?null:s},e.getSiblings=function(t){for(var e=[],n=t.parentNode.firstChild;n;n=n.nextSibling)1===n.nodeType&&n!==t&&e.push(n);return e},e.getQueryString=function(t,e){var n=e?e:window.location.href,r=new RegExp("[?&]"+t+"=([^&#]*)","i"),o=r.exec(n);return o?o[1]:null},e}); \ No newline at end of file diff --git a/docs/dist/js/smooth-scroll.js b/docs/dist/js/smooth-scroll.js index 3edd05d..82f06df 100755 --- a/docs/dist/js/smooth-scroll.js +++ b/docs/dist/js/smooth-scroll.js @@ -1,5 +1,5 @@ /** - * smooth-scroll v7.0.0 + * smooth-scroll v7.0.1 * Animate scrolling to anchor links, by Chris Ferdinandi. * http://github.com/cferdinandi/smooth-scroll * diff --git a/docs/dist/js/smooth-scroll.min.js b/docs/dist/js/smooth-scroll.min.js index 31263ee..edab2a4 100755 --- a/docs/dist/js/smooth-scroll.min.js +++ b/docs/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ -/** smooth-scroll v7.0.0, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ +/** smooth-scroll v7.0.1, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ !function(e,t){"function"==typeof define&&define.amd?define(["buoy"],t(e)):"object"==typeof exports?module.exports=t(e,require("buoy")):e.smoothScroll=t(e,e.buoy)}("undefined"!=typeof global?global:this.window||this.global,function(e){"use strict";var t,n,o,r,a={},u=!!e.document.querySelector&&!!e.addEventListener,c={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callback:function(){}},i=function(){var e={},t=!1,n=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(t=arguments[0],n++);for(var r=function(n){for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(e[o]=t&&"[object Object]"===Object.prototype.toString.call(n[o])?i(!0,e[o],n[o]):n[o])};o>n;n++){var a=arguments[n];r(a)}return e},s=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},l=function(e,t){var n,o,r=t.charAt(0),a="classList"in document.documentElement;for("["===r&&(t=t.substr(1,t.length-2),n=t.split("="),n.length>1&&(o=!0,n[1]=n[1].replace(/"/g,"").replace(/'/g,"")));e&&e!==document;e=e.parentNode){if("."===r)if(a){if(e.classList.contains(t.substr(1)))return e}else if(new RegExp("(^|\\s)"+t.substr(1)+"(\\s|$)").test(e.className))return e;if("#"===r&&e.id===t.substr(1))return e;if("["===r&&e.hasAttribute(n[0])){if(!o)return e;if(e.getAttribute(n[0])===n[1])return e}if(e.tagName.toLowerCase()===t)return e}return null},f=function(e){for(var t,n=String(e),o=n.length,r=-1,a="",u=n.charCodeAt(0);++r=1&&31>=t||127==t||0===r&&t>=48&&57>=t||1===r&&t>=48&&57>=t&&45===u?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(r):"\\"+n.charAt(r)}return a},d=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},h=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=o-t-n,o>=0?o:0},m=function(){return Math.max(e.document.body.scrollHeight,e.document.documentElement.scrollHeight,e.document.body.offsetHeight,e.document.documentElement.offsetHeight,e.document.body.clientHeight,e.document.documentElement.clientHeight)},p=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},g=function(t,n){e.history.pushState&&(n||"true"===n)&&e.history.pushState(null,null,[e.location.protocol,"//",e.location.host,e.location.pathname,e.location.search,t].join(""))},b=function(e){return null===e?0:s(e)+e.offsetTop};a.animateScroll=function(t,n,a){var u=p(t?t.getAttribute("data-options"):null),s=i(s||c,a||{},u);n="#"+f(n.substr(1));var l="#"===n?e.document.documentElement:e.document.querySelector(n),v=e.pageYOffset;o||(o=e.document.querySelector("[data-scroll-header]")),r||(r=b(o));var y,O,S,I=h(l,r,parseInt(s.offset,10)),E=I-v,L=m(),H=0;g(n,s.updateURL);var j=function(o,r,a){var u=e.pageYOffset;(o==r||u==r||e.innerHeight+u>=L)&&(clearInterval(a),l.focus(),s.callback(t,n))},w=function(){H+=16,O=H/parseInt(s.speed,10),O=O>1?1:O,S=v+E*d(s.easing,O),e.scrollTo(0,Math.floor(S)),j(S,I,y)},C=function(){y=setInterval(w,16)};0===e.pageYOffset&&e.scrollTo(0,0),C()};var v=function(e){var n=l(e.target,"[data-scroll]");n&&"a"===n.tagName.toLowerCase()&&(e.preventDefault(),a.animateScroll(n,n.hash,t))},y=function(e){n||(n=setTimeout(function(){n=null,r=b(o)},66))};return a.destroy=function(){t&&(e.document.removeEventListener("click",v,!1),e.removeEventListener("resize",y,!1),t=null,n=null,o=null,r=null)},a.init=function(n){u&&(a.destroy(),t=i(c,n||{}),o=e.document.querySelector("[data-scroll-header]"),r=b(o),e.document.addEventListener("click",v,!1),o&&e.addEventListener("resize",y,!1))},a}); \ No newline at end of file diff --git a/package.json b/package.json index ffc1677..1a45d36 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "smooth-scroll", - "version": "7.0.0", + "version": "7.0.1", "description": "Animate scrolling to anchor links", "main": "./dist/js/smooth-scroll.js", "author": { From 2a8ba44a14b398e3c72cc8e1663334ad77a4826b Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Fri, 10 Jul 2015 17:00:07 -0400 Subject: [PATCH 145/285] v7.0.2 ACTUALLY removed Buoy dependency. --- dist/js/buoy.js | 337 ------------------------------ dist/js/buoy.min.js | 2 - dist/js/smooth-scroll.js | 8 +- dist/js/smooth-scroll.min.js | 4 +- docs/dist/js/buoy.js | 337 ------------------------------ docs/dist/js/buoy.min.js | 2 - docs/dist/js/smooth-scroll.js | 8 +- docs/dist/js/smooth-scroll.min.js | 4 +- package.json | 2 +- src/js/buoy.js | 328 ----------------------------- src/js/smooth-scroll.js | 6 +- 11 files changed, 16 insertions(+), 1022 deletions(-) delete mode 100755 dist/js/buoy.js delete mode 100755 dist/js/buoy.min.js delete mode 100755 docs/dist/js/buoy.js delete mode 100755 docs/dist/js/buoy.min.js delete mode 100755 src/js/buoy.js diff --git a/dist/js/buoy.js b/dist/js/buoy.js deleted file mode 100755 index 00ea0c3..0000000 --- a/dist/js/buoy.js +++ /dev/null @@ -1,337 +0,0 @@ -/** - * smooth-scroll v7.0.1 - * Animate scrolling to anchor links, by Chris Ferdinandi. - * http://github.com/cferdinandi/smooth-scroll - * - * Free to use under the MIT License. - * http://gomakethings.com/mit/ - */ - -(function (root, factory) { - if ( typeof define === 'function' && define.amd ) { - define([], factory(root)); - } else if ( typeof exports === 'object' ) { - module.exports = factory(root); - } else { - root.buoy = factory(root); - } -})(typeof global !== 'undefined' ? global : this.window || this.global, function (root) { - - 'use strict'; - - // Object for public APIs - var buoy = {}; - - - // - // Methods - // - - /** - * Wait until the DOM is ready before executing code - * @param {Function} fn The function to execute when the DOM is ready - */ - buoy.ready = function ( fn ) { - - // Sanity check - if ( typeof fn !== 'function' ) return; - - // If document is already loaded, run method - if ( document.readyState === 'complete' ) { - return fn(); - } - - // Otherwise, wait until document is loaded - document.addEventListener( 'DOMContentLoaded', fn, false ); - - }; - - /** - * A simple forEach() implementation for Arrays, Objects and NodeLists. - * @author Todd Motto - * @link https://github.com/toddmotto/foreach - * @param {Array|Object|NodeList} collection Collection of items to iterate - * @param {Function} callback Callback function for each iteration - * @param {Array|Object|NodeList} scope Object/NodeList/Array that forEach is iterating over (aka `this`) - */ - buoy.forEach = function ( collection, callback, scope ) { - if ( Object.prototype.toString.call( collection ) === '[object Object]' ) { - for ( var prop in collection ) { - if ( Object.prototype.hasOwnProperty.call( collection, prop ) ) { - callback.call( scope, collection[prop], prop, collection ); - } - } - } else { - for ( var i = 0, len = collection.length; i < len; i++ ) { - callback.call( scope, collection[i], i, collection ); - } - } - }; - - /** - * Merge two or more objects. Returns a new object. - * @param {Boolean} deep If true, do a deep (or recursive) merge [optional] - * @param {Object} objects The objects to merge together - * @returns {Object} Merged values of defaults and options - */ - buoy.extend = function () { - - // Variables - var extended = {}; - var deep = false; - var i = 0; - var length = arguments.length; - - // Check if a deep merge - if ( Object.prototype.toString.call( arguments[0] ) === '[object Boolean]' ) { - deep = arguments[0]; - i++; - } - - // Merge the object into the extended object - var merge = function (obj) { - for ( var prop in obj ) { - if ( Object.prototype.hasOwnProperty.call( obj, prop ) ) { - // If deep merge and property is an object, merge properties - if ( deep && Object.prototype.toString.call(obj[prop]) === '[object Object]' ) { - extended[prop] = buoy.extend( true, extended[prop], obj[prop] ); - } else { - extended[prop] = obj[prop]; - } - } - } - }; - - // Loop through each object and conduct a merge - for ( ; i < length; i++ ) { - var obj = arguments[i]; - merge(obj); - } - - return extended; - - }; - - /** - * Get the height of an element. - * @param {Node} elem The element to get the height of - * @return {Number} The element's height in pixels - */ - buoy.getHeight = function ( elem ) { - return Math.max( elem.scrollHeight, elem.offsetHeight, elem.clientHeight ); - }; - - /** - * Get an element's distance from the top of the Document. - * @param {Node} elem The element - * @return {Number} Distance from the top in pixels - */ - buoy.getOffsetTop = function ( elem ) { - var location = 0; - if (elem.offsetParent) { - do { - location += elem.offsetTop; - elem = elem.offsetParent; - } while (elem); - } - return location >= 0 ? location : 0; - }; - - /** - * Get the closest matching element up the DOM tree. - * @param {Element} elem Starting element - * @param {String} selector Selector to match against (class, ID, data attribute, or tag) - * @return {Boolean|Element} Returns null if not match found - */ - buoy.getClosest = function ( elem, selector ) { - - // Variables - var firstChar = selector.charAt(0); - var supports = 'classList' in document.documentElement; - var attribute, value; - - // If selector is a data attribute, split attribute from value - if ( firstChar === '[' ) { - selector = selector.substr(1, selector.length - 2); - attribute = selector.split( '=' ); - - if ( attribute.length > 1 ) { - value = true; - attribute[1] = attribute[1].replace( /"/g, '' ).replace( /'/g, '' ); - } - } - - // Get closest match - for ( ; elem && elem !== document; elem = elem.parentNode ) { - - // If selector is a class - if ( firstChar === '.' ) { - if ( supports ) { - if ( elem.classList.contains( selector.substr(1) ) ) { - return elem; - } - } else { - if ( new RegExp('(^|\\s)' + selector.substr(1) + '(\\s|$)').test( elem.className ) ) { - return elem; - } - } - } - - // If selector is an ID - if ( firstChar === '#' ) { - if ( elem.id === selector.substr(1) ) { - return elem; - } - } - - // If selector is a data attribute - if ( firstChar === '[' ) { - if ( elem.hasAttribute( attribute[0] ) ) { - if ( value ) { - if ( elem.getAttribute( attribute[0] ) === attribute[1] ) { - return elem; - } - } else { - return elem; - } - } - } - - // If selector is a tag - if ( elem.tagName.toLowerCase() === selector ) { - return elem; - } - - } - - return null; - - }; - - /** - * Get an element's parents. - * @param {Node} elem The element - * @param {String} selector Selector to match against (class, ID, data attribute, or tag) - * @return {Array} An array of matching nodes - */ - buoy.getParents = function ( elem, selector ) { - - // Variables - var parents = []; - var supports = 'classList' in document.documentElement; - var firstChar, attribute, value; - - // If selector is a data attribute, split attribute from value - if ( selector ) { - firstChar = selector.charAt(0); - if ( firstChar === '[' ) { - selector = selector.substr(1, selector.length - 2); - attribute = selector.split( '=' ); - - if ( attribute.length > 1 ) { - value = true; - attribute[1] = attribute[1].replace( /"/g, '' ).replace( /'/g, '' ); - } - } - } - - // Get matches - for ( ; elem && elem !== document; elem = elem.parentNode ) { - if ( selector ) { - - // If selector is a class - if ( firstChar === '.' ) { - if ( supports ) { - if ( elem.classList.contains( selector.substr(1) ) ) { - parents.push( elem ); - } - } else { - if ( new RegExp('(^|\\s)' + selector.substr(1) + '(\\s|$)').test( elem.className ) ) { - parents.push( elem ); - } - } - } - - // If selector is an ID - if ( firstChar === '#' ) { - if ( elem.id === selector.substr(1) ) { - parents.push( elem ); - } - } - - // If selector is a data attribute - if ( firstChar === '[' ) { - if ( elem.hasAttribute( attribute[0] ) ) { - if ( value ) { - if ( elem.getAttribute( attribute[0] ) === attribute[1] ) { - parents.push( elem ); - } - } else { - parents.push( elem ); - } - } - } - - // If selector is a tag - if ( elem.tagName.toLowerCase() === selector ) { - parents.push( elem ); - } - - } else { - parents.push( elem ); - } - - } - - // Return parents if any exist - if ( parents.length === 0 ) { - return null; - } else { - return parents; - } - - }; - - /** - * Get an element's siblings. - * @param {Node} elem The element - * @return {Array} An array of sibling nodes - */ - buoy.getSiblings = function ( elem ) { - - // Variables - var siblings = []; - var sibling = elem.parentNode.firstChild; - - // Loop through all sibling nodes - for ( ; sibling; sibling = sibling.nextSibling ) { - if ( sibling.nodeType === 1 && sibling !== elem ) { - siblings.push( sibling ); - } - } - - return siblings; - - }; - - /** - * Get data from a URL query string. - * @param {String} field The field to get from the URL - * @param {String} url The URL to parse - * @return {String} The field value - */ - buoy.getQueryString = function ( field, url ) { - var href = url ? url : window.location.href; - var reg = new RegExp( '[?&]' + field + '=([^&#]*)', 'i' ); - var string = reg.exec(href); - return string ? string[1] : null; - }; - - - // - // Public APIs - // - - return buoy; - -}); \ No newline at end of file diff --git a/dist/js/buoy.min.js b/dist/js/buoy.min.js deleted file mode 100755 index 9f277ec..0000000 --- a/dist/js/buoy.min.js +++ /dev/null @@ -1,2 +0,0 @@ -/** smooth-scroll v7.0.1, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ -!function(t,e){"function"==typeof define&&define.amd?define([],e(t)):"object"==typeof exports?module.exports=e(t):t.buoy=e(t)}("undefined"!=typeof global?global:this.window||this.global,function(t){"use strict";var e={};return e.ready=function(t){return"function"==typeof t?"complete"===document.readyState?t():void document.addEventListener("DOMContentLoaded",t,!1):void 0},e.forEach=function(t,e,n){if("[object Object]"===Object.prototype.toString.call(t))for(var r in t)Object.prototype.hasOwnProperty.call(t,r)&&e.call(n,t[r],r,t);else for(var o=0,s=t.length;s>o;o++)e.call(n,t[o],o,t)},e.extend=function(){var t={},n=!1,r=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(n=arguments[0],r++);for(var s=function(r){for(var o in r)Object.prototype.hasOwnProperty.call(r,o)&&(t[o]=n&&"[object Object]"===Object.prototype.toString.call(r[o])?e.extend(!0,t[o],r[o]):r[o])};o>r;r++){var i=arguments[r];s(i)}return t},e.getHeight=function(t){return Math.max(t.scrollHeight,t.offsetHeight,t.clientHeight)},e.getOffsetTop=function(t){var e=0;if(t.offsetParent)do e+=t.offsetTop,t=t.offsetParent;while(t);return e>=0?e:0},e.getClosest=function(t,e){var n,r,o=e.charAt(0),s="classList"in document.documentElement;for("["===o&&(e=e.substr(1,e.length-2),n=e.split("="),n.length>1&&(r=!0,n[1]=n[1].replace(/"/g,"").replace(/'/g,"")));t&&t!==document;t=t.parentNode){if("."===o)if(s){if(t.classList.contains(e.substr(1)))return t}else if(new RegExp("(^|\\s)"+e.substr(1)+"(\\s|$)").test(t.className))return t;if("#"===o&&t.id===e.substr(1))return t;if("["===o&&t.hasAttribute(n[0])){if(!r)return t;if(t.getAttribute(n[0])===n[1])return t}if(t.tagName.toLowerCase()===e)return t}return null},e.getParents=function(t,e){var n,r,o,s=[],i="classList"in document.documentElement;for(e&&(n=e.charAt(0),"["===n&&(e=e.substr(1,e.length-2),r=e.split("="),r.length>1&&(o=!0,r[1]=r[1].replace(/"/g,"").replace(/'/g,""))));t&&t!==document;t=t.parentNode)e?("."===n&&(i?t.classList.contains(e.substr(1))&&s.push(t):new RegExp("(^|\\s)"+e.substr(1)+"(\\s|$)").test(t.className)&&s.push(t)),"#"===n&&t.id===e.substr(1)&&s.push(t),"["===n&&t.hasAttribute(r[0])&&(o?t.getAttribute(r[0])===r[1]&&s.push(t):s.push(t)),t.tagName.toLowerCase()===e&&s.push(t)):s.push(t);return 0===s.length?null:s},e.getSiblings=function(t){for(var e=[],n=t.parentNode.firstChild;n;n=n.nextSibling)1===n.nodeType&&n!==t&&e.push(n);return e},e.getQueryString=function(t,e){var n=e?e:window.location.href,r=new RegExp("[?&]"+t+"=([^&#]*)","i"),o=r.exec(n);return o?o[1]:null},e}); \ No newline at end of file diff --git a/dist/js/smooth-scroll.js b/dist/js/smooth-scroll.js index 82f06df..ff05e6b 100755 --- a/dist/js/smooth-scroll.js +++ b/dist/js/smooth-scroll.js @@ -1,5 +1,5 @@ /** - * smooth-scroll v7.0.1 + * smooth-scroll v7.0.2 * Animate scrolling to anchor links, by Chris Ferdinandi. * http://github.com/cferdinandi/smooth-scroll * @@ -9,11 +9,11 @@ (function (root, factory) { if ( typeof define === 'function' && define.amd ) { - define(['buoy'], factory(root)); + define([], factory(root)); } else if ( typeof exports === 'object' ) { - module.exports = factory(root, require('buoy')); + module.exports = factory(root); } else { - root.smoothScroll = factory(root, root.buoy); + root.smoothScroll = factory(root); } })(typeof global !== 'undefined' ? global : this.window || this.global, function (root) { diff --git a/dist/js/smooth-scroll.min.js b/dist/js/smooth-scroll.min.js index edab2a4..972f76b 100755 --- a/dist/js/smooth-scroll.min.js +++ b/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ -/** smooth-scroll v7.0.1, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ -!function(e,t){"function"==typeof define&&define.amd?define(["buoy"],t(e)):"object"==typeof exports?module.exports=t(e,require("buoy")):e.smoothScroll=t(e,e.buoy)}("undefined"!=typeof global?global:this.window||this.global,function(e){"use strict";var t,n,o,r,a={},u=!!e.document.querySelector&&!!e.addEventListener,c={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callback:function(){}},i=function(){var e={},t=!1,n=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(t=arguments[0],n++);for(var r=function(n){for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(e[o]=t&&"[object Object]"===Object.prototype.toString.call(n[o])?i(!0,e[o],n[o]):n[o])};o>n;n++){var a=arguments[n];r(a)}return e},s=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},l=function(e,t){var n,o,r=t.charAt(0),a="classList"in document.documentElement;for("["===r&&(t=t.substr(1,t.length-2),n=t.split("="),n.length>1&&(o=!0,n[1]=n[1].replace(/"/g,"").replace(/'/g,"")));e&&e!==document;e=e.parentNode){if("."===r)if(a){if(e.classList.contains(t.substr(1)))return e}else if(new RegExp("(^|\\s)"+t.substr(1)+"(\\s|$)").test(e.className))return e;if("#"===r&&e.id===t.substr(1))return e;if("["===r&&e.hasAttribute(n[0])){if(!o)return e;if(e.getAttribute(n[0])===n[1])return e}if(e.tagName.toLowerCase()===t)return e}return null},f=function(e){for(var t,n=String(e),o=n.length,r=-1,a="",u=n.charCodeAt(0);++r=1&&31>=t||127==t||0===r&&t>=48&&57>=t||1===r&&t>=48&&57>=t&&45===u?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(r):"\\"+n.charAt(r)}return a},d=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},h=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=o-t-n,o>=0?o:0},m=function(){return Math.max(e.document.body.scrollHeight,e.document.documentElement.scrollHeight,e.document.body.offsetHeight,e.document.documentElement.offsetHeight,e.document.body.clientHeight,e.document.documentElement.clientHeight)},p=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},g=function(t,n){e.history.pushState&&(n||"true"===n)&&e.history.pushState(null,null,[e.location.protocol,"//",e.location.host,e.location.pathname,e.location.search,t].join(""))},b=function(e){return null===e?0:s(e)+e.offsetTop};a.animateScroll=function(t,n,a){var u=p(t?t.getAttribute("data-options"):null),s=i(s||c,a||{},u);n="#"+f(n.substr(1));var l="#"===n?e.document.documentElement:e.document.querySelector(n),v=e.pageYOffset;o||(o=e.document.querySelector("[data-scroll-header]")),r||(r=b(o));var y,O,S,I=h(l,r,parseInt(s.offset,10)),E=I-v,L=m(),H=0;g(n,s.updateURL);var j=function(o,r,a){var u=e.pageYOffset;(o==r||u==r||e.innerHeight+u>=L)&&(clearInterval(a),l.focus(),s.callback(t,n))},w=function(){H+=16,O=H/parseInt(s.speed,10),O=O>1?1:O,S=v+E*d(s.easing,O),e.scrollTo(0,Math.floor(S)),j(S,I,y)},C=function(){y=setInterval(w,16)};0===e.pageYOffset&&e.scrollTo(0,0),C()};var v=function(e){var n=l(e.target,"[data-scroll]");n&&"a"===n.tagName.toLowerCase()&&(e.preventDefault(),a.animateScroll(n,n.hash,t))},y=function(e){n||(n=setTimeout(function(){n=null,r=b(o)},66))};return a.destroy=function(){t&&(e.document.removeEventListener("click",v,!1),e.removeEventListener("resize",y,!1),t=null,n=null,o=null,r=null)},a.init=function(n){u&&(a.destroy(),t=i(c,n||{}),o=e.document.querySelector("[data-scroll-header]"),r=b(o),e.document.addEventListener("click",v,!1),o&&e.addEventListener("resize",y,!1))},a}); \ No newline at end of file +/** smooth-scroll v7.0.2, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ +!function(t,e){"function"==typeof define&&define.amd?define([],e(t)):"object"==typeof exports?module.exports=e(t):t.smoothScroll=e(t)}("undefined"!=typeof global?global:this.window||this.global,function(t){"use strict";var e,n,o,r,a={},u=!!t.document.querySelector&&!!t.addEventListener,c={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callback:function(){}},i=function(){var t={},e=!1,n=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(e=arguments[0],n++);for(var r=function(n){for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(t[o]=e&&"[object Object]"===Object.prototype.toString.call(n[o])?i(!0,t[o],n[o]):n[o])};o>n;n++){var a=arguments[n];r(a)}return t},s=function(t){return Math.max(t.scrollHeight,t.offsetHeight,t.clientHeight)},l=function(t,e){var n,o,r=e.charAt(0),a="classList"in document.documentElement;for("["===r&&(e=e.substr(1,e.length-2),n=e.split("="),n.length>1&&(o=!0,n[1]=n[1].replace(/"/g,"").replace(/'/g,"")));t&&t!==document;t=t.parentNode){if("."===r)if(a){if(t.classList.contains(e.substr(1)))return t}else if(new RegExp("(^|\\s)"+e.substr(1)+"(\\s|$)").test(t.className))return t;if("#"===r&&t.id===e.substr(1))return t;if("["===r&&t.hasAttribute(n[0])){if(!o)return t;if(t.getAttribute(n[0])===n[1])return t}if(t.tagName.toLowerCase()===e)return t}return null},f=function(t){for(var e,n=String(t),o=n.length,r=-1,a="",u=n.charCodeAt(0);++r=1&&31>=e||127==e||0===r&&e>=48&&57>=e||1===r&&e>=48&&57>=e&&45===u?"\\"+e.toString(16)+" ":e>=128||45===e||95===e||e>=48&&57>=e||e>=65&&90>=e||e>=97&&122>=e?n.charAt(r):"\\"+n.charAt(r)}return a},d=function(t,e){var n;return"easeInQuad"===t&&(n=e*e),"easeOutQuad"===t&&(n=e*(2-e)),"easeInOutQuad"===t&&(n=.5>e?2*e*e:-1+(4-2*e)*e),"easeInCubic"===t&&(n=e*e*e),"easeOutCubic"===t&&(n=--e*e*e+1),"easeInOutCubic"===t&&(n=.5>e?4*e*e*e:(e-1)*(2*e-2)*(2*e-2)+1),"easeInQuart"===t&&(n=e*e*e*e),"easeOutQuart"===t&&(n=1- --e*e*e*e),"easeInOutQuart"===t&&(n=.5>e?8*e*e*e*e:1-8*--e*e*e*e),"easeInQuint"===t&&(n=e*e*e*e*e),"easeOutQuint"===t&&(n=1+--e*e*e*e*e),"easeInOutQuint"===t&&(n=.5>e?16*e*e*e*e*e:1+16*--e*e*e*e*e),n||e},h=function(t,e,n){var o=0;if(t.offsetParent)do o+=t.offsetTop,t=t.offsetParent;while(t);return o=o-e-n,o>=0?o:0},m=function(){return Math.max(t.document.body.scrollHeight,t.document.documentElement.scrollHeight,t.document.body.offsetHeight,t.document.documentElement.offsetHeight,t.document.body.clientHeight,t.document.documentElement.clientHeight)},p=function(t){return t&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(t):{}},g=function(e,n){t.history.pushState&&(n||"true"===n)&&t.history.pushState(null,null,[t.location.protocol,"//",t.location.host,t.location.pathname,t.location.search,e].join(""))},b=function(t){return null===t?0:s(t)+t.offsetTop};a.animateScroll=function(e,n,a){var u=p(e?e.getAttribute("data-options"):null),s=i(s||c,a||{},u);n="#"+f(n.substr(1));var l="#"===n?t.document.documentElement:t.document.querySelector(n),v=t.pageYOffset;o||(o=t.document.querySelector("[data-scroll-header]")),r||(r=b(o));var y,O,S,I=h(l,r,parseInt(s.offset,10)),E=I-v,L=m(),H=0;g(n,s.updateURL);var j=function(o,r,a){var u=t.pageYOffset;(o==r||u==r||t.innerHeight+u>=L)&&(clearInterval(a),l.focus(),s.callback(e,n))},w=function(){H+=16,O=H/parseInt(s.speed,10),O=O>1?1:O,S=v+E*d(s.easing,O),t.scrollTo(0,Math.floor(S)),j(S,I,y)},C=function(){y=setInterval(w,16)};0===t.pageYOffset&&t.scrollTo(0,0),C()};var v=function(t){var n=l(t.target,"[data-scroll]");n&&"a"===n.tagName.toLowerCase()&&(t.preventDefault(),a.animateScroll(n,n.hash,e))},y=function(t){n||(n=setTimeout(function(){n=null,r=b(o)},66))};return a.destroy=function(){e&&(t.document.removeEventListener("click",v,!1),t.removeEventListener("resize",y,!1),e=null,n=null,o=null,r=null)},a.init=function(n){u&&(a.destroy(),e=i(c,n||{}),o=t.document.querySelector("[data-scroll-header]"),r=b(o),t.document.addEventListener("click",v,!1),o&&t.addEventListener("resize",y,!1))},a}); \ No newline at end of file diff --git a/docs/dist/js/buoy.js b/docs/dist/js/buoy.js deleted file mode 100755 index 00ea0c3..0000000 --- a/docs/dist/js/buoy.js +++ /dev/null @@ -1,337 +0,0 @@ -/** - * smooth-scroll v7.0.1 - * Animate scrolling to anchor links, by Chris Ferdinandi. - * http://github.com/cferdinandi/smooth-scroll - * - * Free to use under the MIT License. - * http://gomakethings.com/mit/ - */ - -(function (root, factory) { - if ( typeof define === 'function' && define.amd ) { - define([], factory(root)); - } else if ( typeof exports === 'object' ) { - module.exports = factory(root); - } else { - root.buoy = factory(root); - } -})(typeof global !== 'undefined' ? global : this.window || this.global, function (root) { - - 'use strict'; - - // Object for public APIs - var buoy = {}; - - - // - // Methods - // - - /** - * Wait until the DOM is ready before executing code - * @param {Function} fn The function to execute when the DOM is ready - */ - buoy.ready = function ( fn ) { - - // Sanity check - if ( typeof fn !== 'function' ) return; - - // If document is already loaded, run method - if ( document.readyState === 'complete' ) { - return fn(); - } - - // Otherwise, wait until document is loaded - document.addEventListener( 'DOMContentLoaded', fn, false ); - - }; - - /** - * A simple forEach() implementation for Arrays, Objects and NodeLists. - * @author Todd Motto - * @link https://github.com/toddmotto/foreach - * @param {Array|Object|NodeList} collection Collection of items to iterate - * @param {Function} callback Callback function for each iteration - * @param {Array|Object|NodeList} scope Object/NodeList/Array that forEach is iterating over (aka `this`) - */ - buoy.forEach = function ( collection, callback, scope ) { - if ( Object.prototype.toString.call( collection ) === '[object Object]' ) { - for ( var prop in collection ) { - if ( Object.prototype.hasOwnProperty.call( collection, prop ) ) { - callback.call( scope, collection[prop], prop, collection ); - } - } - } else { - for ( var i = 0, len = collection.length; i < len; i++ ) { - callback.call( scope, collection[i], i, collection ); - } - } - }; - - /** - * Merge two or more objects. Returns a new object. - * @param {Boolean} deep If true, do a deep (or recursive) merge [optional] - * @param {Object} objects The objects to merge together - * @returns {Object} Merged values of defaults and options - */ - buoy.extend = function () { - - // Variables - var extended = {}; - var deep = false; - var i = 0; - var length = arguments.length; - - // Check if a deep merge - if ( Object.prototype.toString.call( arguments[0] ) === '[object Boolean]' ) { - deep = arguments[0]; - i++; - } - - // Merge the object into the extended object - var merge = function (obj) { - for ( var prop in obj ) { - if ( Object.prototype.hasOwnProperty.call( obj, prop ) ) { - // If deep merge and property is an object, merge properties - if ( deep && Object.prototype.toString.call(obj[prop]) === '[object Object]' ) { - extended[prop] = buoy.extend( true, extended[prop], obj[prop] ); - } else { - extended[prop] = obj[prop]; - } - } - } - }; - - // Loop through each object and conduct a merge - for ( ; i < length; i++ ) { - var obj = arguments[i]; - merge(obj); - } - - return extended; - - }; - - /** - * Get the height of an element. - * @param {Node} elem The element to get the height of - * @return {Number} The element's height in pixels - */ - buoy.getHeight = function ( elem ) { - return Math.max( elem.scrollHeight, elem.offsetHeight, elem.clientHeight ); - }; - - /** - * Get an element's distance from the top of the Document. - * @param {Node} elem The element - * @return {Number} Distance from the top in pixels - */ - buoy.getOffsetTop = function ( elem ) { - var location = 0; - if (elem.offsetParent) { - do { - location += elem.offsetTop; - elem = elem.offsetParent; - } while (elem); - } - return location >= 0 ? location : 0; - }; - - /** - * Get the closest matching element up the DOM tree. - * @param {Element} elem Starting element - * @param {String} selector Selector to match against (class, ID, data attribute, or tag) - * @return {Boolean|Element} Returns null if not match found - */ - buoy.getClosest = function ( elem, selector ) { - - // Variables - var firstChar = selector.charAt(0); - var supports = 'classList' in document.documentElement; - var attribute, value; - - // If selector is a data attribute, split attribute from value - if ( firstChar === '[' ) { - selector = selector.substr(1, selector.length - 2); - attribute = selector.split( '=' ); - - if ( attribute.length > 1 ) { - value = true; - attribute[1] = attribute[1].replace( /"/g, '' ).replace( /'/g, '' ); - } - } - - // Get closest match - for ( ; elem && elem !== document; elem = elem.parentNode ) { - - // If selector is a class - if ( firstChar === '.' ) { - if ( supports ) { - if ( elem.classList.contains( selector.substr(1) ) ) { - return elem; - } - } else { - if ( new RegExp('(^|\\s)' + selector.substr(1) + '(\\s|$)').test( elem.className ) ) { - return elem; - } - } - } - - // If selector is an ID - if ( firstChar === '#' ) { - if ( elem.id === selector.substr(1) ) { - return elem; - } - } - - // If selector is a data attribute - if ( firstChar === '[' ) { - if ( elem.hasAttribute( attribute[0] ) ) { - if ( value ) { - if ( elem.getAttribute( attribute[0] ) === attribute[1] ) { - return elem; - } - } else { - return elem; - } - } - } - - // If selector is a tag - if ( elem.tagName.toLowerCase() === selector ) { - return elem; - } - - } - - return null; - - }; - - /** - * Get an element's parents. - * @param {Node} elem The element - * @param {String} selector Selector to match against (class, ID, data attribute, or tag) - * @return {Array} An array of matching nodes - */ - buoy.getParents = function ( elem, selector ) { - - // Variables - var parents = []; - var supports = 'classList' in document.documentElement; - var firstChar, attribute, value; - - // If selector is a data attribute, split attribute from value - if ( selector ) { - firstChar = selector.charAt(0); - if ( firstChar === '[' ) { - selector = selector.substr(1, selector.length - 2); - attribute = selector.split( '=' ); - - if ( attribute.length > 1 ) { - value = true; - attribute[1] = attribute[1].replace( /"/g, '' ).replace( /'/g, '' ); - } - } - } - - // Get matches - for ( ; elem && elem !== document; elem = elem.parentNode ) { - if ( selector ) { - - // If selector is a class - if ( firstChar === '.' ) { - if ( supports ) { - if ( elem.classList.contains( selector.substr(1) ) ) { - parents.push( elem ); - } - } else { - if ( new RegExp('(^|\\s)' + selector.substr(1) + '(\\s|$)').test( elem.className ) ) { - parents.push( elem ); - } - } - } - - // If selector is an ID - if ( firstChar === '#' ) { - if ( elem.id === selector.substr(1) ) { - parents.push( elem ); - } - } - - // If selector is a data attribute - if ( firstChar === '[' ) { - if ( elem.hasAttribute( attribute[0] ) ) { - if ( value ) { - if ( elem.getAttribute( attribute[0] ) === attribute[1] ) { - parents.push( elem ); - } - } else { - parents.push( elem ); - } - } - } - - // If selector is a tag - if ( elem.tagName.toLowerCase() === selector ) { - parents.push( elem ); - } - - } else { - parents.push( elem ); - } - - } - - // Return parents if any exist - if ( parents.length === 0 ) { - return null; - } else { - return parents; - } - - }; - - /** - * Get an element's siblings. - * @param {Node} elem The element - * @return {Array} An array of sibling nodes - */ - buoy.getSiblings = function ( elem ) { - - // Variables - var siblings = []; - var sibling = elem.parentNode.firstChild; - - // Loop through all sibling nodes - for ( ; sibling; sibling = sibling.nextSibling ) { - if ( sibling.nodeType === 1 && sibling !== elem ) { - siblings.push( sibling ); - } - } - - return siblings; - - }; - - /** - * Get data from a URL query string. - * @param {String} field The field to get from the URL - * @param {String} url The URL to parse - * @return {String} The field value - */ - buoy.getQueryString = function ( field, url ) { - var href = url ? url : window.location.href; - var reg = new RegExp( '[?&]' + field + '=([^&#]*)', 'i' ); - var string = reg.exec(href); - return string ? string[1] : null; - }; - - - // - // Public APIs - // - - return buoy; - -}); \ No newline at end of file diff --git a/docs/dist/js/buoy.min.js b/docs/dist/js/buoy.min.js deleted file mode 100755 index 9f277ec..0000000 --- a/docs/dist/js/buoy.min.js +++ /dev/null @@ -1,2 +0,0 @@ -/** smooth-scroll v7.0.1, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ -!function(t,e){"function"==typeof define&&define.amd?define([],e(t)):"object"==typeof exports?module.exports=e(t):t.buoy=e(t)}("undefined"!=typeof global?global:this.window||this.global,function(t){"use strict";var e={};return e.ready=function(t){return"function"==typeof t?"complete"===document.readyState?t():void document.addEventListener("DOMContentLoaded",t,!1):void 0},e.forEach=function(t,e,n){if("[object Object]"===Object.prototype.toString.call(t))for(var r in t)Object.prototype.hasOwnProperty.call(t,r)&&e.call(n,t[r],r,t);else for(var o=0,s=t.length;s>o;o++)e.call(n,t[o],o,t)},e.extend=function(){var t={},n=!1,r=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(n=arguments[0],r++);for(var s=function(r){for(var o in r)Object.prototype.hasOwnProperty.call(r,o)&&(t[o]=n&&"[object Object]"===Object.prototype.toString.call(r[o])?e.extend(!0,t[o],r[o]):r[o])};o>r;r++){var i=arguments[r];s(i)}return t},e.getHeight=function(t){return Math.max(t.scrollHeight,t.offsetHeight,t.clientHeight)},e.getOffsetTop=function(t){var e=0;if(t.offsetParent)do e+=t.offsetTop,t=t.offsetParent;while(t);return e>=0?e:0},e.getClosest=function(t,e){var n,r,o=e.charAt(0),s="classList"in document.documentElement;for("["===o&&(e=e.substr(1,e.length-2),n=e.split("="),n.length>1&&(r=!0,n[1]=n[1].replace(/"/g,"").replace(/'/g,"")));t&&t!==document;t=t.parentNode){if("."===o)if(s){if(t.classList.contains(e.substr(1)))return t}else if(new RegExp("(^|\\s)"+e.substr(1)+"(\\s|$)").test(t.className))return t;if("#"===o&&t.id===e.substr(1))return t;if("["===o&&t.hasAttribute(n[0])){if(!r)return t;if(t.getAttribute(n[0])===n[1])return t}if(t.tagName.toLowerCase()===e)return t}return null},e.getParents=function(t,e){var n,r,o,s=[],i="classList"in document.documentElement;for(e&&(n=e.charAt(0),"["===n&&(e=e.substr(1,e.length-2),r=e.split("="),r.length>1&&(o=!0,r[1]=r[1].replace(/"/g,"").replace(/'/g,""))));t&&t!==document;t=t.parentNode)e?("."===n&&(i?t.classList.contains(e.substr(1))&&s.push(t):new RegExp("(^|\\s)"+e.substr(1)+"(\\s|$)").test(t.className)&&s.push(t)),"#"===n&&t.id===e.substr(1)&&s.push(t),"["===n&&t.hasAttribute(r[0])&&(o?t.getAttribute(r[0])===r[1]&&s.push(t):s.push(t)),t.tagName.toLowerCase()===e&&s.push(t)):s.push(t);return 0===s.length?null:s},e.getSiblings=function(t){for(var e=[],n=t.parentNode.firstChild;n;n=n.nextSibling)1===n.nodeType&&n!==t&&e.push(n);return e},e.getQueryString=function(t,e){var n=e?e:window.location.href,r=new RegExp("[?&]"+t+"=([^&#]*)","i"),o=r.exec(n);return o?o[1]:null},e}); \ No newline at end of file diff --git a/docs/dist/js/smooth-scroll.js b/docs/dist/js/smooth-scroll.js index 82f06df..ff05e6b 100755 --- a/docs/dist/js/smooth-scroll.js +++ b/docs/dist/js/smooth-scroll.js @@ -1,5 +1,5 @@ /** - * smooth-scroll v7.0.1 + * smooth-scroll v7.0.2 * Animate scrolling to anchor links, by Chris Ferdinandi. * http://github.com/cferdinandi/smooth-scroll * @@ -9,11 +9,11 @@ (function (root, factory) { if ( typeof define === 'function' && define.amd ) { - define(['buoy'], factory(root)); + define([], factory(root)); } else if ( typeof exports === 'object' ) { - module.exports = factory(root, require('buoy')); + module.exports = factory(root); } else { - root.smoothScroll = factory(root, root.buoy); + root.smoothScroll = factory(root); } })(typeof global !== 'undefined' ? global : this.window || this.global, function (root) { diff --git a/docs/dist/js/smooth-scroll.min.js b/docs/dist/js/smooth-scroll.min.js index edab2a4..972f76b 100755 --- a/docs/dist/js/smooth-scroll.min.js +++ b/docs/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ -/** smooth-scroll v7.0.1, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ -!function(e,t){"function"==typeof define&&define.amd?define(["buoy"],t(e)):"object"==typeof exports?module.exports=t(e,require("buoy")):e.smoothScroll=t(e,e.buoy)}("undefined"!=typeof global?global:this.window||this.global,function(e){"use strict";var t,n,o,r,a={},u=!!e.document.querySelector&&!!e.addEventListener,c={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callback:function(){}},i=function(){var e={},t=!1,n=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(t=arguments[0],n++);for(var r=function(n){for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(e[o]=t&&"[object Object]"===Object.prototype.toString.call(n[o])?i(!0,e[o],n[o]):n[o])};o>n;n++){var a=arguments[n];r(a)}return e},s=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},l=function(e,t){var n,o,r=t.charAt(0),a="classList"in document.documentElement;for("["===r&&(t=t.substr(1,t.length-2),n=t.split("="),n.length>1&&(o=!0,n[1]=n[1].replace(/"/g,"").replace(/'/g,"")));e&&e!==document;e=e.parentNode){if("."===r)if(a){if(e.classList.contains(t.substr(1)))return e}else if(new RegExp("(^|\\s)"+t.substr(1)+"(\\s|$)").test(e.className))return e;if("#"===r&&e.id===t.substr(1))return e;if("["===r&&e.hasAttribute(n[0])){if(!o)return e;if(e.getAttribute(n[0])===n[1])return e}if(e.tagName.toLowerCase()===t)return e}return null},f=function(e){for(var t,n=String(e),o=n.length,r=-1,a="",u=n.charCodeAt(0);++r=1&&31>=t||127==t||0===r&&t>=48&&57>=t||1===r&&t>=48&&57>=t&&45===u?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(r):"\\"+n.charAt(r)}return a},d=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},h=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=o-t-n,o>=0?o:0},m=function(){return Math.max(e.document.body.scrollHeight,e.document.documentElement.scrollHeight,e.document.body.offsetHeight,e.document.documentElement.offsetHeight,e.document.body.clientHeight,e.document.documentElement.clientHeight)},p=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},g=function(t,n){e.history.pushState&&(n||"true"===n)&&e.history.pushState(null,null,[e.location.protocol,"//",e.location.host,e.location.pathname,e.location.search,t].join(""))},b=function(e){return null===e?0:s(e)+e.offsetTop};a.animateScroll=function(t,n,a){var u=p(t?t.getAttribute("data-options"):null),s=i(s||c,a||{},u);n="#"+f(n.substr(1));var l="#"===n?e.document.documentElement:e.document.querySelector(n),v=e.pageYOffset;o||(o=e.document.querySelector("[data-scroll-header]")),r||(r=b(o));var y,O,S,I=h(l,r,parseInt(s.offset,10)),E=I-v,L=m(),H=0;g(n,s.updateURL);var j=function(o,r,a){var u=e.pageYOffset;(o==r||u==r||e.innerHeight+u>=L)&&(clearInterval(a),l.focus(),s.callback(t,n))},w=function(){H+=16,O=H/parseInt(s.speed,10),O=O>1?1:O,S=v+E*d(s.easing,O),e.scrollTo(0,Math.floor(S)),j(S,I,y)},C=function(){y=setInterval(w,16)};0===e.pageYOffset&&e.scrollTo(0,0),C()};var v=function(e){var n=l(e.target,"[data-scroll]");n&&"a"===n.tagName.toLowerCase()&&(e.preventDefault(),a.animateScroll(n,n.hash,t))},y=function(e){n||(n=setTimeout(function(){n=null,r=b(o)},66))};return a.destroy=function(){t&&(e.document.removeEventListener("click",v,!1),e.removeEventListener("resize",y,!1),t=null,n=null,o=null,r=null)},a.init=function(n){u&&(a.destroy(),t=i(c,n||{}),o=e.document.querySelector("[data-scroll-header]"),r=b(o),e.document.addEventListener("click",v,!1),o&&e.addEventListener("resize",y,!1))},a}); \ No newline at end of file +/** smooth-scroll v7.0.2, by Chris Ferdinandi | http://github.com/cferdinandi/smooth-scroll | Licensed under MIT: http://gomakethings.com/mit/ */ +!function(t,e){"function"==typeof define&&define.amd?define([],e(t)):"object"==typeof exports?module.exports=e(t):t.smoothScroll=e(t)}("undefined"!=typeof global?global:this.window||this.global,function(t){"use strict";var e,n,o,r,a={},u=!!t.document.querySelector&&!!t.addEventListener,c={speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callback:function(){}},i=function(){var t={},e=!1,n=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(e=arguments[0],n++);for(var r=function(n){for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(t[o]=e&&"[object Object]"===Object.prototype.toString.call(n[o])?i(!0,t[o],n[o]):n[o])};o>n;n++){var a=arguments[n];r(a)}return t},s=function(t){return Math.max(t.scrollHeight,t.offsetHeight,t.clientHeight)},l=function(t,e){var n,o,r=e.charAt(0),a="classList"in document.documentElement;for("["===r&&(e=e.substr(1,e.length-2),n=e.split("="),n.length>1&&(o=!0,n[1]=n[1].replace(/"/g,"").replace(/'/g,"")));t&&t!==document;t=t.parentNode){if("."===r)if(a){if(t.classList.contains(e.substr(1)))return t}else if(new RegExp("(^|\\s)"+e.substr(1)+"(\\s|$)").test(t.className))return t;if("#"===r&&t.id===e.substr(1))return t;if("["===r&&t.hasAttribute(n[0])){if(!o)return t;if(t.getAttribute(n[0])===n[1])return t}if(t.tagName.toLowerCase()===e)return t}return null},f=function(t){for(var e,n=String(t),o=n.length,r=-1,a="",u=n.charCodeAt(0);++r=1&&31>=e||127==e||0===r&&e>=48&&57>=e||1===r&&e>=48&&57>=e&&45===u?"\\"+e.toString(16)+" ":e>=128||45===e||95===e||e>=48&&57>=e||e>=65&&90>=e||e>=97&&122>=e?n.charAt(r):"\\"+n.charAt(r)}return a},d=function(t,e){var n;return"easeInQuad"===t&&(n=e*e),"easeOutQuad"===t&&(n=e*(2-e)),"easeInOutQuad"===t&&(n=.5>e?2*e*e:-1+(4-2*e)*e),"easeInCubic"===t&&(n=e*e*e),"easeOutCubic"===t&&(n=--e*e*e+1),"easeInOutCubic"===t&&(n=.5>e?4*e*e*e:(e-1)*(2*e-2)*(2*e-2)+1),"easeInQuart"===t&&(n=e*e*e*e),"easeOutQuart"===t&&(n=1- --e*e*e*e),"easeInOutQuart"===t&&(n=.5>e?8*e*e*e*e:1-8*--e*e*e*e),"easeInQuint"===t&&(n=e*e*e*e*e),"easeOutQuint"===t&&(n=1+--e*e*e*e*e),"easeInOutQuint"===t&&(n=.5>e?16*e*e*e*e*e:1+16*--e*e*e*e*e),n||e},h=function(t,e,n){var o=0;if(t.offsetParent)do o+=t.offsetTop,t=t.offsetParent;while(t);return o=o-e-n,o>=0?o:0},m=function(){return Math.max(t.document.body.scrollHeight,t.document.documentElement.scrollHeight,t.document.body.offsetHeight,t.document.documentElement.offsetHeight,t.document.body.clientHeight,t.document.documentElement.clientHeight)},p=function(t){return t&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(t):{}},g=function(e,n){t.history.pushState&&(n||"true"===n)&&t.history.pushState(null,null,[t.location.protocol,"//",t.location.host,t.location.pathname,t.location.search,e].join(""))},b=function(t){return null===t?0:s(t)+t.offsetTop};a.animateScroll=function(e,n,a){var u=p(e?e.getAttribute("data-options"):null),s=i(s||c,a||{},u);n="#"+f(n.substr(1));var l="#"===n?t.document.documentElement:t.document.querySelector(n),v=t.pageYOffset;o||(o=t.document.querySelector("[data-scroll-header]")),r||(r=b(o));var y,O,S,I=h(l,r,parseInt(s.offset,10)),E=I-v,L=m(),H=0;g(n,s.updateURL);var j=function(o,r,a){var u=t.pageYOffset;(o==r||u==r||t.innerHeight+u>=L)&&(clearInterval(a),l.focus(),s.callback(e,n))},w=function(){H+=16,O=H/parseInt(s.speed,10),O=O>1?1:O,S=v+E*d(s.easing,O),t.scrollTo(0,Math.floor(S)),j(S,I,y)},C=function(){y=setInterval(w,16)};0===t.pageYOffset&&t.scrollTo(0,0),C()};var v=function(t){var n=l(t.target,"[data-scroll]");n&&"a"===n.tagName.toLowerCase()&&(t.preventDefault(),a.animateScroll(n,n.hash,e))},y=function(t){n||(n=setTimeout(function(){n=null,r=b(o)},66))};return a.destroy=function(){e&&(t.document.removeEventListener("click",v,!1),t.removeEventListener("resize",y,!1),e=null,n=null,o=null,r=null)},a.init=function(n){u&&(a.destroy(),e=i(c,n||{}),o=t.document.querySelector("[data-scroll-header]"),r=b(o),t.document.addEventListener("click",v,!1),o&&t.addEventListener("resize",y,!1))},a}); \ No newline at end of file diff --git a/package.json b/package.json index 1a45d36..e4eb0f7 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "smooth-scroll", - "version": "7.0.1", + "version": "7.0.2", "description": "Animate scrolling to anchor links", "main": "./dist/js/smooth-scroll.js", "author": { diff --git a/src/js/buoy.js b/src/js/buoy.js deleted file mode 100755 index b9e4be7..0000000 --- a/src/js/buoy.js +++ /dev/null @@ -1,328 +0,0 @@ -(function (root, factory) { - if ( typeof define === 'function' && define.amd ) { - define([], factory(root)); - } else if ( typeof exports === 'object' ) { - module.exports = factory(root); - } else { - root.buoy = factory(root); - } -})(typeof global !== 'undefined' ? global : this.window || this.global, function (root) { - - 'use strict'; - - // Object for public APIs - var buoy = {}; - - - // - // Methods - // - - /** - * Wait until the DOM is ready before executing code - * @param {Function} fn The function to execute when the DOM is ready - */ - buoy.ready = function ( fn ) { - - // Sanity check - if ( typeof fn !== 'function' ) return; - - // If document is already loaded, run method - if ( document.readyState === 'complete' ) { - return fn(); - } - - // Otherwise, wait until document is loaded - document.addEventListener( 'DOMContentLoaded', fn, false ); - - }; - - /** - * A simple forEach() implementation for Arrays, Objects and NodeLists. - * @author Todd Motto - * @link https://github.com/toddmotto/foreach - * @param {Array|Object|NodeList} collection Collection of items to iterate - * @param {Function} callback Callback function for each iteration - * @param {Array|Object|NodeList} scope Object/NodeList/Array that forEach is iterating over (aka `this`) - */ - buoy.forEach = function ( collection, callback, scope ) { - if ( Object.prototype.toString.call( collection ) === '[object Object]' ) { - for ( var prop in collection ) { - if ( Object.prototype.hasOwnProperty.call( collection, prop ) ) { - callback.call( scope, collection[prop], prop, collection ); - } - } - } else { - for ( var i = 0, len = collection.length; i < len; i++ ) { - callback.call( scope, collection[i], i, collection ); - } - } - }; - - /** - * Merge two or more objects. Returns a new object. - * @param {Boolean} deep If true, do a deep (or recursive) merge [optional] - * @param {Object} objects The objects to merge together - * @returns {Object} Merged values of defaults and options - */ - buoy.extend = function () { - - // Variables - var extended = {}; - var deep = false; - var i = 0; - var length = arguments.length; - - // Check if a deep merge - if ( Object.prototype.toString.call( arguments[0] ) === '[object Boolean]' ) { - deep = arguments[0]; - i++; - } - - // Merge the object into the extended object - var merge = function (obj) { - for ( var prop in obj ) { - if ( Object.prototype.hasOwnProperty.call( obj, prop ) ) { - // If deep merge and property is an object, merge properties - if ( deep && Object.prototype.toString.call(obj[prop]) === '[object Object]' ) { - extended[prop] = buoy.extend( true, extended[prop], obj[prop] ); - } else { - extended[prop] = obj[prop]; - } - } - } - }; - - // Loop through each object and conduct a merge - for ( ; i < length; i++ ) { - var obj = arguments[i]; - merge(obj); - } - - return extended; - - }; - - /** - * Get the height of an element. - * @param {Node} elem The element to get the height of - * @return {Number} The element's height in pixels - */ - buoy.getHeight = function ( elem ) { - return Math.max( elem.scrollHeight, elem.offsetHeight, elem.clientHeight ); - }; - - /** - * Get an element's distance from the top of the Document. - * @param {Node} elem The element - * @return {Number} Distance from the top in pixels - */ - buoy.getOffsetTop = function ( elem ) { - var location = 0; - if (elem.offsetParent) { - do { - location += elem.offsetTop; - elem = elem.offsetParent; - } while (elem); - } - return location >= 0 ? location : 0; - }; - - /** - * Get the closest matching element up the DOM tree. - * @param {Element} elem Starting element - * @param {String} selector Selector to match against (class, ID, data attribute, or tag) - * @return {Boolean|Element} Returns null if not match found - */ - buoy.getClosest = function ( elem, selector ) { - - // Variables - var firstChar = selector.charAt(0); - var supports = 'classList' in document.documentElement; - var attribute, value; - - // If selector is a data attribute, split attribute from value - if ( firstChar === '[' ) { - selector = selector.substr(1, selector.length - 2); - attribute = selector.split( '=' ); - - if ( attribute.length > 1 ) { - value = true; - attribute[1] = attribute[1].replace( /"/g, '' ).replace( /'/g, '' ); - } - } - - // Get closest match - for ( ; elem && elem !== document; elem = elem.parentNode ) { - - // If selector is a class - if ( firstChar === '.' ) { - if ( supports ) { - if ( elem.classList.contains( selector.substr(1) ) ) { - return elem; - } - } else { - if ( new RegExp('(^|\\s)' + selector.substr(1) + '(\\s|$)').test( elem.className ) ) { - return elem; - } - } - } - - // If selector is an ID - if ( firstChar === '#' ) { - if ( elem.id === selector.substr(1) ) { - return elem; - } - } - - // If selector is a data attribute - if ( firstChar === '[' ) { - if ( elem.hasAttribute( attribute[0] ) ) { - if ( value ) { - if ( elem.getAttribute( attribute[0] ) === attribute[1] ) { - return elem; - } - } else { - return elem; - } - } - } - - // If selector is a tag - if ( elem.tagName.toLowerCase() === selector ) { - return elem; - } - - } - - return null; - - }; - - /** - * Get an element's parents. - * @param {Node} elem The element - * @param {String} selector Selector to match against (class, ID, data attribute, or tag) - * @return {Array} An array of matching nodes - */ - buoy.getParents = function ( elem, selector ) { - - // Variables - var parents = []; - var supports = 'classList' in document.documentElement; - var firstChar, attribute, value; - - // If selector is a data attribute, split attribute from value - if ( selector ) { - firstChar = selector.charAt(0); - if ( firstChar === '[' ) { - selector = selector.substr(1, selector.length - 2); - attribute = selector.split( '=' ); - - if ( attribute.length > 1 ) { - value = true; - attribute[1] = attribute[1].replace( /"/g, '' ).replace( /'/g, '' ); - } - } - } - - // Get matches - for ( ; elem && elem !== document; elem = elem.parentNode ) { - if ( selector ) { - - // If selector is a class - if ( firstChar === '.' ) { - if ( supports ) { - if ( elem.classList.contains( selector.substr(1) ) ) { - parents.push( elem ); - } - } else { - if ( new RegExp('(^|\\s)' + selector.substr(1) + '(\\s|$)').test( elem.className ) ) { - parents.push( elem ); - } - } - } - - // If selector is an ID - if ( firstChar === '#' ) { - if ( elem.id === selector.substr(1) ) { - parents.push( elem ); - } - } - - // If selector is a data attribute - if ( firstChar === '[' ) { - if ( elem.hasAttribute( attribute[0] ) ) { - if ( value ) { - if ( elem.getAttribute( attribute[0] ) === attribute[1] ) { - parents.push( elem ); - } - } else { - parents.push( elem ); - } - } - } - - // If selector is a tag - if ( elem.tagName.toLowerCase() === selector ) { - parents.push( elem ); - } - - } else { - parents.push( elem ); - } - - } - - // Return parents if any exist - if ( parents.length === 0 ) { - return null; - } else { - return parents; - } - - }; - - /** - * Get an element's siblings. - * @param {Node} elem The element - * @return {Array} An array of sibling nodes - */ - buoy.getSiblings = function ( elem ) { - - // Variables - var siblings = []; - var sibling = elem.parentNode.firstChild; - - // Loop through all sibling nodes - for ( ; sibling; sibling = sibling.nextSibling ) { - if ( sibling.nodeType === 1 && sibling !== elem ) { - siblings.push( sibling ); - } - } - - return siblings; - - }; - - /** - * Get data from a URL query string. - * @param {String} field The field to get from the URL - * @param {String} url The URL to parse - * @return {String} The field value - */ - buoy.getQueryString = function ( field, url ) { - var href = url ? url : window.location.href; - var reg = new RegExp( '[?&]' + field + '=([^&#]*)', 'i' ); - var string = reg.exec(href); - return string ? string[1] : null; - }; - - - // - // Public APIs - // - - return buoy; - -}); \ No newline at end of file diff --git a/src/js/smooth-scroll.js b/src/js/smooth-scroll.js index 336c715..692da30 100755 --- a/src/js/smooth-scroll.js +++ b/src/js/smooth-scroll.js @@ -1,10 +1,10 @@ (function (root, factory) { if ( typeof define === 'function' && define.amd ) { - define(['buoy'], factory(root)); + define([], factory(root)); } else if ( typeof exports === 'object' ) { - module.exports = factory(root, require('buoy')); + module.exports = factory(root); } else { - root.smoothScroll = factory(root, root.buoy); + root.smoothScroll = factory(root); } })(typeof global !== 'undefined' ? global : this.window || this.global, function (root) { From f90a38bbacff559c2ba48213d2280c99c0fc6f4e Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Tue, 4 Aug 2015 11:42:41 -0400 Subject: [PATCH 146/285] Updated readme --- README.md | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index bbebf0e..3ad84b9 100755 --- a/README.md +++ b/README.md @@ -204,18 +204,18 @@ Add a `[data-scroll-header]` data attribute to fixed headers. Smooth Scroll will Smooth Scroll does not include an option to animate scrolling to links on other pages, but you can easily add this functionality using the API. 1. Do *not* add the `data-scroll` attribute to links to other pages. Treat them like normal links, and include your anchor link hash as normal. - ```markup - - ``` + ```markup + + ``` 2. Add the following script to the footer of your page, after the `smoothScroll.init()` function. - ```markup - - ``` + ```markup + + ``` ## Browser Compatibility From bc297310a34974016cd79110cb6e7bfb8e746760 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Tue, 4 Aug 2015 11:44:43 -0400 Subject: [PATCH 147/285] Updated readme --- README.md | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 3ad84b9..fb10864 100755 --- a/README.md +++ b/README.md @@ -204,18 +204,20 @@ Add a `[data-scroll-header]` data attribute to fixed headers. Smooth Scroll will Smooth Scroll does not include an option to animate scrolling to links on other pages, but you can easily add this functionality using the API. 1. Do *not* add the `data-scroll` attribute to links to other pages. Treat them like normal links, and include your anchor link hash as normal. - ```markup - - ``` + + ```markup + + ``` 2. Add the following script to the footer of your page, after the `smoothScroll.init()` function. - ```markup - - ``` + + ```markup + + ``` ## Browser Compatibility From 064e315941c4790cb452530946512ee5cc1e7f34 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Tue, 4 Aug 2015 11:46:10 -0400 Subject: [PATCH 148/285] Updated readme --- README.md | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index fb10864..398da12 100755 --- a/README.md +++ b/README.md @@ -205,19 +205,19 @@ Smooth Scroll does not include an option to animate scrolling to links on other 1. Do *not* add the `data-scroll` attribute to links to other pages. Treat them like normal links, and include your anchor link hash as normal. - ```markup - - ``` + ```markup + + ``` 2. Add the following script to the footer of your page, after the `smoothScroll.init()` function. - ```markup - - ``` + ``markup + + ``` ## Browser Compatibility From 1a7d964b61bf6d3dda2d988ebbe8d5d3ad97a054 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Tue, 4 Aug 2015 11:46:35 -0400 Subject: [PATCH 149/285] Updated readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 398da12..9843169 100755 --- a/README.md +++ b/README.md @@ -210,7 +210,7 @@ Smooth Scroll does not include an option to animate scrolling to links on other ``` 2. Add the following script to the footer of your page, after the `smoothScroll.init()` function. - ``markup + ```markup - + diff --git a/gulpfile.js b/gulpfile.js index 77e3ff6..36e705d 100755 --- a/gulpfile.js +++ b/gulpfile.js @@ -24,15 +24,6 @@ var concat = require('gulp-concat'); var uglify = require('gulp-uglify'); var karma = require('gulp-karma'); -// Styles -var sass = require('gulp-sass'); -var prefix = require('gulp-autoprefixer'); -var minify = require('gulp-minify-css'); - -// SVGs -var svgmin = require('gulp-svgmin'); -var svgstore = require('gulp-svgstore'); - // Docs var markdown = require('gulp-markdown'); var fileinclude = require('gulp-file-include'); @@ -49,15 +40,6 @@ var paths = { input: 'src/js/*', output: 'dist/js/' }, - styles: { - input: 'src/sass/**/*.{scss,sass}', - output: 'dist/css/' - }, - svgs: { - input: 'src/svg/*', - output: 'dist/svg/' - }, - static: 'src/static/**', test: { input: 'src/js/**/*.js', karma: 'test/karma.conf.js', @@ -80,19 +62,18 @@ var paths = { var banner = { full : - '/**\n' + - ' * <%= package.name %> v<%= package.version %>\n' + - ' * <%= package.description %>, by <%= package.author.name %>.\n' + + '/*!\n' + + ' * <%= package.name %> v<%= package.version %>: <%= package.description %>\n' + + ' * (c) ' + new Date().getFullYear() + ' <%= package.author.name %>\n' + + ' * MIT License\n' + ' * <%= package.repository.url %>\n' + - ' * \n' + - ' * Free to use under the MIT License.\n' + - ' * http://gomakethings.com/mit/\n' + ' */\n\n', min : - '/**' + - ' <%= package.name %> v<%= package.version %>, by Chris Ferdinandi' + + '/*!' + + ' <%= package.name %> v<%= package.version %>' + + ' | (c) ' + new Date().getFullYear() + ' <%= package.author.name %>' + + ' | MIT License' + ' | <%= package.repository.url %>' + - ' | Licensed under MIT: http://gomakethings.com/mit/' + ' */\n' }; @@ -124,61 +105,6 @@ gulp.task('build:scripts', ['clean:dist'], function() { .pipe(jsTasks()); }); -// Process, lint, and minify Sass files -gulp.task('build:styles', ['clean:dist'], function() { - return gulp.src(paths.styles.input) - .pipe(plumber()) - .pipe(sass({ - outputStyle: 'expanded', - sourceComments: true - })) - .pipe(flatten()) - .pipe(prefix({ - browsers: ['last 2 version', '> 1%'], - cascade: true, - remove: true - })) - .pipe(header(banner.full, { package : package })) - .pipe(gulp.dest(paths.styles.output)) - .pipe(rename({ suffix: '.min' })) - .pipe(minify()) - .pipe(header(banner.min, { package : package })) - .pipe(gulp.dest(paths.styles.output)); -}); - -// Generate SVG sprites -gulp.task('build:svgs', ['clean:dist'], function () { - return gulp.src(paths.svgs.input) - .pipe(plumber()) - .pipe(tap(function (file, t) { - if ( file.isDirectory() ) { - var name = file.relative + '.svg'; - return gulp.src(file.path + '/*.svg') - .pipe(svgmin()) - .pipe(svgstore({ - fileName: name, - prefix: 'icon-', - inlineSvg: true - })) - .pipe(gulp.dest(paths.svgs.output)); - } - })) - .pipe(svgmin()) - .pipe(svgstore({ - fileName: 'icons.svg', - prefix: 'icon-', - inlineSvg: true - })) - .pipe(gulp.dest(paths.svgs.output)); -}); - -// Copy static files into output folder -gulp.task('copy:static', ['clean:dist'], function() { - return gulp.src(paths.static) - .pipe(plumber()) - .pipe(gulp.dest(paths.output)); -}); - // Lint scripts gulp.task('lint:scripts', function () { return gulp.src(paths.scripts.input) @@ -187,10 +113,16 @@ gulp.task('lint:scripts', function () { .pipe(jshint.reporter('jshint-stylish')); }); -// Remove prexisting content from output and test folders +// Remove pre-existing content from output and test folders gulp.task('clean:dist', function () { del.sync([ - paths.output, + paths.output + ]); +}); + +// Remove pre-existing content from text folders +gulp.task('clean:test', function () { + del.sync([ paths.test.coverage, paths.test.results ]); @@ -264,10 +196,7 @@ gulp.task('refresh', ['compile', 'docs'], function () { gulp.task('compile', [ 'lint:scripts', 'clean:dist', - 'copy:static', - 'build:scripts', - 'build:svgs', - 'build:styles' + 'build:scripts' ]); // Generate documentation @@ -278,20 +207,20 @@ gulp.task('docs', [ 'copy:assets' ]); -// Generate documentation -gulp.task('tests', [ - 'test:scripts' -]); - -// Compile files, generate docs, and run unit tests (default) +// Compile files and generate docs (default) gulp.task('default', [ 'compile', - 'docs', - 'tests' + 'docs' ]); -// Compile files, generate docs, and run unit tests when something changes +// Compile files and generate docs when something changes gulp.task('watch', [ 'listen', 'default' +]); + +// Run unit tests +gulp.task('test', [ + 'default', + 'test:scripts' ]); \ No newline at end of file diff --git a/package.json b/package.json index e4eb0f7..9d4bbfc 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "smooth-scroll", - "version": "7.0.2", + "version": "7.1.0", "description": "Animate scrolling to anchor links", "main": "./dist/js/smooth-scroll.js", "author": { @@ -37,11 +37,6 @@ "karma-phantomjs-launcher": "^0.2.0", "karma-spec-reporter": "^0.0.19", "karma-htmlfile-reporter": "^0.2.1", - "gulp-sass": "^2.0.3", - "gulp-minify-css": "^1.2.0", - "gulp-autoprefixer": "^2.3.1", - "gulp-svgmin": "^1.1.2", - "gulp-svgstore": "^5.0.2", "gulp-markdown": "^1.0.0", "gulp-file-include": "^0.11.1" } diff --git a/src/docs/_templates/_footer.html b/src/docs/_templates/_footer.html index d8d3a12..81c0ea3 100644 --- a/src/docs/_templates/_footer.html +++ b/src/docs/_templates/_footer.html @@ -3,16 +3,9 @@ - - + diff --git a/src/docs/_templates/_header.html b/src/docs/_templates/_header.html index 217d982..2bd0e5c 100644 --- a/src/docs/_templates/_header.html +++ b/src/docs/_templates/_header.html @@ -7,12 +7,19 @@ - + -
+
``` -### Animating links to other pages - -Smooth Scroll does not include an option to animate scrolling to links on other pages, but you can easily add this functionality using the API. - -1. Do *not* add the `data-scroll` attribute to links to other pages. Treat them like normal links, and include your anchor link hash as normal. - - ```html - - ``` -2. Add the following script to the footer of your page, after the `smoothScroll.init()` function. +### Animating links to other pages [NEW in v10] - ```html - - ``` +Smooth Scroll now supports animating anchor links to other pages. Simply make sure that `scrollOnLoad` is set to `true` (the default) and point your link to the anchor on the page as normal. ## Browser Compatibility @@ -222,7 +218,9 @@ Smooth Scroll is built with modern JavaScript APIs, and uses progressive enhance ## Known Issues -If the `` element has been assigned a height of `100%`, Smooth Scroll is unable to properly calculate page distances and will not scroll to the right location. The `` element can have a fixed, non-percentage based height (ex. `500px`), or a height of `auto`. +- If the `` element has been assigned a height of `100%`, Smooth Scroll is unable to properly calculate page distances and will not scroll to the right location. The `` element can have a fixed, non-percentage based height (ex. `500px`), or a height of `auto`. +- SmoothScroll looks for a `hash` on the `href` of the link. As a result passing in an empty hash (`#`) will not work and will jump to the top of the page. +- Many browsers will treat `#top` the same as an empty hash (`#`), resulting in a jump to the top of the page. To animate scrolling to the top of the page, please use a different ID. diff --git a/dist/js/smooth-scroll.js b/dist/js/smooth-scroll.js index 20b588a..f4b84ce 100755 --- a/dist/js/smooth-scroll.js +++ b/dist/js/smooth-scroll.js @@ -1,6 +1,6 @@ /*! - * smooth-scroll v7.1.1: Animate scrolling to anchor links - * (c) 2015 Chris Ferdinandi + * smooth-scroll v8.0.0: Animate scrolling to anchor links + * (c) 2016 Chris Ferdinandi * MIT License * http://github.com/cferdinandi/smooth-scroll */ @@ -22,8 +22,8 @@ // var smoothScroll = {}; // Object for public APIs - var supports = 'querySelector' in document && 'addEventListener' in root; // Feature test - var settings, eventTimeout, fixedHeader, headerHeight; + var supports = 'querySelector' in document && 'addEventListener' in root && 'onhashchange' in root; // Feature test + var settings, eventTimeout, fixedHeader, headerHeight, anchor; // Default settings var defaults = { @@ -32,7 +32,7 @@ speed: 500, easing: 'easeInOutCubic', offset: 0, - updateURL: true, + scrollOnLoad: true, callback: function () {} }; @@ -170,12 +170,18 @@ /** * Escape special characters for use with querySelector - * @private + * @public * @param {String} id The anchor ID to escape * @author Mathias Bynens * @link https://github.com/mathiasbynens/CSS.escape */ - var escapeCharacters = function ( id ) { + smoothScroll.escapeCharacters = function ( id ) { + + // Remove leading hash + if ( id.charAt(0) === '#' ) { + id = id.substr(1); + } + var string = String(id); var length = string.length; var index = -1; @@ -237,7 +243,9 @@ result += '\\' + string.charAt(index); } - return result; + + return '#' + result; + }; /** @@ -309,17 +317,10 @@ }; /** - * Update the URL - * @private - * @param {Element} anchor The element to scroll to - * @param {Boolean} url Whether or not to update the URL history + * Get the height of a fixed header in pixels + * @param {Node} header The header + * @return {Integer} The header height in pixels */ - var updateUrl = function ( anchor, url ) { - if ( root.history.pushState && (url || url === 'true') && root.location.protocol !== 'file:' ) { - root.history.pushState( null, null, [root.location.protocol, '//', root.location.host, root.location.pathname, root.location.search, anchor].join('') ); - } - }; - var getHeaderHeight = function ( header ) { return header === null ? 0 : ( getHeight( header ) + header.offsetTop ); }; @@ -331,28 +332,26 @@ * @param {Element} anchor The element to scroll to * @param {Object} options */ - smoothScroll.animateScroll = function ( toggle, anchor, options ) { + smoothScroll.animateScroll = function ( anchor, toggle, options ) { // Options and overrides var overrides = getDataOptions( toggle ? toggle.getAttribute('data-options') : null ); var settings = extend( settings || defaults, options || {}, overrides ); // Merge user options with defaults - anchor = '#' + escapeCharacters(anchor.substr(1)); // Escape special characters and leading numbers // Selectors and variables - var anchorElem = anchor === '#' ? root.document.documentElement : root.document.querySelector(anchor); + var isNum = Object.prototype.toString.call( anchor ) === '[object Number]' ? true : false; + var anchorElem = isNum ? null : root.document.querySelector(anchor); + if ( !isNum && !anchorElem ) return; var startLocation = root.pageYOffset; // Current location on the page 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 = getEndLocation( anchorElem, headerHeight, parseInt(settings.offset, 10) ); // Scroll to location + 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; var percentage, position; - // Update URL - updateUrl(anchor, settings.updateURL); - /** * Stop the scroll animation when it reaches its target (or the bottom/top of page) * @private @@ -364,8 +363,10 @@ var currentLocation = root.pageYOffset; if ( position == endLocation || currentLocation == endLocation || ( (root.innerHeight + currentLocation) >= documentHeight ) ) { clearInterval(animationInterval); - anchorElem.focus(); - settings.callback( toggle, anchor ); // Run callbacks after animation complete + if ( anchorElem ) { + anchorElem.focus(); + } + settings.callback( anchor, toggle ); // Run callbacks after animation complete } }; @@ -404,24 +405,65 @@ }; /** - * If smooth scroll element clicked, animate scroll + * Handle has change event + * @private + */ + var hashChangeHandler = function () { + + // Get hash from URL + var hash = root.location.hash; + + // If anchor target is cached, reset it's ID + if ( anchor ) { + anchor.id = anchor.getAttribute( 'data-scroll-id' ); + anchor = null; + } + + // If there's a URL hash, animate scrolling to the matching ID + if ( !hash ) return; + hash = smoothScroll.escapeCharacters( hash ); // Escape special characters and leading numbers + var toggle = document.querySelector( settings.select + '[href*="' + hash + '"]'); + smoothScroll.animateScroll( hash, toggle, settings); // Animate scroll + + }; + + /** + * Handle toggle click events * @private + * @param {Event} event */ - var eventHandler = function (event) { + var clickHandler = function (event) { + + // Check if event target is a smooth scroll link and has a hash var toggle = getClosest( event.target, settings.selector ); - if ( toggle && toggle.tagName.toLowerCase() === 'a' ) { - event.preventDefault(); // Prevent default click event - smoothScroll.animateScroll( toggle, toggle.hash, settings); // Animate scroll + if ( !toggle || !toggle.hash ) return; + + // Escape the hash characters + var hash = smoothScroll.escapeCharacters( toggle.hash ); // Escape special characters and leading numbers + + // If hash is already active, animate immediately (no hash change will fire) + if ( hash === ( root.location.hash || '#top' ) ) { + smoothScroll.animateScroll( hash, toggle, settings); + return; + } + + // Get the anchor target + anchor = document.querySelector( hash ); + + // If anchor exists, save the ID as a data attribute and remove it (prevents scroll jump) + if ( anchor ) { + anchor.setAttribute( 'data-scroll-id', anchor.id ); + anchor.id = ''; } + }; /** - * On window scroll and resize, only run events at a rate of 15fps for better performance + * On window resize, only run events at a rate of 15fps for better performance * @private - * @param {Function} eventTimeout Timeout function - * @param {Object} settings + * @param {Event} event */ - var eventThrottler = function (event) { + var resizeThrottler = function (event) { if ( !eventTimeout ) { eventTimeout = setTimeout(function() { eventTimeout = null; // Reset timeout @@ -440,14 +482,16 @@ if ( !settings ) return; // Remove event listeners - root.document.removeEventListener( 'click', eventHandler, false ); - root.removeEventListener( 'resize', eventThrottler, false ); + document.removeEventListener( 'click', clickHandler, false ); + root.removeEventListener( 'hashchange', hashChangeHandler, false ); + root.removeEventListener( 'resize', resizeThrottler, false ); - // Reset varaibles + // Reset variables settings = null; eventTimeout = null; fixedHeader = null; headerHeight = null; + anchor = null; }; /** @@ -468,9 +512,18 @@ fixedHeader = root.document.querySelector( settings.selectorHeader ); // Get the fixed header headerHeight = getHeaderHeight( fixedHeader ); - // When a toggle is clicked, run the click handler - root.document.addEventListener('click', eventHandler, false ); - if ( fixedHeader ) { root.addEventListener( 'resize', eventThrottler, false ); } + // Event listeners + document.addEventListener('click', clickHandler, false); + root.addEventListener('hashchange', hashChangeHandler, false); + if ( fixedHeader ) { root.addEventListener( 'resize', resizeThrottler, false ); } + + // Scroll on load + if ( settings.scrollOnLoad ) { + setTimeout(function() { + window.scrollTo(0, 0); + }, 1); + hashChangeHandler(); + } }; diff --git a/dist/js/smooth-scroll.min.js b/dist/js/smooth-scroll.min.js index fb7d9ca..fd84884 100755 --- a/dist/js/smooth-scroll.min.js +++ b/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ -/*! smooth-scroll v7.1.1 | (c) 2015 Chris Ferdinandi | MIT License | http://github.com/cferdinandi/smooth-scroll */ -!function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)}("undefined"!=typeof global?global:this.window||this.global,function(e){"use strict";var t,n,o,r,a={},u="querySelector"in document&&"addEventListener"in e,c={selector:"[data-scroll]",selectorHeader:"[data-scroll-header]",speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callback:function(){}},i=function(){var e={},t=!1,n=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(t=arguments[0],n++);for(var r=function(n){for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(t&&"[object Object]"===Object.prototype.toString.call(n[o])?e[o]=i(!0,e[o],n[o]):e[o]=n[o])};o>n;n++){var a=arguments[n];r(a)}return e},s=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},l=function(e,t){var n,o,r=t.charAt(0),a="classList"in document.documentElement;for("["===r&&(t=t.substr(1,t.length-2),n=t.split("="),n.length>1&&(o=!0,n[1]=n[1].replace(/"/g,"").replace(/'/g,"")));e&&e!==document;e=e.parentNode){if("."===r)if(a){if(e.classList.contains(t.substr(1)))return e}else if(new RegExp("(^|\\s)"+t.substr(1)+"(\\s|$)").test(e.className))return e;if("#"===r&&e.id===t.substr(1))return e;if("["===r&&e.hasAttribute(n[0])){if(!o)return e;if(e.getAttribute(n[0])===n[1])return e}if(e.tagName.toLowerCase()===t)return e}return null},f=function(e){for(var t,n=String(e),o=n.length,r=-1,a="",u=n.charCodeAt(0);++r=1&&31>=t||127==t||0===r&&t>=48&&57>=t||1===r&&t>=48&&57>=t&&45===u?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(r):"\\"+n.charAt(r)}return a},d=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},m=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=o-t-n,o>=0?o:0},h=function(){return Math.max(e.document.body.scrollHeight,e.document.documentElement.scrollHeight,e.document.body.offsetHeight,e.document.documentElement.offsetHeight,e.document.body.clientHeight,e.document.documentElement.clientHeight)},p=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},g=function(t,n){e.history.pushState&&(n||"true"===n)&&"file:"!==e.location.protocol&&e.history.pushState(null,null,[e.location.protocol,"//",e.location.host,e.location.pathname,e.location.search,t].join(""))},b=function(e){return null===e?0:s(e)+e.offsetTop};a.animateScroll=function(t,n,a){var u=p(t?t.getAttribute("data-options"):null),s=i(s||c,a||{},u);n="#"+f(n.substr(1));var l="#"===n?e.document.documentElement:e.document.querySelector(n),v=e.pageYOffset;o||(o=e.document.querySelector(s.selectorHeader)),r||(r=b(o));var y,O,S,I=m(l,r,parseInt(s.offset,10)),H=I-v,E=h(),L=0;g(n,s.updateURL);var j=function(o,r,a){var u=e.pageYOffset;(o==r||u==r||e.innerHeight+u>=E)&&(clearInterval(a),l.focus(),s.callback(t,n))},w=function(){L+=16,O=L/parseInt(s.speed,10),O=O>1?1:O,S=v+H*d(s.easing,O),e.scrollTo(0,Math.floor(S)),j(S,I,y)},C=function(){y=setInterval(w,16)};0===e.pageYOffset&&e.scrollTo(0,0),C()};var v=function(e){var n=l(e.target,t.selector);n&&"a"===n.tagName.toLowerCase()&&(e.preventDefault(),a.animateScroll(n,n.hash,t))},y=function(e){n||(n=setTimeout(function(){n=null,r=b(o)},66))};return a.destroy=function(){t&&(e.document.removeEventListener("click",v,!1),e.removeEventListener("resize",y,!1),t=null,n=null,o=null,r=null)},a.init=function(n){u&&(a.destroy(),t=i(c,n||{}),o=e.document.querySelector(t.selectorHeader),r=b(o),e.document.addEventListener("click",v,!1),o&&e.addEventListener("resize",y,!1))},a}); \ No newline at end of file +/*! smooth-scroll v8.0.0 | (c) 2016 Chris Ferdinandi | MIT License | http://github.com/cferdinandi/smooth-scroll */ +!function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)}("undefined"!=typeof global?global:this.window||this.global,function(e){"use strict";var t,n,r,o,a,c={},i="querySelector"in document&&"addEventListener"in e&&"onhashchange"in e,u={selector:"[data-scroll]",selectorHeader:"[data-scroll-header]",speed:500,easing:"easeInOutCubic",offset:0,scrollOnLoad:!0,callback:function(){}},s=function(){var e={},t=!1,n=0,r=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(t=arguments[0],n++);for(var o=function(n){for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(t&&"[object Object]"===Object.prototype.toString.call(n[r])?e[r]=s(!0,e[r],n[r]):e[r]=n[r])};r>n;n++){var a=arguments[n];o(a)}return e},l=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},f=function(e,t){var n,r,o=t.charAt(0),a="classList"in document.documentElement;for("["===o&&(t=t.substr(1,t.length-2),n=t.split("="),n.length>1&&(r=!0,n[1]=n[1].replace(/"/g,"").replace(/'/g,"")));e&&e!==document;e=e.parentNode){if("."===o)if(a){if(e.classList.contains(t.substr(1)))return e}else if(new RegExp("(^|\\s)"+t.substr(1)+"(\\s|$)").test(e.className))return e;if("#"===o&&e.id===t.substr(1))return e;if("["===o&&e.hasAttribute(n[0])){if(!r)return e;if(e.getAttribute(n[0])===n[1])return e}if(e.tagName.toLowerCase()===t)return e}return null};c.escapeCharacters=function(e){"#"===e.charAt(0)&&(e=e.substr(1));for(var t,n=String(e),r=n.length,o=-1,a="",c=n.charCodeAt(0);++o=1&&31>=t||127==t||0===o&&t>=48&&57>=t||1===o&&t>=48&&57>=t&&45===c?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(o):"\\"+n.charAt(o)}return"#"+a};var d=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},h=function(e,t,n){var r=0;if(e.offsetParent)do r+=e.offsetTop,e=e.offsetParent;while(e);return r=r-t-n,r>=0?r:0},m=function(){return Math.max(e.document.body.scrollHeight,e.document.documentElement.scrollHeight,e.document.body.offsetHeight,e.document.documentElement.offsetHeight,e.document.body.clientHeight,e.document.documentElement.clientHeight)},g=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},p=function(e){return null===e?0:l(e)+e.offsetTop};c.animateScroll=function(t,n,a){var c=g(n?n.getAttribute("data-options"):null),i=s(i||u,a||{},c),l="[object Number]"===Object.prototype.toString.call(t)?!0:!1,f=l?null:e.document.querySelector(t);if(l||f){var v=e.pageYOffset;r||(r=e.document.querySelector(i.selectorHeader)),o||(o=p(r));var b,O,y,S=l?t:h(f,o,parseInt(i.offset,10)),I=S-v,E=m(),H=0,L=function(r,o,a){var c=e.pageYOffset;(r==o||c==o||e.innerHeight+c>=E)&&(clearInterval(a),f&&f.focus(),i.callback(t,n))},A=function(){H+=16,O=H/parseInt(i.speed,10),O=O>1?1:O,y=v+I*d(i.easing,O),e.scrollTo(0,Math.floor(y)),L(y,S,b)},C=function(){b=setInterval(A,16)};0===e.pageYOffset&&e.scrollTo(0,0),C()}};var v=function(){var n=e.location.hash;if(a&&(a.id=a.getAttribute("data-scroll-id"),a=null),n){n=c.escapeCharacters(n);var r=document.querySelector(t.select+'[href*="'+n+'"]');c.animateScroll(n,r,t)}},b=function(n){var r=f(n.target,t.selector);if(r&&r.hash){var o=c.escapeCharacters(r.hash);if(o===(e.location.hash||"#top"))return void c.animateScroll(o,r,t);a=document.querySelector(o),a&&(a.setAttribute("data-scroll-id",a.id),a.id="")}},O=function(e){n||(n=setTimeout(function(){n=null,o=p(r)},66))};return c.destroy=function(){t&&(document.removeEventListener("click",b,!1),e.removeEventListener("hashchange",v,!1),e.removeEventListener("resize",O,!1),t=null,n=null,r=null,o=null,a=null)},c.init=function(n){i&&(c.destroy(),t=s(u,n||{}),r=e.document.querySelector(t.selectorHeader),o=p(r),document.addEventListener("click",b,!1),e.addEventListener("hashchange",v,!1),r&&e.addEventListener("resize",O,!1),t.scrollOnLoad&&(setTimeout(function(){window.scrollTo(0,0)},1),v()))},c}); \ No newline at end of file diff --git a/docs/dist/js/smooth-scroll.js b/docs/dist/js/smooth-scroll.js index 20b588a..f4b84ce 100755 --- a/docs/dist/js/smooth-scroll.js +++ b/docs/dist/js/smooth-scroll.js @@ -1,6 +1,6 @@ /*! - * smooth-scroll v7.1.1: Animate scrolling to anchor links - * (c) 2015 Chris Ferdinandi + * smooth-scroll v8.0.0: Animate scrolling to anchor links + * (c) 2016 Chris Ferdinandi * MIT License * http://github.com/cferdinandi/smooth-scroll */ @@ -22,8 +22,8 @@ // var smoothScroll = {}; // Object for public APIs - var supports = 'querySelector' in document && 'addEventListener' in root; // Feature test - var settings, eventTimeout, fixedHeader, headerHeight; + var supports = 'querySelector' in document && 'addEventListener' in root && 'onhashchange' in root; // Feature test + var settings, eventTimeout, fixedHeader, headerHeight, anchor; // Default settings var defaults = { @@ -32,7 +32,7 @@ speed: 500, easing: 'easeInOutCubic', offset: 0, - updateURL: true, + scrollOnLoad: true, callback: function () {} }; @@ -170,12 +170,18 @@ /** * Escape special characters for use with querySelector - * @private + * @public * @param {String} id The anchor ID to escape * @author Mathias Bynens * @link https://github.com/mathiasbynens/CSS.escape */ - var escapeCharacters = function ( id ) { + smoothScroll.escapeCharacters = function ( id ) { + + // Remove leading hash + if ( id.charAt(0) === '#' ) { + id = id.substr(1); + } + var string = String(id); var length = string.length; var index = -1; @@ -237,7 +243,9 @@ result += '\\' + string.charAt(index); } - return result; + + return '#' + result; + }; /** @@ -309,17 +317,10 @@ }; /** - * Update the URL - * @private - * @param {Element} anchor The element to scroll to - * @param {Boolean} url Whether or not to update the URL history + * Get the height of a fixed header in pixels + * @param {Node} header The header + * @return {Integer} The header height in pixels */ - var updateUrl = function ( anchor, url ) { - if ( root.history.pushState && (url || url === 'true') && root.location.protocol !== 'file:' ) { - root.history.pushState( null, null, [root.location.protocol, '//', root.location.host, root.location.pathname, root.location.search, anchor].join('') ); - } - }; - var getHeaderHeight = function ( header ) { return header === null ? 0 : ( getHeight( header ) + header.offsetTop ); }; @@ -331,28 +332,26 @@ * @param {Element} anchor The element to scroll to * @param {Object} options */ - smoothScroll.animateScroll = function ( toggle, anchor, options ) { + smoothScroll.animateScroll = function ( anchor, toggle, options ) { // Options and overrides var overrides = getDataOptions( toggle ? toggle.getAttribute('data-options') : null ); var settings = extend( settings || defaults, options || {}, overrides ); // Merge user options with defaults - anchor = '#' + escapeCharacters(anchor.substr(1)); // Escape special characters and leading numbers // Selectors and variables - var anchorElem = anchor === '#' ? root.document.documentElement : root.document.querySelector(anchor); + var isNum = Object.prototype.toString.call( anchor ) === '[object Number]' ? true : false; + var anchorElem = isNum ? null : root.document.querySelector(anchor); + if ( !isNum && !anchorElem ) return; var startLocation = root.pageYOffset; // Current location on the page 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 = getEndLocation( anchorElem, headerHeight, parseInt(settings.offset, 10) ); // Scroll to location + 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; var percentage, position; - // Update URL - updateUrl(anchor, settings.updateURL); - /** * Stop the scroll animation when it reaches its target (or the bottom/top of page) * @private @@ -364,8 +363,10 @@ var currentLocation = root.pageYOffset; if ( position == endLocation || currentLocation == endLocation || ( (root.innerHeight + currentLocation) >= documentHeight ) ) { clearInterval(animationInterval); - anchorElem.focus(); - settings.callback( toggle, anchor ); // Run callbacks after animation complete + if ( anchorElem ) { + anchorElem.focus(); + } + settings.callback( anchor, toggle ); // Run callbacks after animation complete } }; @@ -404,24 +405,65 @@ }; /** - * If smooth scroll element clicked, animate scroll + * Handle has change event + * @private + */ + var hashChangeHandler = function () { + + // Get hash from URL + var hash = root.location.hash; + + // If anchor target is cached, reset it's ID + if ( anchor ) { + anchor.id = anchor.getAttribute( 'data-scroll-id' ); + anchor = null; + } + + // If there's a URL hash, animate scrolling to the matching ID + if ( !hash ) return; + hash = smoothScroll.escapeCharacters( hash ); // Escape special characters and leading numbers + var toggle = document.querySelector( settings.select + '[href*="' + hash + '"]'); + smoothScroll.animateScroll( hash, toggle, settings); // Animate scroll + + }; + + /** + * Handle toggle click events * @private + * @param {Event} event */ - var eventHandler = function (event) { + var clickHandler = function (event) { + + // Check if event target is a smooth scroll link and has a hash var toggle = getClosest( event.target, settings.selector ); - if ( toggle && toggle.tagName.toLowerCase() === 'a' ) { - event.preventDefault(); // Prevent default click event - smoothScroll.animateScroll( toggle, toggle.hash, settings); // Animate scroll + if ( !toggle || !toggle.hash ) return; + + // Escape the hash characters + var hash = smoothScroll.escapeCharacters( toggle.hash ); // Escape special characters and leading numbers + + // If hash is already active, animate immediately (no hash change will fire) + if ( hash === ( root.location.hash || '#top' ) ) { + smoothScroll.animateScroll( hash, toggle, settings); + return; + } + + // Get the anchor target + anchor = document.querySelector( hash ); + + // If anchor exists, save the ID as a data attribute and remove it (prevents scroll jump) + if ( anchor ) { + anchor.setAttribute( 'data-scroll-id', anchor.id ); + anchor.id = ''; } + }; /** - * On window scroll and resize, only run events at a rate of 15fps for better performance + * On window resize, only run events at a rate of 15fps for better performance * @private - * @param {Function} eventTimeout Timeout function - * @param {Object} settings + * @param {Event} event */ - var eventThrottler = function (event) { + var resizeThrottler = function (event) { if ( !eventTimeout ) { eventTimeout = setTimeout(function() { eventTimeout = null; // Reset timeout @@ -440,14 +482,16 @@ if ( !settings ) return; // Remove event listeners - root.document.removeEventListener( 'click', eventHandler, false ); - root.removeEventListener( 'resize', eventThrottler, false ); + document.removeEventListener( 'click', clickHandler, false ); + root.removeEventListener( 'hashchange', hashChangeHandler, false ); + root.removeEventListener( 'resize', resizeThrottler, false ); - // Reset varaibles + // Reset variables settings = null; eventTimeout = null; fixedHeader = null; headerHeight = null; + anchor = null; }; /** @@ -468,9 +512,18 @@ fixedHeader = root.document.querySelector( settings.selectorHeader ); // Get the fixed header headerHeight = getHeaderHeight( fixedHeader ); - // When a toggle is clicked, run the click handler - root.document.addEventListener('click', eventHandler, false ); - if ( fixedHeader ) { root.addEventListener( 'resize', eventThrottler, false ); } + // Event listeners + document.addEventListener('click', clickHandler, false); + root.addEventListener('hashchange', hashChangeHandler, false); + if ( fixedHeader ) { root.addEventListener( 'resize', resizeThrottler, false ); } + + // Scroll on load + if ( settings.scrollOnLoad ) { + setTimeout(function() { + window.scrollTo(0, 0); + }, 1); + hashChangeHandler(); + } }; diff --git a/docs/dist/js/smooth-scroll.min.js b/docs/dist/js/smooth-scroll.min.js index fb7d9ca..fd84884 100755 --- a/docs/dist/js/smooth-scroll.min.js +++ b/docs/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ -/*! smooth-scroll v7.1.1 | (c) 2015 Chris Ferdinandi | MIT License | http://github.com/cferdinandi/smooth-scroll */ -!function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)}("undefined"!=typeof global?global:this.window||this.global,function(e){"use strict";var t,n,o,r,a={},u="querySelector"in document&&"addEventListener"in e,c={selector:"[data-scroll]",selectorHeader:"[data-scroll-header]",speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callback:function(){}},i=function(){var e={},t=!1,n=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(t=arguments[0],n++);for(var r=function(n){for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(t&&"[object Object]"===Object.prototype.toString.call(n[o])?e[o]=i(!0,e[o],n[o]):e[o]=n[o])};o>n;n++){var a=arguments[n];r(a)}return e},s=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},l=function(e,t){var n,o,r=t.charAt(0),a="classList"in document.documentElement;for("["===r&&(t=t.substr(1,t.length-2),n=t.split("="),n.length>1&&(o=!0,n[1]=n[1].replace(/"/g,"").replace(/'/g,"")));e&&e!==document;e=e.parentNode){if("."===r)if(a){if(e.classList.contains(t.substr(1)))return e}else if(new RegExp("(^|\\s)"+t.substr(1)+"(\\s|$)").test(e.className))return e;if("#"===r&&e.id===t.substr(1))return e;if("["===r&&e.hasAttribute(n[0])){if(!o)return e;if(e.getAttribute(n[0])===n[1])return e}if(e.tagName.toLowerCase()===t)return e}return null},f=function(e){for(var t,n=String(e),o=n.length,r=-1,a="",u=n.charCodeAt(0);++r=1&&31>=t||127==t||0===r&&t>=48&&57>=t||1===r&&t>=48&&57>=t&&45===u?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(r):"\\"+n.charAt(r)}return a},d=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},m=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=o-t-n,o>=0?o:0},h=function(){return Math.max(e.document.body.scrollHeight,e.document.documentElement.scrollHeight,e.document.body.offsetHeight,e.document.documentElement.offsetHeight,e.document.body.clientHeight,e.document.documentElement.clientHeight)},p=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},g=function(t,n){e.history.pushState&&(n||"true"===n)&&"file:"!==e.location.protocol&&e.history.pushState(null,null,[e.location.protocol,"//",e.location.host,e.location.pathname,e.location.search,t].join(""))},b=function(e){return null===e?0:s(e)+e.offsetTop};a.animateScroll=function(t,n,a){var u=p(t?t.getAttribute("data-options"):null),s=i(s||c,a||{},u);n="#"+f(n.substr(1));var l="#"===n?e.document.documentElement:e.document.querySelector(n),v=e.pageYOffset;o||(o=e.document.querySelector(s.selectorHeader)),r||(r=b(o));var y,O,S,I=m(l,r,parseInt(s.offset,10)),H=I-v,E=h(),L=0;g(n,s.updateURL);var j=function(o,r,a){var u=e.pageYOffset;(o==r||u==r||e.innerHeight+u>=E)&&(clearInterval(a),l.focus(),s.callback(t,n))},w=function(){L+=16,O=L/parseInt(s.speed,10),O=O>1?1:O,S=v+H*d(s.easing,O),e.scrollTo(0,Math.floor(S)),j(S,I,y)},C=function(){y=setInterval(w,16)};0===e.pageYOffset&&e.scrollTo(0,0),C()};var v=function(e){var n=l(e.target,t.selector);n&&"a"===n.tagName.toLowerCase()&&(e.preventDefault(),a.animateScroll(n,n.hash,t))},y=function(e){n||(n=setTimeout(function(){n=null,r=b(o)},66))};return a.destroy=function(){t&&(e.document.removeEventListener("click",v,!1),e.removeEventListener("resize",y,!1),t=null,n=null,o=null,r=null)},a.init=function(n){u&&(a.destroy(),t=i(c,n||{}),o=e.document.querySelector(t.selectorHeader),r=b(o),e.document.addEventListener("click",v,!1),o&&e.addEventListener("resize",y,!1))},a}); \ No newline at end of file +/*! smooth-scroll v8.0.0 | (c) 2016 Chris Ferdinandi | MIT License | http://github.com/cferdinandi/smooth-scroll */ +!function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)}("undefined"!=typeof global?global:this.window||this.global,function(e){"use strict";var t,n,r,o,a,c={},i="querySelector"in document&&"addEventListener"in e&&"onhashchange"in e,u={selector:"[data-scroll]",selectorHeader:"[data-scroll-header]",speed:500,easing:"easeInOutCubic",offset:0,scrollOnLoad:!0,callback:function(){}},s=function(){var e={},t=!1,n=0,r=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(t=arguments[0],n++);for(var o=function(n){for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(t&&"[object Object]"===Object.prototype.toString.call(n[r])?e[r]=s(!0,e[r],n[r]):e[r]=n[r])};r>n;n++){var a=arguments[n];o(a)}return e},l=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},f=function(e,t){var n,r,o=t.charAt(0),a="classList"in document.documentElement;for("["===o&&(t=t.substr(1,t.length-2),n=t.split("="),n.length>1&&(r=!0,n[1]=n[1].replace(/"/g,"").replace(/'/g,"")));e&&e!==document;e=e.parentNode){if("."===o)if(a){if(e.classList.contains(t.substr(1)))return e}else if(new RegExp("(^|\\s)"+t.substr(1)+"(\\s|$)").test(e.className))return e;if("#"===o&&e.id===t.substr(1))return e;if("["===o&&e.hasAttribute(n[0])){if(!r)return e;if(e.getAttribute(n[0])===n[1])return e}if(e.tagName.toLowerCase()===t)return e}return null};c.escapeCharacters=function(e){"#"===e.charAt(0)&&(e=e.substr(1));for(var t,n=String(e),r=n.length,o=-1,a="",c=n.charCodeAt(0);++o=1&&31>=t||127==t||0===o&&t>=48&&57>=t||1===o&&t>=48&&57>=t&&45===c?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(o):"\\"+n.charAt(o)}return"#"+a};var d=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},h=function(e,t,n){var r=0;if(e.offsetParent)do r+=e.offsetTop,e=e.offsetParent;while(e);return r=r-t-n,r>=0?r:0},m=function(){return Math.max(e.document.body.scrollHeight,e.document.documentElement.scrollHeight,e.document.body.offsetHeight,e.document.documentElement.offsetHeight,e.document.body.clientHeight,e.document.documentElement.clientHeight)},g=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},p=function(e){return null===e?0:l(e)+e.offsetTop};c.animateScroll=function(t,n,a){var c=g(n?n.getAttribute("data-options"):null),i=s(i||u,a||{},c),l="[object Number]"===Object.prototype.toString.call(t)?!0:!1,f=l?null:e.document.querySelector(t);if(l||f){var v=e.pageYOffset;r||(r=e.document.querySelector(i.selectorHeader)),o||(o=p(r));var b,O,y,S=l?t:h(f,o,parseInt(i.offset,10)),I=S-v,E=m(),H=0,L=function(r,o,a){var c=e.pageYOffset;(r==o||c==o||e.innerHeight+c>=E)&&(clearInterval(a),f&&f.focus(),i.callback(t,n))},A=function(){H+=16,O=H/parseInt(i.speed,10),O=O>1?1:O,y=v+I*d(i.easing,O),e.scrollTo(0,Math.floor(y)),L(y,S,b)},C=function(){b=setInterval(A,16)};0===e.pageYOffset&&e.scrollTo(0,0),C()}};var v=function(){var n=e.location.hash;if(a&&(a.id=a.getAttribute("data-scroll-id"),a=null),n){n=c.escapeCharacters(n);var r=document.querySelector(t.select+'[href*="'+n+'"]');c.animateScroll(n,r,t)}},b=function(n){var r=f(n.target,t.selector);if(r&&r.hash){var o=c.escapeCharacters(r.hash);if(o===(e.location.hash||"#top"))return void c.animateScroll(o,r,t);a=document.querySelector(o),a&&(a.setAttribute("data-scroll-id",a.id),a.id="")}},O=function(e){n||(n=setTimeout(function(){n=null,o=p(r)},66))};return c.destroy=function(){t&&(document.removeEventListener("click",b,!1),e.removeEventListener("hashchange",v,!1),e.removeEventListener("resize",O,!1),t=null,n=null,r=null,o=null,a=null)},c.init=function(n){i&&(c.destroy(),t=s(u,n||{}),r=e.document.querySelector(t.selectorHeader),o=p(r),document.addEventListener("click",b,!1),e.addEventListener("hashchange",v,!1),r&&e.addEventListener("resize",O,!1),t.scrollOnLoad&&(setTimeout(function(){window.scrollTo(0,0)},1),v()))},c}); \ No newline at end of file diff --git a/docs/index.html b/docs/index.html index c002dca..3fc8610 100644 --- a/docs/index.html +++ b/docs/index.html @@ -19,7 +19,7 @@ -
+
diff --git a/package.json b/package.json index 3f052fe..3e42845 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "smooth-scroll", - "version": "7.1.1", + "version": "8.0.0", "description": "Animate scrolling to anchor links", "main": "./dist/js/smooth-scroll.js", "author": { @@ -21,7 +21,7 @@ "gulp-flatten": "^0.0.4", "gulp-tap": "^0.1.3", "gulp-rename": "^1.2.2", - "gulp-header": "^1.2.2", + "gulp-header": "1.2.2", "gulp-footer": "^1.0.5", "gulp-watch": "^4.2.4", "gulp-livereload": "^3.8.0", @@ -29,10 +29,12 @@ "jshint-stylish": "^2.0.1", "gulp-concat": "^2.6.0", "gulp-uglify": "^1.2.0", + "phantomjs": "^1.9.19", "karma": "^0.12.37", "gulp-karma": "^0.0.4", "karma-coverage": "^0.4.2", "jasmine": "^2.3.1", + "jasmine-core": "^2.4.1", "karma-jasmine": "^0.3.6", "karma-phantomjs-launcher": "^0.2.0", "karma-spec-reporter": "^0.0.19", diff --git a/src/docs/_templates/_header.html b/src/docs/_templates/_header.html index 2bd0e5c..d6f7a3e 100644 --- a/src/docs/_templates/_header.html +++ b/src/docs/_templates/_header.html @@ -19,7 +19,7 @@ -
+
``` -### Animating links to other pages [NEW in v10] +### Animating links to other pages -Smooth Scroll now supports animating anchor links to other pages. Simply make sure that `scrollOnLoad` is set to `true` (the default) and point your link to the anchor on the page as normal. +This is an often requested feature, but Smooth Scroll does not include an option to animate scrolling to links on other pages. + +You can attempt to implement it using the API, but it's very difficult to prevent the automatic browser jump when the page loads, and anything I've done to work around it results in weird, janky issues, so I've decided to leave this out of the core. Here's a potential workaround... + +1. Do *not* add the `data-scroll` attribute to links to other pages. Treat them like normal links, and include your anchor link hash as normal. + + ```html + + ``` +2. Add the following script to the footer of your page, after the `smoothScroll.init()` function. + + ```html + + ``` ## Browser Compatibility diff --git a/dist/js/smooth-scroll.js b/dist/js/smooth-scroll.js index 5cec40d..69540f2 100755 --- a/dist/js/smooth-scroll.js +++ b/dist/js/smooth-scroll.js @@ -1,5 +1,5 @@ /*! - * smooth-scroll v8.1.0: Animate scrolling to anchor links + * smooth-scroll v9.0.0: Animate scrolling to anchor links * (c) 2016 Chris Ferdinandi * MIT License * http://github.com/cferdinandi/smooth-scroll @@ -22,8 +22,8 @@ // var smoothScroll = {}; // Object for public APIs - var supports = 'querySelector' in document && 'addEventListener' in root && 'onhashchange' in root; // Feature test - var settings, eventTimeout, fixedHeader, headerHeight, anchor; + var supports = 'querySelector' in document && 'addEventListener' in root; // Feature test + var settings, eventTimeout, fixedHeader, headerHeight; // Default settings var defaults = { @@ -32,7 +32,7 @@ speed: 500, easing: 'easeInOutCubic', offset: 0, - scrollOnLoad: true, + updateURL: true, callback: function () {} }; @@ -317,10 +317,17 @@ }; /** - * Get the height of a fixed header in pixels - * @param {Node} header The header - * @return {Integer} The header height in pixels + * Update the URL + * @private + * @param {Element} anchor The element to scroll to + * @param {Boolean} url Whether or not to update the URL history */ + var updateUrl = function ( anchor, url ) { + if ( root.history.pushState && (url || url === 'true') && root.location.protocol !== 'file:' ) { + root.history.pushState( null, null, [root.location.protocol, '//', root.location.host, root.location.pathname, root.location.search, anchor].join('') ); + } + }; + var getHeaderHeight = function ( header ) { return header === null ? 0 : ( getHeight( header ) + header.offsetTop ); }; @@ -328,8 +335,8 @@ /** * Start/stop the scrolling animation * @public - * @param {Element} toggle The element that toggled the scroll event * @param {Element} anchor The element to scroll to + * @param {Element} toggle The element that toggled the scroll event * @param {Object} options */ smoothScroll.animateScroll = function ( anchor, toggle, options ) { @@ -340,7 +347,8 @@ // Selectors and variables var isNum = Object.prototype.toString.call( anchor ) === '[object Number]' ? true : false; - var anchorElem = isNum ? null : root.document.querySelector(anchor); + var anchorElem = isNum ? null : anchor === '#' ? root.document.documentElement : root.document.querySelector(anchor); + // var anchorElem = isNum ? null : ( anchor === '#' ? root.document.documentElement : root.document.querySelector(anchor) ); if ( !isNum && !anchorElem ) return; var startLocation = root.pageYOffset; // Current location on the page if ( !fixedHeader ) { fixedHeader = root.document.querySelector( settings.selectorHeader ); } // Get the fixed header if not already set @@ -352,6 +360,11 @@ var timeLapsed = 0; var percentage, position; + // Update URL + if ( !isNum ) { + updateUrl(anchor, settings.updateURL); + } + /** * Stop the scroll animation when it reaches its target (or the bottom/top of page) * @private @@ -363,7 +376,7 @@ var currentLocation = root.pageYOffset; if ( position == endLocation || currentLocation == endLocation || ( (root.innerHeight + currentLocation) >= documentHeight ) ) { clearInterval(animationInterval); - if ( anchorElem ) { + if ( !isNum ) { anchorElem.focus(); } settings.callback( anchor, toggle ); // Run callbacks after animation complete @@ -405,65 +418,25 @@ }; /** - * Handle has change event + * If smooth scroll element clicked, animate scroll * @private */ - var hashChangeHandler = function () { - - // Get hash from URL - var hash = root.location.hash; - - // If anchor target is cached, reset it's ID - if ( anchor ) { - anchor.id = anchor.getAttribute( 'data-scroll-id' ); - anchor = null; - } - - // If there's a URL hash, animate scrolling to the matching ID - if ( !hash ) return; - hash = smoothScroll.escapeCharacters( hash ); // Escape special characters and leading numbers - var toggle = document.querySelector( settings.select + '[href*="' + hash + '"]'); - smoothScroll.animateScroll( hash, toggle, settings); // Animate scroll - - }; - - /** - * Handle toggle click events - * @private - * @param {Event} event - */ - var clickHandler = function (event) { - - // Check if event target is a smooth scroll link and has a hash + var eventHandler = function (event) { var toggle = getClosest( event.target, settings.selector ); - if ( !toggle || !toggle.hash ) return; - - // Escape the hash characters - var hash = smoothScroll.escapeCharacters( toggle.hash ); // Escape special characters and leading numbers - - // If hash is already active, animate immediately (no hash change will fire) - if ( hash === ( root.location.hash || '#top' ) ) { - smoothScroll.animateScroll( hash, toggle, settings); - return; - } - - // Get the anchor target - anchor = document.querySelector( hash ); - - // If anchor exists, save the ID as a data attribute and remove it (prevents scroll jump) - if ( anchor ) { - anchor.setAttribute( 'data-scroll-id', anchor.id ); - anchor.id = ''; + if ( toggle && toggle.tagName.toLowerCase() === 'a' ) { + event.preventDefault(); // Prevent default click event + var hash = smoothScroll.escapeCharacters( toggle.hash ); // Escape hash characters + smoothScroll.animateScroll( hash, toggle, settings); // Animate scroll } - }; /** - * On window resize, only run events at a rate of 15fps for better performance + * On window scroll and resize, only run events at a rate of 15fps for better performance * @private - * @param {Event} event + * @param {Function} eventTimeout Timeout function + * @param {Object} settings */ - var resizeThrottler = function (event) { + var eventThrottler = function (event) { if ( !eventTimeout ) { eventTimeout = setTimeout(function() { eventTimeout = null; // Reset timeout @@ -482,16 +455,14 @@ if ( !settings ) return; // Remove event listeners - document.removeEventListener( 'click', clickHandler, false ); - root.removeEventListener( 'hashchange', hashChangeHandler, false ); - root.removeEventListener( 'resize', resizeThrottler, false ); + root.document.removeEventListener( 'click', eventHandler, false ); + root.removeEventListener( 'resize', eventThrottler, false ); - // Reset variables + // Reset varaibles settings = null; eventTimeout = null; fixedHeader = null; headerHeight = null; - anchor = null; }; /** @@ -512,18 +483,9 @@ fixedHeader = root.document.querySelector( settings.selectorHeader ); // Get the fixed header headerHeight = getHeaderHeight( fixedHeader ); - // Event listeners - document.addEventListener('click', clickHandler, false); - root.addEventListener('hashchange', hashChangeHandler, false); - if ( fixedHeader ) { root.addEventListener( 'resize', resizeThrottler, false ); } - - // Scroll on load - if ( settings.scrollOnLoad ) { - setTimeout(function() { - window.scrollTo(0, 0); - }, 1); - hashChangeHandler(); - } + // When a toggle is clicked, run the click handler + root.document.addEventListener('click', eventHandler, false ); + if ( fixedHeader ) { root.addEventListener( 'resize', eventThrottler, false ); } }; @@ -534,4 +496,4 @@ return smoothScroll; -}); +}); \ No newline at end of file diff --git a/dist/js/smooth-scroll.min.js b/dist/js/smooth-scroll.min.js index cd7fee7..5a3bfe6 100755 --- a/dist/js/smooth-scroll.min.js +++ b/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ -/*! smooth-scroll v8.1.0 | (c) 2016 Chris Ferdinandi | MIT License | http://github.com/cferdinandi/smooth-scroll */ -!function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)}("undefined"!=typeof global?global:this.window||this.global,function(e){"use strict";var t,n,r,o,a,c={},i="querySelector"in document&&"addEventListener"in e&&"onhashchange"in e,u={selector:"[data-scroll]",selectorHeader:"[data-scroll-header]",speed:500,easing:"easeInOutCubic",offset:0,scrollOnLoad:!0,callback:function(){}},s=function(){var e={},t=!1,n=0,r=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(t=arguments[0],n++);for(var o=function(n){for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(t&&"[object Object]"===Object.prototype.toString.call(n[r])?e[r]=s(!0,e[r],n[r]):e[r]=n[r])};r>n;n++){var a=arguments[n];o(a)}return e},l=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},f=function(e,t){var n,r,o=t.charAt(0),a="classList"in document.documentElement;for("["===o&&(t=t.substr(1,t.length-2),n=t.split("="),n.length>1&&(r=!0,n[1]=n[1].replace(/"/g,"").replace(/'/g,"")));e&&e!==document;e=e.parentNode){if("."===o)if(a){if(e.classList.contains(t.substr(1)))return e}else if(new RegExp("(^|\\s)"+t.substr(1)+"(\\s|$)").test(e.className))return e;if("#"===o&&e.id===t.substr(1))return e;if("["===o&&e.hasAttribute(n[0])){if(!r)return e;if(e.getAttribute(n[0])===n[1])return e}if(e.tagName.toLowerCase()===t)return e}return null};c.escapeCharacters=function(e){"#"===e.charAt(0)&&(e=e.substr(1));for(var t,n=String(e),r=n.length,o=-1,a="",c=n.charCodeAt(0);++o=1&&31>=t||127==t||0===o&&t>=48&&57>=t||1===o&&t>=48&&57>=t&&45===c?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(o):"\\"+n.charAt(o)}return"#"+a};var d=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},h=function(e,t,n){var r=0;if(e.offsetParent)do r+=e.offsetTop,e=e.offsetParent;while(e);return r=r-t-n,r>=0?r:0},m=function(){return Math.max(e.document.body.scrollHeight,e.document.documentElement.scrollHeight,e.document.body.offsetHeight,e.document.documentElement.offsetHeight,e.document.body.clientHeight,e.document.documentElement.clientHeight)},g=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},p=function(e){return null===e?0:l(e)+e.offsetTop};c.animateScroll=function(t,n,a){var c=g(n?n.getAttribute("data-options"):null),i=s(i||u,a||{},c),l="[object Number]"===Object.prototype.toString.call(t)?!0:!1,f=l?null:e.document.querySelector(t);if(l||f){var v=e.pageYOffset;r||(r=e.document.querySelector(i.selectorHeader)),o||(o=p(r));var b,O,y,S=l?t:h(f,o,parseInt(i.offset,10)),I=S-v,E=m(),H=0,L=function(r,o,a){var c=e.pageYOffset;(r==o||c==o||e.innerHeight+c>=E)&&(clearInterval(a),f&&f.focus(),i.callback(t,n))},A=function(){H+=16,O=H/parseInt(i.speed,10),O=O>1?1:O,y=v+I*d(i.easing,O),e.scrollTo(0,Math.floor(y)),L(y,S,b)},C=function(){b=setInterval(A,16)};0===e.pageYOffset&&e.scrollTo(0,0),C()}};var v=function(){var n=e.location.hash;if(a&&(a.id=a.getAttribute("data-scroll-id"),a=null),n){n=c.escapeCharacters(n);var r=document.querySelector(t.select+'[href*="'+n+'"]');c.animateScroll(n,r,t)}},b=function(n){var r=f(n.target,t.selector);if(r&&r.hash){var o=c.escapeCharacters(r.hash);if(o===(e.location.hash||"#top"))return void c.animateScroll(o,r,t);a=document.querySelector(o),a&&(a.setAttribute("data-scroll-id",a.id),a.id="")}},O=function(e){n||(n=setTimeout(function(){n=null,o=p(r)},66))};return c.destroy=function(){t&&(document.removeEventListener("click",b,!1),e.removeEventListener("hashchange",v,!1),e.removeEventListener("resize",O,!1),t=null,n=null,r=null,o=null,a=null)},c.init=function(n){i&&(c.destroy(),t=s(u,n||{}),r=e.document.querySelector(t.selectorHeader),o=p(r),document.addEventListener("click",b,!1),e.addEventListener("hashchange",v,!1),r&&e.addEventListener("resize",O,!1),t.scrollOnLoad&&(setTimeout(function(){window.scrollTo(0,0)},1),v()))},c}); \ No newline at end of file +/*! smooth-scroll v9.0.0 | (c) 2016 Chris Ferdinandi | MIT License | http://github.com/cferdinandi/smooth-scroll */ +!function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)}("undefined"!=typeof global?global:this.window||this.global,function(e){"use strict";var t,n,r,o,a={},c="querySelector"in document&&"addEventListener"in e,u={selector:"[data-scroll]",selectorHeader:"[data-scroll-header]",speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callback:function(){}},i=function(){var e={},t=!1,n=0,r=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(t=arguments[0],n++);for(var o=function(n){for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(t&&"[object Object]"===Object.prototype.toString.call(n[r])?e[r]=i(!0,e[r],n[r]):e[r]=n[r])};r>n;n++){var a=arguments[n];o(a)}return e},s=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},l=function(e,t){var n,r,o=t.charAt(0),a="classList"in document.documentElement;for("["===o&&(t=t.substr(1,t.length-2),n=t.split("="),n.length>1&&(r=!0,n[1]=n[1].replace(/"/g,"").replace(/'/g,"")));e&&e!==document;e=e.parentNode){if("."===o)if(a){if(e.classList.contains(t.substr(1)))return e}else if(new RegExp("(^|\\s)"+t.substr(1)+"(\\s|$)").test(e.className))return e;if("#"===o&&e.id===t.substr(1))return e;if("["===o&&e.hasAttribute(n[0])){if(!r)return e;if(e.getAttribute(n[0])===n[1])return e}if(e.tagName.toLowerCase()===t)return e}return null};a.escapeCharacters=function(e){"#"===e.charAt(0)&&(e=e.substr(1));for(var t,n=String(e),r=n.length,o=-1,a="",c=n.charCodeAt(0);++o=1&&31>=t||127==t||0===o&&t>=48&&57>=t||1===o&&t>=48&&57>=t&&45===c?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(o):"\\"+n.charAt(o)}return"#"+a};var f=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},d=function(e,t,n){var r=0;if(e.offsetParent)do r+=e.offsetTop,e=e.offsetParent;while(e);return r=r-t-n,r>=0?r:0},h=function(){return Math.max(e.document.body.scrollHeight,e.document.documentElement.scrollHeight,e.document.body.offsetHeight,e.document.documentElement.offsetHeight,e.document.body.clientHeight,e.document.documentElement.clientHeight)},m=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},p=function(t,n){e.history.pushState&&(n||"true"===n)&&"file:"!==e.location.protocol&&e.history.pushState(null,null,[e.location.protocol,"//",e.location.host,e.location.pathname,e.location.search,t].join(""))},g=function(e){return null===e?0:s(e)+e.offsetTop};a.animateScroll=function(t,n,a){var c=m(n?n.getAttribute("data-options"):null),s=i(s||u,a||{},c),l="[object Number]"===Object.prototype.toString.call(t)?!0:!1,b=l?null:"#"===t?e.document.documentElement:e.document.querySelector(t);if(l||b){var v=e.pageYOffset;r||(r=e.document.querySelector(s.selectorHeader)),o||(o=g(r));var y,O,S,I=l?t:d(b,o,parseInt(s.offset,10)),H=I-v,E=h(),j=0;l||p(t,s.updateURL);var C=function(r,o,a){var c=e.pageYOffset;(r==o||c==o||e.innerHeight+c>=E)&&(clearInterval(a),l||b.focus(),s.callback(t,n))},L=function(){j+=16,O=j/parseInt(s.speed,10),O=O>1?1:O,S=v+H*f(s.easing,O),e.scrollTo(0,Math.floor(S)),C(S,I,y)},w=function(){y=setInterval(L,16)};0===e.pageYOffset&&e.scrollTo(0,0),w()}};var b=function(e){var n=l(e.target,t.selector);if(n&&"a"===n.tagName.toLowerCase()){e.preventDefault();var r=a.escapeCharacters(n.hash);a.animateScroll(r,n,t)}},v=function(e){n||(n=setTimeout(function(){n=null,o=g(r)},66))};return a.destroy=function(){t&&(e.document.removeEventListener("click",b,!1),e.removeEventListener("resize",v,!1),t=null,n=null,r=null,o=null)},a.init=function(n){c&&(a.destroy(),t=i(u,n||{}),r=e.document.querySelector(t.selectorHeader),o=g(r),e.document.addEventListener("click",b,!1),r&&e.addEventListener("resize",v,!1))},a}); \ No newline at end of file diff --git a/docs/dist/js/smooth-scroll.js b/docs/dist/js/smooth-scroll.js index 5cec40d..69540f2 100755 --- a/docs/dist/js/smooth-scroll.js +++ b/docs/dist/js/smooth-scroll.js @@ -1,5 +1,5 @@ /*! - * smooth-scroll v8.1.0: Animate scrolling to anchor links + * smooth-scroll v9.0.0: Animate scrolling to anchor links * (c) 2016 Chris Ferdinandi * MIT License * http://github.com/cferdinandi/smooth-scroll @@ -22,8 +22,8 @@ // var smoothScroll = {}; // Object for public APIs - var supports = 'querySelector' in document && 'addEventListener' in root && 'onhashchange' in root; // Feature test - var settings, eventTimeout, fixedHeader, headerHeight, anchor; + var supports = 'querySelector' in document && 'addEventListener' in root; // Feature test + var settings, eventTimeout, fixedHeader, headerHeight; // Default settings var defaults = { @@ -32,7 +32,7 @@ speed: 500, easing: 'easeInOutCubic', offset: 0, - scrollOnLoad: true, + updateURL: true, callback: function () {} }; @@ -317,10 +317,17 @@ }; /** - * Get the height of a fixed header in pixels - * @param {Node} header The header - * @return {Integer} The header height in pixels + * Update the URL + * @private + * @param {Element} anchor The element to scroll to + * @param {Boolean} url Whether or not to update the URL history */ + var updateUrl = function ( anchor, url ) { + if ( root.history.pushState && (url || url === 'true') && root.location.protocol !== 'file:' ) { + root.history.pushState( null, null, [root.location.protocol, '//', root.location.host, root.location.pathname, root.location.search, anchor].join('') ); + } + }; + var getHeaderHeight = function ( header ) { return header === null ? 0 : ( getHeight( header ) + header.offsetTop ); }; @@ -328,8 +335,8 @@ /** * Start/stop the scrolling animation * @public - * @param {Element} toggle The element that toggled the scroll event * @param {Element} anchor The element to scroll to + * @param {Element} toggle The element that toggled the scroll event * @param {Object} options */ smoothScroll.animateScroll = function ( anchor, toggle, options ) { @@ -340,7 +347,8 @@ // Selectors and variables var isNum = Object.prototype.toString.call( anchor ) === '[object Number]' ? true : false; - var anchorElem = isNum ? null : root.document.querySelector(anchor); + var anchorElem = isNum ? null : anchor === '#' ? root.document.documentElement : root.document.querySelector(anchor); + // var anchorElem = isNum ? null : ( anchor === '#' ? root.document.documentElement : root.document.querySelector(anchor) ); if ( !isNum && !anchorElem ) return; var startLocation = root.pageYOffset; // Current location on the page if ( !fixedHeader ) { fixedHeader = root.document.querySelector( settings.selectorHeader ); } // Get the fixed header if not already set @@ -352,6 +360,11 @@ var timeLapsed = 0; var percentage, position; + // Update URL + if ( !isNum ) { + updateUrl(anchor, settings.updateURL); + } + /** * Stop the scroll animation when it reaches its target (or the bottom/top of page) * @private @@ -363,7 +376,7 @@ var currentLocation = root.pageYOffset; if ( position == endLocation || currentLocation == endLocation || ( (root.innerHeight + currentLocation) >= documentHeight ) ) { clearInterval(animationInterval); - if ( anchorElem ) { + if ( !isNum ) { anchorElem.focus(); } settings.callback( anchor, toggle ); // Run callbacks after animation complete @@ -405,65 +418,25 @@ }; /** - * Handle has change event + * If smooth scroll element clicked, animate scroll * @private */ - var hashChangeHandler = function () { - - // Get hash from URL - var hash = root.location.hash; - - // If anchor target is cached, reset it's ID - if ( anchor ) { - anchor.id = anchor.getAttribute( 'data-scroll-id' ); - anchor = null; - } - - // If there's a URL hash, animate scrolling to the matching ID - if ( !hash ) return; - hash = smoothScroll.escapeCharacters( hash ); // Escape special characters and leading numbers - var toggle = document.querySelector( settings.select + '[href*="' + hash + '"]'); - smoothScroll.animateScroll( hash, toggle, settings); // Animate scroll - - }; - - /** - * Handle toggle click events - * @private - * @param {Event} event - */ - var clickHandler = function (event) { - - // Check if event target is a smooth scroll link and has a hash + var eventHandler = function (event) { var toggle = getClosest( event.target, settings.selector ); - if ( !toggle || !toggle.hash ) return; - - // Escape the hash characters - var hash = smoothScroll.escapeCharacters( toggle.hash ); // Escape special characters and leading numbers - - // If hash is already active, animate immediately (no hash change will fire) - if ( hash === ( root.location.hash || '#top' ) ) { - smoothScroll.animateScroll( hash, toggle, settings); - return; - } - - // Get the anchor target - anchor = document.querySelector( hash ); - - // If anchor exists, save the ID as a data attribute and remove it (prevents scroll jump) - if ( anchor ) { - anchor.setAttribute( 'data-scroll-id', anchor.id ); - anchor.id = ''; + if ( toggle && toggle.tagName.toLowerCase() === 'a' ) { + event.preventDefault(); // Prevent default click event + var hash = smoothScroll.escapeCharacters( toggle.hash ); // Escape hash characters + smoothScroll.animateScroll( hash, toggle, settings); // Animate scroll } - }; /** - * On window resize, only run events at a rate of 15fps for better performance + * On window scroll and resize, only run events at a rate of 15fps for better performance * @private - * @param {Event} event + * @param {Function} eventTimeout Timeout function + * @param {Object} settings */ - var resizeThrottler = function (event) { + var eventThrottler = function (event) { if ( !eventTimeout ) { eventTimeout = setTimeout(function() { eventTimeout = null; // Reset timeout @@ -482,16 +455,14 @@ if ( !settings ) return; // Remove event listeners - document.removeEventListener( 'click', clickHandler, false ); - root.removeEventListener( 'hashchange', hashChangeHandler, false ); - root.removeEventListener( 'resize', resizeThrottler, false ); + root.document.removeEventListener( 'click', eventHandler, false ); + root.removeEventListener( 'resize', eventThrottler, false ); - // Reset variables + // Reset varaibles settings = null; eventTimeout = null; fixedHeader = null; headerHeight = null; - anchor = null; }; /** @@ -512,18 +483,9 @@ fixedHeader = root.document.querySelector( settings.selectorHeader ); // Get the fixed header headerHeight = getHeaderHeight( fixedHeader ); - // Event listeners - document.addEventListener('click', clickHandler, false); - root.addEventListener('hashchange', hashChangeHandler, false); - if ( fixedHeader ) { root.addEventListener( 'resize', resizeThrottler, false ); } - - // Scroll on load - if ( settings.scrollOnLoad ) { - setTimeout(function() { - window.scrollTo(0, 0); - }, 1); - hashChangeHandler(); - } + // When a toggle is clicked, run the click handler + root.document.addEventListener('click', eventHandler, false ); + if ( fixedHeader ) { root.addEventListener( 'resize', eventThrottler, false ); } }; @@ -534,4 +496,4 @@ return smoothScroll; -}); +}); \ No newline at end of file diff --git a/docs/dist/js/smooth-scroll.min.js b/docs/dist/js/smooth-scroll.min.js index cd7fee7..5a3bfe6 100755 --- a/docs/dist/js/smooth-scroll.min.js +++ b/docs/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ -/*! smooth-scroll v8.1.0 | (c) 2016 Chris Ferdinandi | MIT License | http://github.com/cferdinandi/smooth-scroll */ -!function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)}("undefined"!=typeof global?global:this.window||this.global,function(e){"use strict";var t,n,r,o,a,c={},i="querySelector"in document&&"addEventListener"in e&&"onhashchange"in e,u={selector:"[data-scroll]",selectorHeader:"[data-scroll-header]",speed:500,easing:"easeInOutCubic",offset:0,scrollOnLoad:!0,callback:function(){}},s=function(){var e={},t=!1,n=0,r=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(t=arguments[0],n++);for(var o=function(n){for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(t&&"[object Object]"===Object.prototype.toString.call(n[r])?e[r]=s(!0,e[r],n[r]):e[r]=n[r])};r>n;n++){var a=arguments[n];o(a)}return e},l=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},f=function(e,t){var n,r,o=t.charAt(0),a="classList"in document.documentElement;for("["===o&&(t=t.substr(1,t.length-2),n=t.split("="),n.length>1&&(r=!0,n[1]=n[1].replace(/"/g,"").replace(/'/g,"")));e&&e!==document;e=e.parentNode){if("."===o)if(a){if(e.classList.contains(t.substr(1)))return e}else if(new RegExp("(^|\\s)"+t.substr(1)+"(\\s|$)").test(e.className))return e;if("#"===o&&e.id===t.substr(1))return e;if("["===o&&e.hasAttribute(n[0])){if(!r)return e;if(e.getAttribute(n[0])===n[1])return e}if(e.tagName.toLowerCase()===t)return e}return null};c.escapeCharacters=function(e){"#"===e.charAt(0)&&(e=e.substr(1));for(var t,n=String(e),r=n.length,o=-1,a="",c=n.charCodeAt(0);++o=1&&31>=t||127==t||0===o&&t>=48&&57>=t||1===o&&t>=48&&57>=t&&45===c?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(o):"\\"+n.charAt(o)}return"#"+a};var d=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},h=function(e,t,n){var r=0;if(e.offsetParent)do r+=e.offsetTop,e=e.offsetParent;while(e);return r=r-t-n,r>=0?r:0},m=function(){return Math.max(e.document.body.scrollHeight,e.document.documentElement.scrollHeight,e.document.body.offsetHeight,e.document.documentElement.offsetHeight,e.document.body.clientHeight,e.document.documentElement.clientHeight)},g=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},p=function(e){return null===e?0:l(e)+e.offsetTop};c.animateScroll=function(t,n,a){var c=g(n?n.getAttribute("data-options"):null),i=s(i||u,a||{},c),l="[object Number]"===Object.prototype.toString.call(t)?!0:!1,f=l?null:e.document.querySelector(t);if(l||f){var v=e.pageYOffset;r||(r=e.document.querySelector(i.selectorHeader)),o||(o=p(r));var b,O,y,S=l?t:h(f,o,parseInt(i.offset,10)),I=S-v,E=m(),H=0,L=function(r,o,a){var c=e.pageYOffset;(r==o||c==o||e.innerHeight+c>=E)&&(clearInterval(a),f&&f.focus(),i.callback(t,n))},A=function(){H+=16,O=H/parseInt(i.speed,10),O=O>1?1:O,y=v+I*d(i.easing,O),e.scrollTo(0,Math.floor(y)),L(y,S,b)},C=function(){b=setInterval(A,16)};0===e.pageYOffset&&e.scrollTo(0,0),C()}};var v=function(){var n=e.location.hash;if(a&&(a.id=a.getAttribute("data-scroll-id"),a=null),n){n=c.escapeCharacters(n);var r=document.querySelector(t.select+'[href*="'+n+'"]');c.animateScroll(n,r,t)}},b=function(n){var r=f(n.target,t.selector);if(r&&r.hash){var o=c.escapeCharacters(r.hash);if(o===(e.location.hash||"#top"))return void c.animateScroll(o,r,t);a=document.querySelector(o),a&&(a.setAttribute("data-scroll-id",a.id),a.id="")}},O=function(e){n||(n=setTimeout(function(){n=null,o=p(r)},66))};return c.destroy=function(){t&&(document.removeEventListener("click",b,!1),e.removeEventListener("hashchange",v,!1),e.removeEventListener("resize",O,!1),t=null,n=null,r=null,o=null,a=null)},c.init=function(n){i&&(c.destroy(),t=s(u,n||{}),r=e.document.querySelector(t.selectorHeader),o=p(r),document.addEventListener("click",b,!1),e.addEventListener("hashchange",v,!1),r&&e.addEventListener("resize",O,!1),t.scrollOnLoad&&(setTimeout(function(){window.scrollTo(0,0)},1),v()))},c}); \ No newline at end of file +/*! smooth-scroll v9.0.0 | (c) 2016 Chris Ferdinandi | MIT License | http://github.com/cferdinandi/smooth-scroll */ +!function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)}("undefined"!=typeof global?global:this.window||this.global,function(e){"use strict";var t,n,r,o,a={},c="querySelector"in document&&"addEventListener"in e,u={selector:"[data-scroll]",selectorHeader:"[data-scroll-header]",speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callback:function(){}},i=function(){var e={},t=!1,n=0,r=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(t=arguments[0],n++);for(var o=function(n){for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(t&&"[object Object]"===Object.prototype.toString.call(n[r])?e[r]=i(!0,e[r],n[r]):e[r]=n[r])};r>n;n++){var a=arguments[n];o(a)}return e},s=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},l=function(e,t){var n,r,o=t.charAt(0),a="classList"in document.documentElement;for("["===o&&(t=t.substr(1,t.length-2),n=t.split("="),n.length>1&&(r=!0,n[1]=n[1].replace(/"/g,"").replace(/'/g,"")));e&&e!==document;e=e.parentNode){if("."===o)if(a){if(e.classList.contains(t.substr(1)))return e}else if(new RegExp("(^|\\s)"+t.substr(1)+"(\\s|$)").test(e.className))return e;if("#"===o&&e.id===t.substr(1))return e;if("["===o&&e.hasAttribute(n[0])){if(!r)return e;if(e.getAttribute(n[0])===n[1])return e}if(e.tagName.toLowerCase()===t)return e}return null};a.escapeCharacters=function(e){"#"===e.charAt(0)&&(e=e.substr(1));for(var t,n=String(e),r=n.length,o=-1,a="",c=n.charCodeAt(0);++o=1&&31>=t||127==t||0===o&&t>=48&&57>=t||1===o&&t>=48&&57>=t&&45===c?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(o):"\\"+n.charAt(o)}return"#"+a};var f=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},d=function(e,t,n){var r=0;if(e.offsetParent)do r+=e.offsetTop,e=e.offsetParent;while(e);return r=r-t-n,r>=0?r:0},h=function(){return Math.max(e.document.body.scrollHeight,e.document.documentElement.scrollHeight,e.document.body.offsetHeight,e.document.documentElement.offsetHeight,e.document.body.clientHeight,e.document.documentElement.clientHeight)},m=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},p=function(t,n){e.history.pushState&&(n||"true"===n)&&"file:"!==e.location.protocol&&e.history.pushState(null,null,[e.location.protocol,"//",e.location.host,e.location.pathname,e.location.search,t].join(""))},g=function(e){return null===e?0:s(e)+e.offsetTop};a.animateScroll=function(t,n,a){var c=m(n?n.getAttribute("data-options"):null),s=i(s||u,a||{},c),l="[object Number]"===Object.prototype.toString.call(t)?!0:!1,b=l?null:"#"===t?e.document.documentElement:e.document.querySelector(t);if(l||b){var v=e.pageYOffset;r||(r=e.document.querySelector(s.selectorHeader)),o||(o=g(r));var y,O,S,I=l?t:d(b,o,parseInt(s.offset,10)),H=I-v,E=h(),j=0;l||p(t,s.updateURL);var C=function(r,o,a){var c=e.pageYOffset;(r==o||c==o||e.innerHeight+c>=E)&&(clearInterval(a),l||b.focus(),s.callback(t,n))},L=function(){j+=16,O=j/parseInt(s.speed,10),O=O>1?1:O,S=v+H*f(s.easing,O),e.scrollTo(0,Math.floor(S)),C(S,I,y)},w=function(){y=setInterval(L,16)};0===e.pageYOffset&&e.scrollTo(0,0),w()}};var b=function(e){var n=l(e.target,t.selector);if(n&&"a"===n.tagName.toLowerCase()){e.preventDefault();var r=a.escapeCharacters(n.hash);a.animateScroll(r,n,t)}},v=function(e){n||(n=setTimeout(function(){n=null,o=g(r)},66))};return a.destroy=function(){t&&(e.document.removeEventListener("click",b,!1),e.removeEventListener("resize",v,!1),t=null,n=null,r=null,o=null)},a.init=function(n){c&&(a.destroy(),t=i(u,n||{}),r=e.document.querySelector(t.selectorHeader),o=g(r),e.document.addEventListener("click",b,!1),r&&e.addEventListener("resize",v,!1))},a}); \ No newline at end of file diff --git a/docs/index.html b/docs/index.html index 3fc8610..c002dca 100644 --- a/docs/index.html +++ b/docs/index.html @@ -19,7 +19,7 @@ -
+
diff --git a/package.json b/package.json index 28bc89a..51f5584 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "smooth-scroll", - "version": "8.1.0", + "version": "9.0.0", "description": "Animate scrolling to anchor links", "main": "./dist/js/smooth-scroll.min.js", "author": { diff --git a/src/docs/_templates/_header.html b/src/docs/_templates/_header.html index d6f7a3e..2bd0e5c 100644 --- a/src/docs/_templates/_header.html +++ b/src/docs/_templates/_header.html @@ -19,7 +19,7 @@ -
+
diff --git a/package.json b/package.json index 14d4b6d..e6b1b3d 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "smooth-scroll", - "version": "9.2.0", + "version": "9.3.0", "description": "Animate scrolling to anchor links", "main": "./dist/js/smooth-scroll.min.js", "author": { diff --git a/src/docs/index.md b/src/docs/index.md index 33b0e26..a954057 100644 --- a/src/docs/index.md +++ b/src/docs/index.md @@ -41,4 +41,4 @@ .
.
.
.
.
.
.
.
.
.
.
.
.

-

Back to the top

\ No newline at end of file +

Back to the top

\ No newline at end of file diff --git a/src/js/smooth-scroll.js b/src/js/smooth-scroll.js index 54ccc32..8e69db5 100755 --- a/src/js/smooth-scroll.js +++ b/src/js/smooth-scroll.js @@ -372,12 +372,21 @@ * @param {Number} endLocation Scroll to location * @param {Number} animationInterval How much to scroll on this loop */ - var stopAnimateScroll = function (position, endLocation, animationInterval) { + var stopAnimateScroll = function ( position, endLocation, animationInterval ) { var currentLocation = root.pageYOffset; - if ( position == endLocation || currentLocation == endLocation || ( (root.innerHeight + currentLocation) >= documentHeight ) ) { + if ( position == endLocation || currentLocation == endLocation || ( (root.innerHeight + currentLocation) >= + + documentHeight ) ) { clearInterval(animationInterval); + + // If scroll target is an anchor, bring it into focus if ( !isNum ) { anchorElem.focus(); + if ( document.activeElement.id !== anchorElem.id ) { + anchorElem.setAttribute( 'tabindex', '-1' ); + anchorElem.focus(); + anchorElem.style.outline = 'none'; + } } animateSettings.callback( anchor, toggle ); // Run callbacks after animation complete } From 89c19c579f979c3cb8e7b45f69f279ee8bf3059a Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Mon, 22 Aug 2016 20:33:17 -0400 Subject: [PATCH 175/285] v9.3.1 (#272) * v9.3.1 - a11y fix - Added check to make sure link contains an anchor before preventing default * v9.3.2 Fixed timing of escape function to prevent breaking anchor links when updating the URL --- dist/js/smooth-scroll.js | 12 ++++++------ dist/js/smooth-scroll.min.js | 4 ++-- docs/dist/js/smooth-scroll.js | 12 ++++++------ docs/dist/js/smooth-scroll.min.js | 4 ++-- package.json | 2 +- src/js/smooth-scroll.js | 10 +++++----- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dist/js/smooth-scroll.js b/dist/js/smooth-scroll.js index 3cdbd9d..707dff8 100755 --- a/dist/js/smooth-scroll.js +++ b/dist/js/smooth-scroll.js @@ -1,5 +1,5 @@ /*! - * smooth-scroll v9.3.0: Animate scrolling to anchor links + * smooth-scroll v9.3.2: Animate scrolling to anchor links * (c) 2016 Chris Ferdinandi * MIT License * http://github.com/cferdinandi/smooth-scroll @@ -356,7 +356,8 @@ // Selectors and variables var isNum = Object.prototype.toString.call( anchor ) === '[object Number]' ? true : false; - var anchorElem = isNum ? null : ( anchor === '#' ? root.document.documentElement : root.document.querySelector(anchor) ); + var hash = smoothScroll.escapeCharacters( anchor ); + var anchorElem = isNum ? null : ( hash === '#' ? root.document.documentElement : root.document.querySelector( hash ) ); if ( !isNum && !anchorElem ) return; var startLocation = root.pageYOffset; // Current location on the page if ( !fixedHeader ) { fixedHeader = root.document.querySelector( animateSettings.selectorHeader ); } // Get the fixed header if not already set @@ -369,7 +370,7 @@ // Update URL if ( !isNum ) { - updateUrl(anchor, animateSettings.updateURL); + updateUrl( anchor, animateSettings.updateURL ); } /** @@ -448,11 +449,10 @@ if ( toggle && toggle.tagName.toLowerCase() === 'a' ) { // Check that link is an anchor and points to current page - if ( toggle.origin !== location.origin || toggle.pathname !== location.pathname ) return; + if ( toggle.origin !== location.origin || toggle.pathname !== location.pathname || !/#/.test(toggle.href) ) return; event.preventDefault(); // Prevent default click event - var hash = smoothScroll.escapeCharacters( toggle.hash ); // Escape hash characters - smoothScroll.animateScroll( hash, toggle, settings); // Animate scroll + smoothScroll.animateScroll( toggle.hash, toggle, settings); // Animate scroll } diff --git a/dist/js/smooth-scroll.min.js b/dist/js/smooth-scroll.min.js index 296de4c..03aed1f 100755 --- a/dist/js/smooth-scroll.min.js +++ b/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ -/*! smooth-scroll v9.3.0 | (c) 2016 Chris Ferdinandi | MIT License | http://github.com/cferdinandi/smooth-scroll */ -!function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)}("undefined"!=typeof global?global:this.window||this.global,function(e){"use strict";var t,n,o,r,a,i={},c="querySelector"in document&&"addEventListener"in e,u={selector:"[data-scroll]",selectorHeader:"[data-scroll-header]",speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callback:function(){}},l=function(){var e={},t=!1,n=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(t=arguments[0],n++);for(var r=function(n){for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(t&&"[object Object]"===Object.prototype.toString.call(n[o])?e[o]=l(!0,e[o],n[o]):e[o]=n[o])};o>n;n++){var a=arguments[n];r(a)}return e},s=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},f=function(e,t){var n,o,r=t.charAt(0),a="classList"in document.documentElement;for("["===r&&(t=t.substr(1,t.length-2),n=t.split("="),n.length>1&&(o=!0,n[1]=n[1].replace(/"/g,"").replace(/'/g,"")));e&&e!==document&&1===e.nodeType;e=e.parentNode){if("."===r)if(a){if(e.classList.contains(t.substr(1)))return e}else if(new RegExp("(^|\\s)"+t.substr(1)+"(\\s|$)").test(e.className))return e;if("#"===r&&e.id===t.substr(1))return e;if("["===r&&e.hasAttribute(n[0])){if(!o)return e;if(e.getAttribute(n[0])===n[1])return e}if(e.tagName.toLowerCase()===t)return e}return null};i.escapeCharacters=function(e){"#"===e.charAt(0)&&(e=e.substr(1));for(var t,n=String(e),o=n.length,r=-1,a="",i=n.charCodeAt(0);++r=1&&31>=t||127==t||0===r&&t>=48&&57>=t||1===r&&t>=48&&57>=t&&45===i?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(r):"\\"+n.charAt(r)}return"#"+a};var d=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},m=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=Math.max(o-t-n,0),Math.min(o,p()-h())},h=function(){return Math.max(document.documentElement.clientHeight,window.innerHeight||0)},p=function(){return Math.max(e.document.body.scrollHeight,e.document.documentElement.scrollHeight,e.document.body.offsetHeight,e.document.documentElement.offsetHeight,e.document.body.clientHeight,e.document.documentElement.clientHeight)},g=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},b=function(t,n){e.history.pushState&&(n||"true"===n)&&"file:"!==e.location.protocol&&e.history.pushState(null,null,[e.location.protocol,"//",e.location.host,e.location.pathname,e.location.search,t].join(""))},v=function(e){return null===e?0:s(e)+e.offsetTop};i.animateScroll=function(n,i,c){var s=g(i?i.getAttribute("data-options"):null),f=l(t||u,c||{},s),h="[object Number]"===Object.prototype.toString.call(n)?!0:!1,y=h?null:"#"===n?e.document.documentElement:e.document.querySelector(n);if(h||y){var O=e.pageYOffset;o||(o=e.document.querySelector(f.selectorHeader)),r||(r=v(o));var S,I,H=h?n:m(y,r,parseInt(f.offset,10)),E=H-O,j=p(),w=0;h||b(n,f.updateURL);var C=function(t,o,r){var a=e.pageYOffset;(t==o||a==o||e.innerHeight+a>=j)&&(clearInterval(r),h||(y.focus(),document.activeElement.id!==y.id&&(y.setAttribute("tabindex","-1"),y.focus(),y.style.outline="none")),f.callback(n,i))},L=function(){w+=16,S=w/parseInt(f.speed,10),S=S>1?1:S,I=O+E*d(f.easing,S),e.scrollTo(0,Math.floor(I)),C(I,H,a)},A=function(){clearInterval(a),a=setInterval(L,16)};0===e.pageYOffset&&e.scrollTo(0,0),A()}};var y=function(e){if(0===e.button&&!e.metaKey&&!e.ctrlKey){var n=f(e.target,t.selector);if(n&&"a"===n.tagName.toLowerCase()){if(n.origin!==location.origin||n.pathname!==location.pathname)return;e.preventDefault();var o=i.escapeCharacters(n.hash);i.animateScroll(o,n,t)}}},O=function(e){n||(n=setTimeout(function(){n=null,r=v(o)},66))};return i.destroy=function(){t&&(e.document.removeEventListener("click",y,!1),e.removeEventListener("resize",O,!1),t=null,n=null,o=null,r=null,a=null)},i.init=function(n){c&&(i.destroy(),t=l(u,n||{}),o=e.document.querySelector(t.selectorHeader),r=v(o),e.document.addEventListener("click",y,!1),o&&e.addEventListener("resize",O,!1))},i}); \ No newline at end of file +/*! smooth-scroll v9.3.2 | (c) 2016 Chris Ferdinandi | MIT License | http://github.com/cferdinandi/smooth-scroll */ +!function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)}("undefined"!=typeof global?global:this.window||this.global,function(e){"use strict";var t,n,o,r,a,i={},c="querySelector"in document&&"addEventListener"in e,u={selector:"[data-scroll]",selectorHeader:"[data-scroll-header]",speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callback:function(){}},l=function(){var e={},t=!1,n=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(t=arguments[0],n++);for(var r=function(n){for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(t&&"[object Object]"===Object.prototype.toString.call(n[o])?e[o]=l(!0,e[o],n[o]):e[o]=n[o])};o>n;n++){var a=arguments[n];r(a)}return e},s=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},f=function(e,t){var n,o,r=t.charAt(0),a="classList"in document.documentElement;for("["===r&&(t=t.substr(1,t.length-2),n=t.split("="),n.length>1&&(o=!0,n[1]=n[1].replace(/"/g,"").replace(/'/g,"")));e&&e!==document&&1===e.nodeType;e=e.parentNode){if("."===r)if(a){if(e.classList.contains(t.substr(1)))return e}else if(new RegExp("(^|\\s)"+t.substr(1)+"(\\s|$)").test(e.className))return e;if("#"===r&&e.id===t.substr(1))return e;if("["===r&&e.hasAttribute(n[0])){if(!o)return e;if(e.getAttribute(n[0])===n[1])return e}if(e.tagName.toLowerCase()===t)return e}return null};i.escapeCharacters=function(e){"#"===e.charAt(0)&&(e=e.substr(1));for(var t,n=String(e),o=n.length,r=-1,a="",i=n.charCodeAt(0);++r=1&&31>=t||127==t||0===r&&t>=48&&57>=t||1===r&&t>=48&&57>=t&&45===i?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(r):"\\"+n.charAt(r)}return"#"+a};var d=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},m=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=Math.max(o-t-n,0),Math.min(o,p()-h())},h=function(){return Math.max(document.documentElement.clientHeight,window.innerHeight||0)},p=function(){return Math.max(e.document.body.scrollHeight,e.document.documentElement.scrollHeight,e.document.body.offsetHeight,e.document.documentElement.offsetHeight,e.document.body.clientHeight,e.document.documentElement.clientHeight)},g=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},b=function(t,n){e.history.pushState&&(n||"true"===n)&&"file:"!==e.location.protocol&&e.history.pushState(null,null,[e.location.protocol,"//",e.location.host,e.location.pathname,e.location.search,t].join(""))},v=function(e){return null===e?0:s(e)+e.offsetTop};i.animateScroll=function(n,c,s){var f=g(c?c.getAttribute("data-options"):null),h=l(t||u,s||{},f),y="[object Number]"===Object.prototype.toString.call(n)?!0:!1,O=i.escapeCharacters(n),S=y?null:"#"===O?e.document.documentElement:e.document.querySelector(O);if(y||S){var I=e.pageYOffset;o||(o=e.document.querySelector(h.selectorHeader)),r||(r=v(o));var H,E,j=y?n:m(S,r,parseInt(h.offset,10)),w=j-I,C=p(),L=0;y||b(n,h.updateURL);var A=function(t,o,r){var a=e.pageYOffset;(t==o||a==o||e.innerHeight+a>=C)&&(clearInterval(r),y||(S.focus(),document.activeElement.id!==S.id&&(S.setAttribute("tabindex","-1"),S.focus(),S.style.outline="none")),h.callback(n,c))},Q=function(){L+=16,H=L/parseInt(h.speed,10),H=H>1?1:H,E=I+w*d(h.easing,H),e.scrollTo(0,Math.floor(E)),A(E,j,a)},x=function(){clearInterval(a),a=setInterval(Q,16)};0===e.pageYOffset&&e.scrollTo(0,0),x()}};var y=function(e){if(0===e.button&&!e.metaKey&&!e.ctrlKey){var n=f(e.target,t.selector);if(n&&"a"===n.tagName.toLowerCase()){if(n.origin!==location.origin||n.pathname!==location.pathname||!/#/.test(n.href))return;e.preventDefault(),i.animateScroll(n.hash,n,t)}}},O=function(e){n||(n=setTimeout(function(){n=null,r=v(o)},66))};return i.destroy=function(){t&&(e.document.removeEventListener("click",y,!1),e.removeEventListener("resize",O,!1),t=null,n=null,o=null,r=null,a=null)},i.init=function(n){c&&(i.destroy(),t=l(u,n||{}),o=e.document.querySelector(t.selectorHeader),r=v(o),e.document.addEventListener("click",y,!1),o&&e.addEventListener("resize",O,!1))},i}); \ No newline at end of file diff --git a/docs/dist/js/smooth-scroll.js b/docs/dist/js/smooth-scroll.js index 3cdbd9d..707dff8 100755 --- a/docs/dist/js/smooth-scroll.js +++ b/docs/dist/js/smooth-scroll.js @@ -1,5 +1,5 @@ /*! - * smooth-scroll v9.3.0: Animate scrolling to anchor links + * smooth-scroll v9.3.2: Animate scrolling to anchor links * (c) 2016 Chris Ferdinandi * MIT License * http://github.com/cferdinandi/smooth-scroll @@ -356,7 +356,8 @@ // Selectors and variables var isNum = Object.prototype.toString.call( anchor ) === '[object Number]' ? true : false; - var anchorElem = isNum ? null : ( anchor === '#' ? root.document.documentElement : root.document.querySelector(anchor) ); + var hash = smoothScroll.escapeCharacters( anchor ); + var anchorElem = isNum ? null : ( hash === '#' ? root.document.documentElement : root.document.querySelector( hash ) ); if ( !isNum && !anchorElem ) return; var startLocation = root.pageYOffset; // Current location on the page if ( !fixedHeader ) { fixedHeader = root.document.querySelector( animateSettings.selectorHeader ); } // Get the fixed header if not already set @@ -369,7 +370,7 @@ // Update URL if ( !isNum ) { - updateUrl(anchor, animateSettings.updateURL); + updateUrl( anchor, animateSettings.updateURL ); } /** @@ -448,11 +449,10 @@ if ( toggle && toggle.tagName.toLowerCase() === 'a' ) { // Check that link is an anchor and points to current page - if ( toggle.origin !== location.origin || toggle.pathname !== location.pathname ) return; + if ( toggle.origin !== location.origin || toggle.pathname !== location.pathname || !/#/.test(toggle.href) ) return; event.preventDefault(); // Prevent default click event - var hash = smoothScroll.escapeCharacters( toggle.hash ); // Escape hash characters - smoothScroll.animateScroll( hash, toggle, settings); // Animate scroll + smoothScroll.animateScroll( toggle.hash, toggle, settings); // Animate scroll } diff --git a/docs/dist/js/smooth-scroll.min.js b/docs/dist/js/smooth-scroll.min.js index 296de4c..03aed1f 100755 --- a/docs/dist/js/smooth-scroll.min.js +++ b/docs/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ -/*! smooth-scroll v9.3.0 | (c) 2016 Chris Ferdinandi | MIT License | http://github.com/cferdinandi/smooth-scroll */ -!function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)}("undefined"!=typeof global?global:this.window||this.global,function(e){"use strict";var t,n,o,r,a,i={},c="querySelector"in document&&"addEventListener"in e,u={selector:"[data-scroll]",selectorHeader:"[data-scroll-header]",speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callback:function(){}},l=function(){var e={},t=!1,n=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(t=arguments[0],n++);for(var r=function(n){for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(t&&"[object Object]"===Object.prototype.toString.call(n[o])?e[o]=l(!0,e[o],n[o]):e[o]=n[o])};o>n;n++){var a=arguments[n];r(a)}return e},s=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},f=function(e,t){var n,o,r=t.charAt(0),a="classList"in document.documentElement;for("["===r&&(t=t.substr(1,t.length-2),n=t.split("="),n.length>1&&(o=!0,n[1]=n[1].replace(/"/g,"").replace(/'/g,"")));e&&e!==document&&1===e.nodeType;e=e.parentNode){if("."===r)if(a){if(e.classList.contains(t.substr(1)))return e}else if(new RegExp("(^|\\s)"+t.substr(1)+"(\\s|$)").test(e.className))return e;if("#"===r&&e.id===t.substr(1))return e;if("["===r&&e.hasAttribute(n[0])){if(!o)return e;if(e.getAttribute(n[0])===n[1])return e}if(e.tagName.toLowerCase()===t)return e}return null};i.escapeCharacters=function(e){"#"===e.charAt(0)&&(e=e.substr(1));for(var t,n=String(e),o=n.length,r=-1,a="",i=n.charCodeAt(0);++r=1&&31>=t||127==t||0===r&&t>=48&&57>=t||1===r&&t>=48&&57>=t&&45===i?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(r):"\\"+n.charAt(r)}return"#"+a};var d=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},m=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=Math.max(o-t-n,0),Math.min(o,p()-h())},h=function(){return Math.max(document.documentElement.clientHeight,window.innerHeight||0)},p=function(){return Math.max(e.document.body.scrollHeight,e.document.documentElement.scrollHeight,e.document.body.offsetHeight,e.document.documentElement.offsetHeight,e.document.body.clientHeight,e.document.documentElement.clientHeight)},g=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},b=function(t,n){e.history.pushState&&(n||"true"===n)&&"file:"!==e.location.protocol&&e.history.pushState(null,null,[e.location.protocol,"//",e.location.host,e.location.pathname,e.location.search,t].join(""))},v=function(e){return null===e?0:s(e)+e.offsetTop};i.animateScroll=function(n,i,c){var s=g(i?i.getAttribute("data-options"):null),f=l(t||u,c||{},s),h="[object Number]"===Object.prototype.toString.call(n)?!0:!1,y=h?null:"#"===n?e.document.documentElement:e.document.querySelector(n);if(h||y){var O=e.pageYOffset;o||(o=e.document.querySelector(f.selectorHeader)),r||(r=v(o));var S,I,H=h?n:m(y,r,parseInt(f.offset,10)),E=H-O,j=p(),w=0;h||b(n,f.updateURL);var C=function(t,o,r){var a=e.pageYOffset;(t==o||a==o||e.innerHeight+a>=j)&&(clearInterval(r),h||(y.focus(),document.activeElement.id!==y.id&&(y.setAttribute("tabindex","-1"),y.focus(),y.style.outline="none")),f.callback(n,i))},L=function(){w+=16,S=w/parseInt(f.speed,10),S=S>1?1:S,I=O+E*d(f.easing,S),e.scrollTo(0,Math.floor(I)),C(I,H,a)},A=function(){clearInterval(a),a=setInterval(L,16)};0===e.pageYOffset&&e.scrollTo(0,0),A()}};var y=function(e){if(0===e.button&&!e.metaKey&&!e.ctrlKey){var n=f(e.target,t.selector);if(n&&"a"===n.tagName.toLowerCase()){if(n.origin!==location.origin||n.pathname!==location.pathname)return;e.preventDefault();var o=i.escapeCharacters(n.hash);i.animateScroll(o,n,t)}}},O=function(e){n||(n=setTimeout(function(){n=null,r=v(o)},66))};return i.destroy=function(){t&&(e.document.removeEventListener("click",y,!1),e.removeEventListener("resize",O,!1),t=null,n=null,o=null,r=null,a=null)},i.init=function(n){c&&(i.destroy(),t=l(u,n||{}),o=e.document.querySelector(t.selectorHeader),r=v(o),e.document.addEventListener("click",y,!1),o&&e.addEventListener("resize",O,!1))},i}); \ No newline at end of file +/*! smooth-scroll v9.3.2 | (c) 2016 Chris Ferdinandi | MIT License | http://github.com/cferdinandi/smooth-scroll */ +!function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)}("undefined"!=typeof global?global:this.window||this.global,function(e){"use strict";var t,n,o,r,a,i={},c="querySelector"in document&&"addEventListener"in e,u={selector:"[data-scroll]",selectorHeader:"[data-scroll-header]",speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callback:function(){}},l=function(){var e={},t=!1,n=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(t=arguments[0],n++);for(var r=function(n){for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(t&&"[object Object]"===Object.prototype.toString.call(n[o])?e[o]=l(!0,e[o],n[o]):e[o]=n[o])};o>n;n++){var a=arguments[n];r(a)}return e},s=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},f=function(e,t){var n,o,r=t.charAt(0),a="classList"in document.documentElement;for("["===r&&(t=t.substr(1,t.length-2),n=t.split("="),n.length>1&&(o=!0,n[1]=n[1].replace(/"/g,"").replace(/'/g,"")));e&&e!==document&&1===e.nodeType;e=e.parentNode){if("."===r)if(a){if(e.classList.contains(t.substr(1)))return e}else if(new RegExp("(^|\\s)"+t.substr(1)+"(\\s|$)").test(e.className))return e;if("#"===r&&e.id===t.substr(1))return e;if("["===r&&e.hasAttribute(n[0])){if(!o)return e;if(e.getAttribute(n[0])===n[1])return e}if(e.tagName.toLowerCase()===t)return e}return null};i.escapeCharacters=function(e){"#"===e.charAt(0)&&(e=e.substr(1));for(var t,n=String(e),o=n.length,r=-1,a="",i=n.charCodeAt(0);++r=1&&31>=t||127==t||0===r&&t>=48&&57>=t||1===r&&t>=48&&57>=t&&45===i?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(r):"\\"+n.charAt(r)}return"#"+a};var d=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},m=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=Math.max(o-t-n,0),Math.min(o,p()-h())},h=function(){return Math.max(document.documentElement.clientHeight,window.innerHeight||0)},p=function(){return Math.max(e.document.body.scrollHeight,e.document.documentElement.scrollHeight,e.document.body.offsetHeight,e.document.documentElement.offsetHeight,e.document.body.clientHeight,e.document.documentElement.clientHeight)},g=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},b=function(t,n){e.history.pushState&&(n||"true"===n)&&"file:"!==e.location.protocol&&e.history.pushState(null,null,[e.location.protocol,"//",e.location.host,e.location.pathname,e.location.search,t].join(""))},v=function(e){return null===e?0:s(e)+e.offsetTop};i.animateScroll=function(n,c,s){var f=g(c?c.getAttribute("data-options"):null),h=l(t||u,s||{},f),y="[object Number]"===Object.prototype.toString.call(n)?!0:!1,O=i.escapeCharacters(n),S=y?null:"#"===O?e.document.documentElement:e.document.querySelector(O);if(y||S){var I=e.pageYOffset;o||(o=e.document.querySelector(h.selectorHeader)),r||(r=v(o));var H,E,j=y?n:m(S,r,parseInt(h.offset,10)),w=j-I,C=p(),L=0;y||b(n,h.updateURL);var A=function(t,o,r){var a=e.pageYOffset;(t==o||a==o||e.innerHeight+a>=C)&&(clearInterval(r),y||(S.focus(),document.activeElement.id!==S.id&&(S.setAttribute("tabindex","-1"),S.focus(),S.style.outline="none")),h.callback(n,c))},Q=function(){L+=16,H=L/parseInt(h.speed,10),H=H>1?1:H,E=I+w*d(h.easing,H),e.scrollTo(0,Math.floor(E)),A(E,j,a)},x=function(){clearInterval(a),a=setInterval(Q,16)};0===e.pageYOffset&&e.scrollTo(0,0),x()}};var y=function(e){if(0===e.button&&!e.metaKey&&!e.ctrlKey){var n=f(e.target,t.selector);if(n&&"a"===n.tagName.toLowerCase()){if(n.origin!==location.origin||n.pathname!==location.pathname||!/#/.test(n.href))return;e.preventDefault(),i.animateScroll(n.hash,n,t)}}},O=function(e){n||(n=setTimeout(function(){n=null,r=v(o)},66))};return i.destroy=function(){t&&(e.document.removeEventListener("click",y,!1),e.removeEventListener("resize",O,!1),t=null,n=null,o=null,r=null,a=null)},i.init=function(n){c&&(i.destroy(),t=l(u,n||{}),o=e.document.querySelector(t.selectorHeader),r=v(o),e.document.addEventListener("click",y,!1),o&&e.addEventListener("resize",O,!1))},i}); \ No newline at end of file diff --git a/package.json b/package.json index e6b1b3d..9b5390f 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "smooth-scroll", - "version": "9.3.0", + "version": "9.3.2", "description": "Animate scrolling to anchor links", "main": "./dist/js/smooth-scroll.min.js", "author": { diff --git a/src/js/smooth-scroll.js b/src/js/smooth-scroll.js index 8e69db5..c484634 100755 --- a/src/js/smooth-scroll.js +++ b/src/js/smooth-scroll.js @@ -349,7 +349,8 @@ // Selectors and variables var isNum = Object.prototype.toString.call( anchor ) === '[object Number]' ? true : false; - var anchorElem = isNum ? null : ( anchor === '#' ? root.document.documentElement : root.document.querySelector(anchor) ); + var hash = smoothScroll.escapeCharacters( anchor ); + var anchorElem = isNum ? null : ( hash === '#' ? root.document.documentElement : root.document.querySelector( hash ) ); if ( !isNum && !anchorElem ) return; var startLocation = root.pageYOffset; // Current location on the page if ( !fixedHeader ) { fixedHeader = root.document.querySelector( animateSettings.selectorHeader ); } // Get the fixed header if not already set @@ -362,7 +363,7 @@ // Update URL if ( !isNum ) { - updateUrl(anchor, animateSettings.updateURL); + updateUrl( anchor, animateSettings.updateURL ); } /** @@ -441,11 +442,10 @@ if ( toggle && toggle.tagName.toLowerCase() === 'a' ) { // Check that link is an anchor and points to current page - if ( toggle.origin !== location.origin || toggle.pathname !== location.pathname ) return; + if ( toggle.origin !== location.origin || toggle.pathname !== location.pathname || !/#/.test(toggle.href) ) return; event.preventDefault(); // Prevent default click event - var hash = smoothScroll.escapeCharacters( toggle.hash ); // Escape hash characters - smoothScroll.animateScroll( hash, toggle, settings); // Animate scroll + smoothScroll.animateScroll( toggle.hash, toggle, settings); // Animate scroll } From f7905b7172c5619d92bb74cc7ed7cffa42dfe9f6 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Sun, 28 Aug 2016 12:54:19 -0400 Subject: [PATCH 176/285] v9.4.1 (#276) - a11y fix - Added check to make sure link contains an anchor before preventing default - Fixed timing of escape function to prevent breaking anchor links when updating the URL - Switched from `location.origin` to `location.hostname` for better backwards compatibility --- dist/js/smooth-scroll.js | 4 ++-- dist/js/smooth-scroll.min.js | 4 ++-- docs/dist/js/smooth-scroll.js | 4 ++-- docs/dist/js/smooth-scroll.min.js | 4 ++-- package.json | 2 +- src/js/smooth-scroll.js | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dist/js/smooth-scroll.js b/dist/js/smooth-scroll.js index 707dff8..4a52032 100755 --- a/dist/js/smooth-scroll.js +++ b/dist/js/smooth-scroll.js @@ -1,5 +1,5 @@ /*! - * smooth-scroll v9.3.2: Animate scrolling to anchor links + * smooth-scroll v9.4.1: Animate scrolling to anchor links * (c) 2016 Chris Ferdinandi * MIT License * http://github.com/cferdinandi/smooth-scroll @@ -449,7 +449,7 @@ if ( toggle && toggle.tagName.toLowerCase() === 'a' ) { // Check that link is an anchor and points to current page - if ( toggle.origin !== location.origin || toggle.pathname !== location.pathname || !/#/.test(toggle.href) ) return; + if ( toggle.hostname !== root.location.hostname || toggle.pathname !== root.location.pathname || !/#/.test(toggle.href) ) return; event.preventDefault(); // Prevent default click event smoothScroll.animateScroll( toggle.hash, toggle, settings); // Animate scroll diff --git a/dist/js/smooth-scroll.min.js b/dist/js/smooth-scroll.min.js index 03aed1f..ae371b6 100755 --- a/dist/js/smooth-scroll.min.js +++ b/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ -/*! smooth-scroll v9.3.2 | (c) 2016 Chris Ferdinandi | MIT License | http://github.com/cferdinandi/smooth-scroll */ -!function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)}("undefined"!=typeof global?global:this.window||this.global,function(e){"use strict";var t,n,o,r,a,i={},c="querySelector"in document&&"addEventListener"in e,u={selector:"[data-scroll]",selectorHeader:"[data-scroll-header]",speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callback:function(){}},l=function(){var e={},t=!1,n=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(t=arguments[0],n++);for(var r=function(n){for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(t&&"[object Object]"===Object.prototype.toString.call(n[o])?e[o]=l(!0,e[o],n[o]):e[o]=n[o])};o>n;n++){var a=arguments[n];r(a)}return e},s=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},f=function(e,t){var n,o,r=t.charAt(0),a="classList"in document.documentElement;for("["===r&&(t=t.substr(1,t.length-2),n=t.split("="),n.length>1&&(o=!0,n[1]=n[1].replace(/"/g,"").replace(/'/g,"")));e&&e!==document&&1===e.nodeType;e=e.parentNode){if("."===r)if(a){if(e.classList.contains(t.substr(1)))return e}else if(new RegExp("(^|\\s)"+t.substr(1)+"(\\s|$)").test(e.className))return e;if("#"===r&&e.id===t.substr(1))return e;if("["===r&&e.hasAttribute(n[0])){if(!o)return e;if(e.getAttribute(n[0])===n[1])return e}if(e.tagName.toLowerCase()===t)return e}return null};i.escapeCharacters=function(e){"#"===e.charAt(0)&&(e=e.substr(1));for(var t,n=String(e),o=n.length,r=-1,a="",i=n.charCodeAt(0);++r=1&&31>=t||127==t||0===r&&t>=48&&57>=t||1===r&&t>=48&&57>=t&&45===i?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(r):"\\"+n.charAt(r)}return"#"+a};var d=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},m=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=Math.max(o-t-n,0),Math.min(o,p()-h())},h=function(){return Math.max(document.documentElement.clientHeight,window.innerHeight||0)},p=function(){return Math.max(e.document.body.scrollHeight,e.document.documentElement.scrollHeight,e.document.body.offsetHeight,e.document.documentElement.offsetHeight,e.document.body.clientHeight,e.document.documentElement.clientHeight)},g=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},b=function(t,n){e.history.pushState&&(n||"true"===n)&&"file:"!==e.location.protocol&&e.history.pushState(null,null,[e.location.protocol,"//",e.location.host,e.location.pathname,e.location.search,t].join(""))},v=function(e){return null===e?0:s(e)+e.offsetTop};i.animateScroll=function(n,c,s){var f=g(c?c.getAttribute("data-options"):null),h=l(t||u,s||{},f),y="[object Number]"===Object.prototype.toString.call(n)?!0:!1,O=i.escapeCharacters(n),S=y?null:"#"===O?e.document.documentElement:e.document.querySelector(O);if(y||S){var I=e.pageYOffset;o||(o=e.document.querySelector(h.selectorHeader)),r||(r=v(o));var H,E,j=y?n:m(S,r,parseInt(h.offset,10)),w=j-I,C=p(),L=0;y||b(n,h.updateURL);var A=function(t,o,r){var a=e.pageYOffset;(t==o||a==o||e.innerHeight+a>=C)&&(clearInterval(r),y||(S.focus(),document.activeElement.id!==S.id&&(S.setAttribute("tabindex","-1"),S.focus(),S.style.outline="none")),h.callback(n,c))},Q=function(){L+=16,H=L/parseInt(h.speed,10),H=H>1?1:H,E=I+w*d(h.easing,H),e.scrollTo(0,Math.floor(E)),A(E,j,a)},x=function(){clearInterval(a),a=setInterval(Q,16)};0===e.pageYOffset&&e.scrollTo(0,0),x()}};var y=function(e){if(0===e.button&&!e.metaKey&&!e.ctrlKey){var n=f(e.target,t.selector);if(n&&"a"===n.tagName.toLowerCase()){if(n.origin!==location.origin||n.pathname!==location.pathname||!/#/.test(n.href))return;e.preventDefault(),i.animateScroll(n.hash,n,t)}}},O=function(e){n||(n=setTimeout(function(){n=null,r=v(o)},66))};return i.destroy=function(){t&&(e.document.removeEventListener("click",y,!1),e.removeEventListener("resize",O,!1),t=null,n=null,o=null,r=null,a=null)},i.init=function(n){c&&(i.destroy(),t=l(u,n||{}),o=e.document.querySelector(t.selectorHeader),r=v(o),e.document.addEventListener("click",y,!1),o&&e.addEventListener("resize",O,!1))},i}); \ No newline at end of file +/*! smooth-scroll v9.4.1 | (c) 2016 Chris Ferdinandi | MIT License | http://github.com/cferdinandi/smooth-scroll */ +!function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)}("undefined"!=typeof global?global:this.window||this.global,function(e){"use strict";var t,n,o,r,a,c={},u="querySelector"in document&&"addEventListener"in e,i={selector:"[data-scroll]",selectorHeader:"[data-scroll-header]",speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callback:function(){}},l=function(){var e={},t=!1,n=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(t=arguments[0],n++);for(var r=function(n){for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(t&&"[object Object]"===Object.prototype.toString.call(n[o])?e[o]=l(!0,e[o],n[o]):e[o]=n[o])};o>n;n++){var a=arguments[n];r(a)}return e},s=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},f=function(e,t){var n,o,r=t.charAt(0),a="classList"in document.documentElement;for("["===r&&(t=t.substr(1,t.length-2),n=t.split("="),n.length>1&&(o=!0,n[1]=n[1].replace(/"/g,"").replace(/'/g,"")));e&&e!==document&&1===e.nodeType;e=e.parentNode){if("."===r)if(a){if(e.classList.contains(t.substr(1)))return e}else if(new RegExp("(^|\\s)"+t.substr(1)+"(\\s|$)").test(e.className))return e;if("#"===r&&e.id===t.substr(1))return e;if("["===r&&e.hasAttribute(n[0])){if(!o)return e;if(e.getAttribute(n[0])===n[1])return e}if(e.tagName.toLowerCase()===t)return e}return null};c.escapeCharacters=function(e){"#"===e.charAt(0)&&(e=e.substr(1));for(var t,n=String(e),o=n.length,r=-1,a="",c=n.charCodeAt(0);++r=1&&31>=t||127==t||0===r&&t>=48&&57>=t||1===r&&t>=48&&57>=t&&45===c?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(r):"\\"+n.charAt(r)}return"#"+a};var d=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},m=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=Math.max(o-t-n,0),Math.min(o,p()-h())},h=function(){return Math.max(document.documentElement.clientHeight,window.innerHeight||0)},p=function(){return Math.max(e.document.body.scrollHeight,e.document.documentElement.scrollHeight,e.document.body.offsetHeight,e.document.documentElement.offsetHeight,e.document.body.clientHeight,e.document.documentElement.clientHeight)},g=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},b=function(t,n){e.history.pushState&&(n||"true"===n)&&"file:"!==e.location.protocol&&e.history.pushState(null,null,[e.location.protocol,"//",e.location.host,e.location.pathname,e.location.search,t].join(""))},v=function(e){return null===e?0:s(e)+e.offsetTop};c.animateScroll=function(n,u,s){var f=g(u?u.getAttribute("data-options"):null),h=l(t||i,s||{},f),y="[object Number]"===Object.prototype.toString.call(n)?!0:!1,O=c.escapeCharacters(n),S=y?null:"#"===O?e.document.documentElement:e.document.querySelector(O);if(y||S){var I=e.pageYOffset;o||(o=e.document.querySelector(h.selectorHeader)),r||(r=v(o));var H,E,j=y?n:m(S,r,parseInt(h.offset,10)),w=j-I,C=p(),L=0;y||b(n,h.updateURL);var A=function(t,o,r){var a=e.pageYOffset;(t==o||a==o||e.innerHeight+a>=C)&&(clearInterval(r),y||(S.focus(),document.activeElement.id!==S.id&&(S.setAttribute("tabindex","-1"),S.focus(),S.style.outline="none")),h.callback(n,u))},Q=function(){L+=16,H=L/parseInt(h.speed,10),H=H>1?1:H,E=I+w*d(h.easing,H),e.scrollTo(0,Math.floor(E)),A(E,j,a)},x=function(){clearInterval(a),a=setInterval(Q,16)};0===e.pageYOffset&&e.scrollTo(0,0),x()}};var y=function(n){if(0===n.button&&!n.metaKey&&!n.ctrlKey){var o=f(n.target,t.selector);if(o&&"a"===o.tagName.toLowerCase()){if(o.hostname!==e.location.hostname||o.pathname!==e.location.pathname||!/#/.test(o.href))return;n.preventDefault(),c.animateScroll(o.hash,o,t)}}},O=function(e){n||(n=setTimeout(function(){n=null,r=v(o)},66))};return c.destroy=function(){t&&(e.document.removeEventListener("click",y,!1),e.removeEventListener("resize",O,!1),t=null,n=null,o=null,r=null,a=null)},c.init=function(n){u&&(c.destroy(),t=l(i,n||{}),o=e.document.querySelector(t.selectorHeader),r=v(o),e.document.addEventListener("click",y,!1),o&&e.addEventListener("resize",O,!1))},c}); \ No newline at end of file diff --git a/docs/dist/js/smooth-scroll.js b/docs/dist/js/smooth-scroll.js index 707dff8..4a52032 100755 --- a/docs/dist/js/smooth-scroll.js +++ b/docs/dist/js/smooth-scroll.js @@ -1,5 +1,5 @@ /*! - * smooth-scroll v9.3.2: Animate scrolling to anchor links + * smooth-scroll v9.4.1: Animate scrolling to anchor links * (c) 2016 Chris Ferdinandi * MIT License * http://github.com/cferdinandi/smooth-scroll @@ -449,7 +449,7 @@ if ( toggle && toggle.tagName.toLowerCase() === 'a' ) { // Check that link is an anchor and points to current page - if ( toggle.origin !== location.origin || toggle.pathname !== location.pathname || !/#/.test(toggle.href) ) return; + if ( toggle.hostname !== root.location.hostname || toggle.pathname !== root.location.pathname || !/#/.test(toggle.href) ) return; event.preventDefault(); // Prevent default click event smoothScroll.animateScroll( toggle.hash, toggle, settings); // Animate scroll diff --git a/docs/dist/js/smooth-scroll.min.js b/docs/dist/js/smooth-scroll.min.js index 03aed1f..ae371b6 100755 --- a/docs/dist/js/smooth-scroll.min.js +++ b/docs/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ -/*! smooth-scroll v9.3.2 | (c) 2016 Chris Ferdinandi | MIT License | http://github.com/cferdinandi/smooth-scroll */ -!function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)}("undefined"!=typeof global?global:this.window||this.global,function(e){"use strict";var t,n,o,r,a,i={},c="querySelector"in document&&"addEventListener"in e,u={selector:"[data-scroll]",selectorHeader:"[data-scroll-header]",speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callback:function(){}},l=function(){var e={},t=!1,n=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(t=arguments[0],n++);for(var r=function(n){for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(t&&"[object Object]"===Object.prototype.toString.call(n[o])?e[o]=l(!0,e[o],n[o]):e[o]=n[o])};o>n;n++){var a=arguments[n];r(a)}return e},s=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},f=function(e,t){var n,o,r=t.charAt(0),a="classList"in document.documentElement;for("["===r&&(t=t.substr(1,t.length-2),n=t.split("="),n.length>1&&(o=!0,n[1]=n[1].replace(/"/g,"").replace(/'/g,"")));e&&e!==document&&1===e.nodeType;e=e.parentNode){if("."===r)if(a){if(e.classList.contains(t.substr(1)))return e}else if(new RegExp("(^|\\s)"+t.substr(1)+"(\\s|$)").test(e.className))return e;if("#"===r&&e.id===t.substr(1))return e;if("["===r&&e.hasAttribute(n[0])){if(!o)return e;if(e.getAttribute(n[0])===n[1])return e}if(e.tagName.toLowerCase()===t)return e}return null};i.escapeCharacters=function(e){"#"===e.charAt(0)&&(e=e.substr(1));for(var t,n=String(e),o=n.length,r=-1,a="",i=n.charCodeAt(0);++r=1&&31>=t||127==t||0===r&&t>=48&&57>=t||1===r&&t>=48&&57>=t&&45===i?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(r):"\\"+n.charAt(r)}return"#"+a};var d=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},m=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=Math.max(o-t-n,0),Math.min(o,p()-h())},h=function(){return Math.max(document.documentElement.clientHeight,window.innerHeight||0)},p=function(){return Math.max(e.document.body.scrollHeight,e.document.documentElement.scrollHeight,e.document.body.offsetHeight,e.document.documentElement.offsetHeight,e.document.body.clientHeight,e.document.documentElement.clientHeight)},g=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},b=function(t,n){e.history.pushState&&(n||"true"===n)&&"file:"!==e.location.protocol&&e.history.pushState(null,null,[e.location.protocol,"//",e.location.host,e.location.pathname,e.location.search,t].join(""))},v=function(e){return null===e?0:s(e)+e.offsetTop};i.animateScroll=function(n,c,s){var f=g(c?c.getAttribute("data-options"):null),h=l(t||u,s||{},f),y="[object Number]"===Object.prototype.toString.call(n)?!0:!1,O=i.escapeCharacters(n),S=y?null:"#"===O?e.document.documentElement:e.document.querySelector(O);if(y||S){var I=e.pageYOffset;o||(o=e.document.querySelector(h.selectorHeader)),r||(r=v(o));var H,E,j=y?n:m(S,r,parseInt(h.offset,10)),w=j-I,C=p(),L=0;y||b(n,h.updateURL);var A=function(t,o,r){var a=e.pageYOffset;(t==o||a==o||e.innerHeight+a>=C)&&(clearInterval(r),y||(S.focus(),document.activeElement.id!==S.id&&(S.setAttribute("tabindex","-1"),S.focus(),S.style.outline="none")),h.callback(n,c))},Q=function(){L+=16,H=L/parseInt(h.speed,10),H=H>1?1:H,E=I+w*d(h.easing,H),e.scrollTo(0,Math.floor(E)),A(E,j,a)},x=function(){clearInterval(a),a=setInterval(Q,16)};0===e.pageYOffset&&e.scrollTo(0,0),x()}};var y=function(e){if(0===e.button&&!e.metaKey&&!e.ctrlKey){var n=f(e.target,t.selector);if(n&&"a"===n.tagName.toLowerCase()){if(n.origin!==location.origin||n.pathname!==location.pathname||!/#/.test(n.href))return;e.preventDefault(),i.animateScroll(n.hash,n,t)}}},O=function(e){n||(n=setTimeout(function(){n=null,r=v(o)},66))};return i.destroy=function(){t&&(e.document.removeEventListener("click",y,!1),e.removeEventListener("resize",O,!1),t=null,n=null,o=null,r=null,a=null)},i.init=function(n){c&&(i.destroy(),t=l(u,n||{}),o=e.document.querySelector(t.selectorHeader),r=v(o),e.document.addEventListener("click",y,!1),o&&e.addEventListener("resize",O,!1))},i}); \ No newline at end of file +/*! smooth-scroll v9.4.1 | (c) 2016 Chris Ferdinandi | MIT License | http://github.com/cferdinandi/smooth-scroll */ +!function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)}("undefined"!=typeof global?global:this.window||this.global,function(e){"use strict";var t,n,o,r,a,c={},u="querySelector"in document&&"addEventListener"in e,i={selector:"[data-scroll]",selectorHeader:"[data-scroll-header]",speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callback:function(){}},l=function(){var e={},t=!1,n=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(t=arguments[0],n++);for(var r=function(n){for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(t&&"[object Object]"===Object.prototype.toString.call(n[o])?e[o]=l(!0,e[o],n[o]):e[o]=n[o])};o>n;n++){var a=arguments[n];r(a)}return e},s=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},f=function(e,t){var n,o,r=t.charAt(0),a="classList"in document.documentElement;for("["===r&&(t=t.substr(1,t.length-2),n=t.split("="),n.length>1&&(o=!0,n[1]=n[1].replace(/"/g,"").replace(/'/g,"")));e&&e!==document&&1===e.nodeType;e=e.parentNode){if("."===r)if(a){if(e.classList.contains(t.substr(1)))return e}else if(new RegExp("(^|\\s)"+t.substr(1)+"(\\s|$)").test(e.className))return e;if("#"===r&&e.id===t.substr(1))return e;if("["===r&&e.hasAttribute(n[0])){if(!o)return e;if(e.getAttribute(n[0])===n[1])return e}if(e.tagName.toLowerCase()===t)return e}return null};c.escapeCharacters=function(e){"#"===e.charAt(0)&&(e=e.substr(1));for(var t,n=String(e),o=n.length,r=-1,a="",c=n.charCodeAt(0);++r=1&&31>=t||127==t||0===r&&t>=48&&57>=t||1===r&&t>=48&&57>=t&&45===c?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(r):"\\"+n.charAt(r)}return"#"+a};var d=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},m=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=Math.max(o-t-n,0),Math.min(o,p()-h())},h=function(){return Math.max(document.documentElement.clientHeight,window.innerHeight||0)},p=function(){return Math.max(e.document.body.scrollHeight,e.document.documentElement.scrollHeight,e.document.body.offsetHeight,e.document.documentElement.offsetHeight,e.document.body.clientHeight,e.document.documentElement.clientHeight)},g=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},b=function(t,n){e.history.pushState&&(n||"true"===n)&&"file:"!==e.location.protocol&&e.history.pushState(null,null,[e.location.protocol,"//",e.location.host,e.location.pathname,e.location.search,t].join(""))},v=function(e){return null===e?0:s(e)+e.offsetTop};c.animateScroll=function(n,u,s){var f=g(u?u.getAttribute("data-options"):null),h=l(t||i,s||{},f),y="[object Number]"===Object.prototype.toString.call(n)?!0:!1,O=c.escapeCharacters(n),S=y?null:"#"===O?e.document.documentElement:e.document.querySelector(O);if(y||S){var I=e.pageYOffset;o||(o=e.document.querySelector(h.selectorHeader)),r||(r=v(o));var H,E,j=y?n:m(S,r,parseInt(h.offset,10)),w=j-I,C=p(),L=0;y||b(n,h.updateURL);var A=function(t,o,r){var a=e.pageYOffset;(t==o||a==o||e.innerHeight+a>=C)&&(clearInterval(r),y||(S.focus(),document.activeElement.id!==S.id&&(S.setAttribute("tabindex","-1"),S.focus(),S.style.outline="none")),h.callback(n,u))},Q=function(){L+=16,H=L/parseInt(h.speed,10),H=H>1?1:H,E=I+w*d(h.easing,H),e.scrollTo(0,Math.floor(E)),A(E,j,a)},x=function(){clearInterval(a),a=setInterval(Q,16)};0===e.pageYOffset&&e.scrollTo(0,0),x()}};var y=function(n){if(0===n.button&&!n.metaKey&&!n.ctrlKey){var o=f(n.target,t.selector);if(o&&"a"===o.tagName.toLowerCase()){if(o.hostname!==e.location.hostname||o.pathname!==e.location.pathname||!/#/.test(o.href))return;n.preventDefault(),c.animateScroll(o.hash,o,t)}}},O=function(e){n||(n=setTimeout(function(){n=null,r=v(o)},66))};return c.destroy=function(){t&&(e.document.removeEventListener("click",y,!1),e.removeEventListener("resize",O,!1),t=null,n=null,o=null,r=null,a=null)},c.init=function(n){u&&(c.destroy(),t=l(i,n||{}),o=e.document.querySelector(t.selectorHeader),r=v(o),e.document.addEventListener("click",y,!1),o&&e.addEventListener("resize",O,!1))},c}); \ No newline at end of file diff --git a/package.json b/package.json index 9b5390f..811058a 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "smooth-scroll", - "version": "9.3.2", + "version": "9.4.1", "description": "Animate scrolling to anchor links", "main": "./dist/js/smooth-scroll.min.js", "author": { diff --git a/src/js/smooth-scroll.js b/src/js/smooth-scroll.js index c484634..7fc03e5 100755 --- a/src/js/smooth-scroll.js +++ b/src/js/smooth-scroll.js @@ -442,7 +442,7 @@ if ( toggle && toggle.tagName.toLowerCase() === 'a' ) { // Check that link is an anchor and points to current page - if ( toggle.origin !== location.origin || toggle.pathname !== location.pathname || !/#/.test(toggle.href) ) return; + if ( toggle.hostname !== root.location.hostname || toggle.pathname !== root.location.pathname || !/#/.test(toggle.href) ) return; event.preventDefault(); // Prevent default click event smoothScroll.animateScroll( toggle.hash, toggle, settings); // Animate scroll From 23aa13fdc749bfcd573b5a92a0e0b870245e34a9 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Mon, 29 Aug 2016 09:47:41 -0400 Subject: [PATCH 177/285] v9.4.2 (#278) Fixed issue with animateScroll when using an integer --- dist/js/smooth-scroll.js | 4 ++-- dist/js/smooth-scroll.min.js | 4 ++-- docs/dist/js/smooth-scroll.js | 4 ++-- docs/dist/js/smooth-scroll.min.js | 4 ++-- docs/index.html | 2 +- package.json | 2 +- src/docs/index.md | 2 +- src/js/smooth-scroll.js | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dist/js/smooth-scroll.js b/dist/js/smooth-scroll.js index 4a52032..bf82d44 100755 --- a/dist/js/smooth-scroll.js +++ b/dist/js/smooth-scroll.js @@ -1,5 +1,5 @@ /*! - * smooth-scroll v9.4.1: Animate scrolling to anchor links + * smooth-scroll v9.4.2: Animate scrolling to anchor links * (c) 2016 Chris Ferdinandi * MIT License * http://github.com/cferdinandi/smooth-scroll @@ -356,7 +356,7 @@ // Selectors and variables var isNum = Object.prototype.toString.call( anchor ) === '[object Number]' ? true : false; - var hash = smoothScroll.escapeCharacters( anchor ); + var hash = isNum ? null : smoothScroll.escapeCharacters( anchor ); var anchorElem = isNum ? null : ( hash === '#' ? root.document.documentElement : root.document.querySelector( hash ) ); if ( !isNum && !anchorElem ) return; var startLocation = root.pageYOffset; // Current location on the page diff --git a/dist/js/smooth-scroll.min.js b/dist/js/smooth-scroll.min.js index ae371b6..e6493f3 100755 --- a/dist/js/smooth-scroll.min.js +++ b/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ -/*! smooth-scroll v9.4.1 | (c) 2016 Chris Ferdinandi | MIT License | http://github.com/cferdinandi/smooth-scroll */ -!function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)}("undefined"!=typeof global?global:this.window||this.global,function(e){"use strict";var t,n,o,r,a,c={},u="querySelector"in document&&"addEventListener"in e,i={selector:"[data-scroll]",selectorHeader:"[data-scroll-header]",speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callback:function(){}},l=function(){var e={},t=!1,n=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(t=arguments[0],n++);for(var r=function(n){for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(t&&"[object Object]"===Object.prototype.toString.call(n[o])?e[o]=l(!0,e[o],n[o]):e[o]=n[o])};o>n;n++){var a=arguments[n];r(a)}return e},s=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},f=function(e,t){var n,o,r=t.charAt(0),a="classList"in document.documentElement;for("["===r&&(t=t.substr(1,t.length-2),n=t.split("="),n.length>1&&(o=!0,n[1]=n[1].replace(/"/g,"").replace(/'/g,"")));e&&e!==document&&1===e.nodeType;e=e.parentNode){if("."===r)if(a){if(e.classList.contains(t.substr(1)))return e}else if(new RegExp("(^|\\s)"+t.substr(1)+"(\\s|$)").test(e.className))return e;if("#"===r&&e.id===t.substr(1))return e;if("["===r&&e.hasAttribute(n[0])){if(!o)return e;if(e.getAttribute(n[0])===n[1])return e}if(e.tagName.toLowerCase()===t)return e}return null};c.escapeCharacters=function(e){"#"===e.charAt(0)&&(e=e.substr(1));for(var t,n=String(e),o=n.length,r=-1,a="",c=n.charCodeAt(0);++r=1&&31>=t||127==t||0===r&&t>=48&&57>=t||1===r&&t>=48&&57>=t&&45===c?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(r):"\\"+n.charAt(r)}return"#"+a};var d=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},m=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=Math.max(o-t-n,0),Math.min(o,p()-h())},h=function(){return Math.max(document.documentElement.clientHeight,window.innerHeight||0)},p=function(){return Math.max(e.document.body.scrollHeight,e.document.documentElement.scrollHeight,e.document.body.offsetHeight,e.document.documentElement.offsetHeight,e.document.body.clientHeight,e.document.documentElement.clientHeight)},g=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},b=function(t,n){e.history.pushState&&(n||"true"===n)&&"file:"!==e.location.protocol&&e.history.pushState(null,null,[e.location.protocol,"//",e.location.host,e.location.pathname,e.location.search,t].join(""))},v=function(e){return null===e?0:s(e)+e.offsetTop};c.animateScroll=function(n,u,s){var f=g(u?u.getAttribute("data-options"):null),h=l(t||i,s||{},f),y="[object Number]"===Object.prototype.toString.call(n)?!0:!1,O=c.escapeCharacters(n),S=y?null:"#"===O?e.document.documentElement:e.document.querySelector(O);if(y||S){var I=e.pageYOffset;o||(o=e.document.querySelector(h.selectorHeader)),r||(r=v(o));var H,E,j=y?n:m(S,r,parseInt(h.offset,10)),w=j-I,C=p(),L=0;y||b(n,h.updateURL);var A=function(t,o,r){var a=e.pageYOffset;(t==o||a==o||e.innerHeight+a>=C)&&(clearInterval(r),y||(S.focus(),document.activeElement.id!==S.id&&(S.setAttribute("tabindex","-1"),S.focus(),S.style.outline="none")),h.callback(n,u))},Q=function(){L+=16,H=L/parseInt(h.speed,10),H=H>1?1:H,E=I+w*d(h.easing,H),e.scrollTo(0,Math.floor(E)),A(E,j,a)},x=function(){clearInterval(a),a=setInterval(Q,16)};0===e.pageYOffset&&e.scrollTo(0,0),x()}};var y=function(n){if(0===n.button&&!n.metaKey&&!n.ctrlKey){var o=f(n.target,t.selector);if(o&&"a"===o.tagName.toLowerCase()){if(o.hostname!==e.location.hostname||o.pathname!==e.location.pathname||!/#/.test(o.href))return;n.preventDefault(),c.animateScroll(o.hash,o,t)}}},O=function(e){n||(n=setTimeout(function(){n=null,r=v(o)},66))};return c.destroy=function(){t&&(e.document.removeEventListener("click",y,!1),e.removeEventListener("resize",O,!1),t=null,n=null,o=null,r=null,a=null)},c.init=function(n){u&&(c.destroy(),t=l(i,n||{}),o=e.document.querySelector(t.selectorHeader),r=v(o),e.document.addEventListener("click",y,!1),o&&e.addEventListener("resize",O,!1))},c}); \ No newline at end of file +/*! smooth-scroll v9.4.2 | (c) 2016 Chris Ferdinandi | MIT License | http://github.com/cferdinandi/smooth-scroll */ +!function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)}("undefined"!=typeof global?global:this.window||this.global,function(e){"use strict";var t,n,o,r,a,c={},u="querySelector"in document&&"addEventListener"in e,i={selector:"[data-scroll]",selectorHeader:"[data-scroll-header]",speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callback:function(){}},l=function(){var e={},t=!1,n=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(t=arguments[0],n++);for(var r=function(n){for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(t&&"[object Object]"===Object.prototype.toString.call(n[o])?e[o]=l(!0,e[o],n[o]):e[o]=n[o])};o>n;n++){var a=arguments[n];r(a)}return e},s=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},f=function(e,t){var n,o,r=t.charAt(0),a="classList"in document.documentElement;for("["===r&&(t=t.substr(1,t.length-2),n=t.split("="),n.length>1&&(o=!0,n[1]=n[1].replace(/"/g,"").replace(/'/g,"")));e&&e!==document&&1===e.nodeType;e=e.parentNode){if("."===r)if(a){if(e.classList.contains(t.substr(1)))return e}else if(new RegExp("(^|\\s)"+t.substr(1)+"(\\s|$)").test(e.className))return e;if("#"===r&&e.id===t.substr(1))return e;if("["===r&&e.hasAttribute(n[0])){if(!o)return e;if(e.getAttribute(n[0])===n[1])return e}if(e.tagName.toLowerCase()===t)return e}return null};c.escapeCharacters=function(e){"#"===e.charAt(0)&&(e=e.substr(1));for(var t,n=String(e),o=n.length,r=-1,a="",c=n.charCodeAt(0);++r=1&&31>=t||127==t||0===r&&t>=48&&57>=t||1===r&&t>=48&&57>=t&&45===c?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(r):"\\"+n.charAt(r)}return"#"+a};var d=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},m=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=Math.max(o-t-n,0),Math.min(o,p()-h())},h=function(){return Math.max(document.documentElement.clientHeight,window.innerHeight||0)},p=function(){return Math.max(e.document.body.scrollHeight,e.document.documentElement.scrollHeight,e.document.body.offsetHeight,e.document.documentElement.offsetHeight,e.document.body.clientHeight,e.document.documentElement.clientHeight)},g=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},b=function(t,n){e.history.pushState&&(n||"true"===n)&&"file:"!==e.location.protocol&&e.history.pushState(null,null,[e.location.protocol,"//",e.location.host,e.location.pathname,e.location.search,t].join(""))},v=function(e){return null===e?0:s(e)+e.offsetTop};c.animateScroll=function(n,u,s){var f=g(u?u.getAttribute("data-options"):null),h=l(t||i,s||{},f),y="[object Number]"===Object.prototype.toString.call(n)?!0:!1,O=y?null:c.escapeCharacters(n),S=y?null:"#"===O?e.document.documentElement:e.document.querySelector(O);if(y||S){var I=e.pageYOffset;o||(o=e.document.querySelector(h.selectorHeader)),r||(r=v(o));var H,E,j=y?n:m(S,r,parseInt(h.offset,10)),w=j-I,C=p(),L=0;y||b(n,h.updateURL);var A=function(t,o,r){var a=e.pageYOffset;(t==o||a==o||e.innerHeight+a>=C)&&(clearInterval(r),y||(S.focus(),document.activeElement.id!==S.id&&(S.setAttribute("tabindex","-1"),S.focus(),S.style.outline="none")),h.callback(n,u))},Q=function(){L+=16,H=L/parseInt(h.speed,10),H=H>1?1:H,E=I+w*d(h.easing,H),e.scrollTo(0,Math.floor(E)),A(E,j,a)},x=function(){clearInterval(a),a=setInterval(Q,16)};0===e.pageYOffset&&e.scrollTo(0,0),x()}};var y=function(n){if(0===n.button&&!n.metaKey&&!n.ctrlKey){var o=f(n.target,t.selector);if(o&&"a"===o.tagName.toLowerCase()){if(o.hostname!==e.location.hostname||o.pathname!==e.location.pathname||!/#/.test(o.href))return;n.preventDefault(),c.animateScroll(o.hash,o,t)}}},O=function(e){n||(n=setTimeout(function(){n=null,r=v(o)},66))};return c.destroy=function(){t&&(e.document.removeEventListener("click",y,!1),e.removeEventListener("resize",O,!1),t=null,n=null,o=null,r=null,a=null)},c.init=function(n){u&&(c.destroy(),t=l(i,n||{}),o=e.document.querySelector(t.selectorHeader),r=v(o),e.document.addEventListener("click",y,!1),o&&e.addEventListener("resize",O,!1))},c}); \ No newline at end of file diff --git a/docs/dist/js/smooth-scroll.js b/docs/dist/js/smooth-scroll.js index 4a52032..bf82d44 100755 --- a/docs/dist/js/smooth-scroll.js +++ b/docs/dist/js/smooth-scroll.js @@ -1,5 +1,5 @@ /*! - * smooth-scroll v9.4.1: Animate scrolling to anchor links + * smooth-scroll v9.4.2: Animate scrolling to anchor links * (c) 2016 Chris Ferdinandi * MIT License * http://github.com/cferdinandi/smooth-scroll @@ -356,7 +356,7 @@ // Selectors and variables var isNum = Object.prototype.toString.call( anchor ) === '[object Number]' ? true : false; - var hash = smoothScroll.escapeCharacters( anchor ); + var hash = isNum ? null : smoothScroll.escapeCharacters( anchor ); var anchorElem = isNum ? null : ( hash === '#' ? root.document.documentElement : root.document.querySelector( hash ) ); if ( !isNum && !anchorElem ) return; var startLocation = root.pageYOffset; // Current location on the page diff --git a/docs/dist/js/smooth-scroll.min.js b/docs/dist/js/smooth-scroll.min.js index ae371b6..e6493f3 100755 --- a/docs/dist/js/smooth-scroll.min.js +++ b/docs/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ -/*! smooth-scroll v9.4.1 | (c) 2016 Chris Ferdinandi | MIT License | http://github.com/cferdinandi/smooth-scroll */ -!function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)}("undefined"!=typeof global?global:this.window||this.global,function(e){"use strict";var t,n,o,r,a,c={},u="querySelector"in document&&"addEventListener"in e,i={selector:"[data-scroll]",selectorHeader:"[data-scroll-header]",speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callback:function(){}},l=function(){var e={},t=!1,n=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(t=arguments[0],n++);for(var r=function(n){for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(t&&"[object Object]"===Object.prototype.toString.call(n[o])?e[o]=l(!0,e[o],n[o]):e[o]=n[o])};o>n;n++){var a=arguments[n];r(a)}return e},s=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},f=function(e,t){var n,o,r=t.charAt(0),a="classList"in document.documentElement;for("["===r&&(t=t.substr(1,t.length-2),n=t.split("="),n.length>1&&(o=!0,n[1]=n[1].replace(/"/g,"").replace(/'/g,"")));e&&e!==document&&1===e.nodeType;e=e.parentNode){if("."===r)if(a){if(e.classList.contains(t.substr(1)))return e}else if(new RegExp("(^|\\s)"+t.substr(1)+"(\\s|$)").test(e.className))return e;if("#"===r&&e.id===t.substr(1))return e;if("["===r&&e.hasAttribute(n[0])){if(!o)return e;if(e.getAttribute(n[0])===n[1])return e}if(e.tagName.toLowerCase()===t)return e}return null};c.escapeCharacters=function(e){"#"===e.charAt(0)&&(e=e.substr(1));for(var t,n=String(e),o=n.length,r=-1,a="",c=n.charCodeAt(0);++r=1&&31>=t||127==t||0===r&&t>=48&&57>=t||1===r&&t>=48&&57>=t&&45===c?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(r):"\\"+n.charAt(r)}return"#"+a};var d=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},m=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=Math.max(o-t-n,0),Math.min(o,p()-h())},h=function(){return Math.max(document.documentElement.clientHeight,window.innerHeight||0)},p=function(){return Math.max(e.document.body.scrollHeight,e.document.documentElement.scrollHeight,e.document.body.offsetHeight,e.document.documentElement.offsetHeight,e.document.body.clientHeight,e.document.documentElement.clientHeight)},g=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},b=function(t,n){e.history.pushState&&(n||"true"===n)&&"file:"!==e.location.protocol&&e.history.pushState(null,null,[e.location.protocol,"//",e.location.host,e.location.pathname,e.location.search,t].join(""))},v=function(e){return null===e?0:s(e)+e.offsetTop};c.animateScroll=function(n,u,s){var f=g(u?u.getAttribute("data-options"):null),h=l(t||i,s||{},f),y="[object Number]"===Object.prototype.toString.call(n)?!0:!1,O=c.escapeCharacters(n),S=y?null:"#"===O?e.document.documentElement:e.document.querySelector(O);if(y||S){var I=e.pageYOffset;o||(o=e.document.querySelector(h.selectorHeader)),r||(r=v(o));var H,E,j=y?n:m(S,r,parseInt(h.offset,10)),w=j-I,C=p(),L=0;y||b(n,h.updateURL);var A=function(t,o,r){var a=e.pageYOffset;(t==o||a==o||e.innerHeight+a>=C)&&(clearInterval(r),y||(S.focus(),document.activeElement.id!==S.id&&(S.setAttribute("tabindex","-1"),S.focus(),S.style.outline="none")),h.callback(n,u))},Q=function(){L+=16,H=L/parseInt(h.speed,10),H=H>1?1:H,E=I+w*d(h.easing,H),e.scrollTo(0,Math.floor(E)),A(E,j,a)},x=function(){clearInterval(a),a=setInterval(Q,16)};0===e.pageYOffset&&e.scrollTo(0,0),x()}};var y=function(n){if(0===n.button&&!n.metaKey&&!n.ctrlKey){var o=f(n.target,t.selector);if(o&&"a"===o.tagName.toLowerCase()){if(o.hostname!==e.location.hostname||o.pathname!==e.location.pathname||!/#/.test(o.href))return;n.preventDefault(),c.animateScroll(o.hash,o,t)}}},O=function(e){n||(n=setTimeout(function(){n=null,r=v(o)},66))};return c.destroy=function(){t&&(e.document.removeEventListener("click",y,!1),e.removeEventListener("resize",O,!1),t=null,n=null,o=null,r=null,a=null)},c.init=function(n){u&&(c.destroy(),t=l(i,n||{}),o=e.document.querySelector(t.selectorHeader),r=v(o),e.document.addEventListener("click",y,!1),o&&e.addEventListener("resize",O,!1))},c}); \ No newline at end of file +/*! smooth-scroll v9.4.2 | (c) 2016 Chris Ferdinandi | MIT License | http://github.com/cferdinandi/smooth-scroll */ +!function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)}("undefined"!=typeof global?global:this.window||this.global,function(e){"use strict";var t,n,o,r,a,c={},u="querySelector"in document&&"addEventListener"in e,i={selector:"[data-scroll]",selectorHeader:"[data-scroll-header]",speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callback:function(){}},l=function(){var e={},t=!1,n=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(t=arguments[0],n++);for(var r=function(n){for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(t&&"[object Object]"===Object.prototype.toString.call(n[o])?e[o]=l(!0,e[o],n[o]):e[o]=n[o])};o>n;n++){var a=arguments[n];r(a)}return e},s=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},f=function(e,t){var n,o,r=t.charAt(0),a="classList"in document.documentElement;for("["===r&&(t=t.substr(1,t.length-2),n=t.split("="),n.length>1&&(o=!0,n[1]=n[1].replace(/"/g,"").replace(/'/g,"")));e&&e!==document&&1===e.nodeType;e=e.parentNode){if("."===r)if(a){if(e.classList.contains(t.substr(1)))return e}else if(new RegExp("(^|\\s)"+t.substr(1)+"(\\s|$)").test(e.className))return e;if("#"===r&&e.id===t.substr(1))return e;if("["===r&&e.hasAttribute(n[0])){if(!o)return e;if(e.getAttribute(n[0])===n[1])return e}if(e.tagName.toLowerCase()===t)return e}return null};c.escapeCharacters=function(e){"#"===e.charAt(0)&&(e=e.substr(1));for(var t,n=String(e),o=n.length,r=-1,a="",c=n.charCodeAt(0);++r=1&&31>=t||127==t||0===r&&t>=48&&57>=t||1===r&&t>=48&&57>=t&&45===c?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(r):"\\"+n.charAt(r)}return"#"+a};var d=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},m=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=Math.max(o-t-n,0),Math.min(o,p()-h())},h=function(){return Math.max(document.documentElement.clientHeight,window.innerHeight||0)},p=function(){return Math.max(e.document.body.scrollHeight,e.document.documentElement.scrollHeight,e.document.body.offsetHeight,e.document.documentElement.offsetHeight,e.document.body.clientHeight,e.document.documentElement.clientHeight)},g=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},b=function(t,n){e.history.pushState&&(n||"true"===n)&&"file:"!==e.location.protocol&&e.history.pushState(null,null,[e.location.protocol,"//",e.location.host,e.location.pathname,e.location.search,t].join(""))},v=function(e){return null===e?0:s(e)+e.offsetTop};c.animateScroll=function(n,u,s){var f=g(u?u.getAttribute("data-options"):null),h=l(t||i,s||{},f),y="[object Number]"===Object.prototype.toString.call(n)?!0:!1,O=y?null:c.escapeCharacters(n),S=y?null:"#"===O?e.document.documentElement:e.document.querySelector(O);if(y||S){var I=e.pageYOffset;o||(o=e.document.querySelector(h.selectorHeader)),r||(r=v(o));var H,E,j=y?n:m(S,r,parseInt(h.offset,10)),w=j-I,C=p(),L=0;y||b(n,h.updateURL);var A=function(t,o,r){var a=e.pageYOffset;(t==o||a==o||e.innerHeight+a>=C)&&(clearInterval(r),y||(S.focus(),document.activeElement.id!==S.id&&(S.setAttribute("tabindex","-1"),S.focus(),S.style.outline="none")),h.callback(n,u))},Q=function(){L+=16,H=L/parseInt(h.speed,10),H=H>1?1:H,E=I+w*d(h.easing,H),e.scrollTo(0,Math.floor(E)),A(E,j,a)},x=function(){clearInterval(a),a=setInterval(Q,16)};0===e.pageYOffset&&e.scrollTo(0,0),x()}};var y=function(n){if(0===n.button&&!n.metaKey&&!n.ctrlKey){var o=f(n.target,t.selector);if(o&&"a"===o.tagName.toLowerCase()){if(o.hostname!==e.location.hostname||o.pathname!==e.location.pathname||!/#/.test(o.href))return;n.preventDefault(),c.animateScroll(o.hash,o,t)}}},O=function(e){n||(n=setTimeout(function(){n=null,r=v(o)},66))};return c.destroy=function(){t&&(e.document.removeEventListener("click",y,!1),e.removeEventListener("resize",O,!1),t=null,n=null,o=null,r=null,a=null)},c.init=function(n){u&&(c.destroy(),t=l(i,n||{}),o=e.document.querySelector(t.selectorHeader),r=v(o),e.document.addEventListener("click",y,!1),o&&e.addEventListener("resize",O,!1))},c}); \ No newline at end of file diff --git a/docs/index.html b/docs/index.html index 4e52e43..c002dca 100644 --- a/docs/index.html +++ b/docs/index.html @@ -71,7 +71,7 @@

Smooth Scroll

.
.
.
.
.
.
.
.
.
.
.
.
.

-

Back to the top

+

Back to the top

diff --git a/package.json b/package.json index 811058a..be513e5 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "smooth-scroll", - "version": "9.4.1", + "version": "9.4.2", "description": "Animate scrolling to anchor links", "main": "./dist/js/smooth-scroll.min.js", "author": { diff --git a/src/docs/index.md b/src/docs/index.md index a954057..33b0e26 100644 --- a/src/docs/index.md +++ b/src/docs/index.md @@ -41,4 +41,4 @@ .
.
.
.
.
.
.
.
.
.
.
.
.

-

Back to the top

\ No newline at end of file +

Back to the top

\ No newline at end of file diff --git a/src/js/smooth-scroll.js b/src/js/smooth-scroll.js index 7fc03e5..addde28 100755 --- a/src/js/smooth-scroll.js +++ b/src/js/smooth-scroll.js @@ -349,7 +349,7 @@ // Selectors and variables var isNum = Object.prototype.toString.call( anchor ) === '[object Number]' ? true : false; - var hash = smoothScroll.escapeCharacters( anchor ); + var hash = isNum ? null : smoothScroll.escapeCharacters( anchor ); var anchorElem = isNum ? null : ( hash === '#' ? root.document.documentElement : root.document.querySelector( hash ) ); if ( !isNum && !anchorElem ) return; var startLocation = root.pageYOffset; // Current location on the page From 7f32bdb6cbec675b528d09966778d0413bca746a Mon Sep 17 00:00:00 2001 From: cferdinandi Date: Sun, 4 Sep 2016 13:56:55 -0400 Subject: [PATCH 178/285] v9.4.3 Fixed jump with offset when bringing anchored element into focus --- dist/js/smooth-scroll.js | 4 +++- dist/js/smooth-scroll.min.js | 4 ++-- docs/dist/js/smooth-scroll.js | 4 +++- docs/dist/js/smooth-scroll.min.js | 4 ++-- package.json | 2 +- src/js/smooth-scroll.js | 2 ++ 6 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dist/js/smooth-scroll.js b/dist/js/smooth-scroll.js index bf82d44..b2de12e 100755 --- a/dist/js/smooth-scroll.js +++ b/dist/js/smooth-scroll.js @@ -1,5 +1,5 @@ /*! - * smooth-scroll v9.4.2: Animate scrolling to anchor links + * smooth-scroll v9.4.3: Animate scrolling to anchor links * (c) 2016 Chris Ferdinandi * MIT License * http://github.com/cferdinandi/smooth-scroll @@ -396,6 +396,8 @@ anchorElem.style.outline = 'none'; } } + root.scrollTo( 0 , endLocation ); + animateSettings.callback( anchor, toggle ); // Run callbacks after animation complete } }; diff --git a/dist/js/smooth-scroll.min.js b/dist/js/smooth-scroll.min.js index e6493f3..44ca8f0 100755 --- a/dist/js/smooth-scroll.min.js +++ b/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ -/*! smooth-scroll v9.4.2 | (c) 2016 Chris Ferdinandi | MIT License | http://github.com/cferdinandi/smooth-scroll */ -!function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)}("undefined"!=typeof global?global:this.window||this.global,function(e){"use strict";var t,n,o,r,a,c={},u="querySelector"in document&&"addEventListener"in e,i={selector:"[data-scroll]",selectorHeader:"[data-scroll-header]",speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callback:function(){}},l=function(){var e={},t=!1,n=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(t=arguments[0],n++);for(var r=function(n){for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(t&&"[object Object]"===Object.prototype.toString.call(n[o])?e[o]=l(!0,e[o],n[o]):e[o]=n[o])};o>n;n++){var a=arguments[n];r(a)}return e},s=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},f=function(e,t){var n,o,r=t.charAt(0),a="classList"in document.documentElement;for("["===r&&(t=t.substr(1,t.length-2),n=t.split("="),n.length>1&&(o=!0,n[1]=n[1].replace(/"/g,"").replace(/'/g,"")));e&&e!==document&&1===e.nodeType;e=e.parentNode){if("."===r)if(a){if(e.classList.contains(t.substr(1)))return e}else if(new RegExp("(^|\\s)"+t.substr(1)+"(\\s|$)").test(e.className))return e;if("#"===r&&e.id===t.substr(1))return e;if("["===r&&e.hasAttribute(n[0])){if(!o)return e;if(e.getAttribute(n[0])===n[1])return e}if(e.tagName.toLowerCase()===t)return e}return null};c.escapeCharacters=function(e){"#"===e.charAt(0)&&(e=e.substr(1));for(var t,n=String(e),o=n.length,r=-1,a="",c=n.charCodeAt(0);++r=1&&31>=t||127==t||0===r&&t>=48&&57>=t||1===r&&t>=48&&57>=t&&45===c?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(r):"\\"+n.charAt(r)}return"#"+a};var d=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},m=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=Math.max(o-t-n,0),Math.min(o,p()-h())},h=function(){return Math.max(document.documentElement.clientHeight,window.innerHeight||0)},p=function(){return Math.max(e.document.body.scrollHeight,e.document.documentElement.scrollHeight,e.document.body.offsetHeight,e.document.documentElement.offsetHeight,e.document.body.clientHeight,e.document.documentElement.clientHeight)},g=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},b=function(t,n){e.history.pushState&&(n||"true"===n)&&"file:"!==e.location.protocol&&e.history.pushState(null,null,[e.location.protocol,"//",e.location.host,e.location.pathname,e.location.search,t].join(""))},v=function(e){return null===e?0:s(e)+e.offsetTop};c.animateScroll=function(n,u,s){var f=g(u?u.getAttribute("data-options"):null),h=l(t||i,s||{},f),y="[object Number]"===Object.prototype.toString.call(n)?!0:!1,O=y?null:c.escapeCharacters(n),S=y?null:"#"===O?e.document.documentElement:e.document.querySelector(O);if(y||S){var I=e.pageYOffset;o||(o=e.document.querySelector(h.selectorHeader)),r||(r=v(o));var H,E,j=y?n:m(S,r,parseInt(h.offset,10)),w=j-I,C=p(),L=0;y||b(n,h.updateURL);var A=function(t,o,r){var a=e.pageYOffset;(t==o||a==o||e.innerHeight+a>=C)&&(clearInterval(r),y||(S.focus(),document.activeElement.id!==S.id&&(S.setAttribute("tabindex","-1"),S.focus(),S.style.outline="none")),h.callback(n,u))},Q=function(){L+=16,H=L/parseInt(h.speed,10),H=H>1?1:H,E=I+w*d(h.easing,H),e.scrollTo(0,Math.floor(E)),A(E,j,a)},x=function(){clearInterval(a),a=setInterval(Q,16)};0===e.pageYOffset&&e.scrollTo(0,0),x()}};var y=function(n){if(0===n.button&&!n.metaKey&&!n.ctrlKey){var o=f(n.target,t.selector);if(o&&"a"===o.tagName.toLowerCase()){if(o.hostname!==e.location.hostname||o.pathname!==e.location.pathname||!/#/.test(o.href))return;n.preventDefault(),c.animateScroll(o.hash,o,t)}}},O=function(e){n||(n=setTimeout(function(){n=null,r=v(o)},66))};return c.destroy=function(){t&&(e.document.removeEventListener("click",y,!1),e.removeEventListener("resize",O,!1),t=null,n=null,o=null,r=null,a=null)},c.init=function(n){u&&(c.destroy(),t=l(i,n||{}),o=e.document.querySelector(t.selectorHeader),r=v(o),e.document.addEventListener("click",y,!1),o&&e.addEventListener("resize",O,!1))},c}); \ No newline at end of file +/*! smooth-scroll v9.4.3 | (c) 2016 Chris Ferdinandi | MIT License | http://github.com/cferdinandi/smooth-scroll */ +!function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)}("undefined"!=typeof global?global:this.window||this.global,function(e){"use strict";var t,n,o,r,a,c={},u="querySelector"in document&&"addEventListener"in e,i={selector:"[data-scroll]",selectorHeader:"[data-scroll-header]",speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callback:function(){}},l=function(){var e={},t=!1,n=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(t=arguments[0],n++);for(var r=function(n){for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(t&&"[object Object]"===Object.prototype.toString.call(n[o])?e[o]=l(!0,e[o],n[o]):e[o]=n[o])};o>n;n++){var a=arguments[n];r(a)}return e},s=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},f=function(e,t){var n,o,r=t.charAt(0),a="classList"in document.documentElement;for("["===r&&(t=t.substr(1,t.length-2),n=t.split("="),n.length>1&&(o=!0,n[1]=n[1].replace(/"/g,"").replace(/'/g,"")));e&&e!==document&&1===e.nodeType;e=e.parentNode){if("."===r)if(a){if(e.classList.contains(t.substr(1)))return e}else if(new RegExp("(^|\\s)"+t.substr(1)+"(\\s|$)").test(e.className))return e;if("#"===r&&e.id===t.substr(1))return e;if("["===r&&e.hasAttribute(n[0])){if(!o)return e;if(e.getAttribute(n[0])===n[1])return e}if(e.tagName.toLowerCase()===t)return e}return null};c.escapeCharacters=function(e){"#"===e.charAt(0)&&(e=e.substr(1));for(var t,n=String(e),o=n.length,r=-1,a="",c=n.charCodeAt(0);++r=1&&31>=t||127==t||0===r&&t>=48&&57>=t||1===r&&t>=48&&57>=t&&45===c?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(r):"\\"+n.charAt(r)}return"#"+a};var d=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},m=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=Math.max(o-t-n,0),Math.min(o,p()-h())},h=function(){return Math.max(document.documentElement.clientHeight,window.innerHeight||0)},p=function(){return Math.max(e.document.body.scrollHeight,e.document.documentElement.scrollHeight,e.document.body.offsetHeight,e.document.documentElement.offsetHeight,e.document.body.clientHeight,e.document.documentElement.clientHeight)},g=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},b=function(t,n){e.history.pushState&&(n||"true"===n)&&"file:"!==e.location.protocol&&e.history.pushState(null,null,[e.location.protocol,"//",e.location.host,e.location.pathname,e.location.search,t].join(""))},v=function(e){return null===e?0:s(e)+e.offsetTop};c.animateScroll=function(n,u,s){var f=g(u?u.getAttribute("data-options"):null),h=l(t||i,s||{},f),y="[object Number]"===Object.prototype.toString.call(n)?!0:!1,O=y?null:c.escapeCharacters(n),S=y?null:"#"===O?e.document.documentElement:e.document.querySelector(O);if(y||S){var I=e.pageYOffset;o||(o=e.document.querySelector(h.selectorHeader)),r||(r=v(o));var H,E,j=y?n:m(S,r,parseInt(h.offset,10)),w=j-I,C=p(),L=0;y||b(n,h.updateURL);var A=function(t,o,r){var a=e.pageYOffset;(t==o||a==o||e.innerHeight+a>=C)&&(clearInterval(r),y||(S.focus(),document.activeElement.id!==S.id&&(S.setAttribute("tabindex","-1"),S.focus(),S.style.outline="none")),e.scrollTo(0,o),h.callback(n,u))},Q=function(){L+=16,H=L/parseInt(h.speed,10),H=H>1?1:H,E=I+w*d(h.easing,H),e.scrollTo(0,Math.floor(E)),A(E,j,a)},x=function(){clearInterval(a),a=setInterval(Q,16)};0===e.pageYOffset&&e.scrollTo(0,0),x()}};var y=function(n){if(0===n.button&&!n.metaKey&&!n.ctrlKey){var o=f(n.target,t.selector);if(o&&"a"===o.tagName.toLowerCase()){if(o.hostname!==e.location.hostname||o.pathname!==e.location.pathname||!/#/.test(o.href))return;n.preventDefault(),c.animateScroll(o.hash,o,t)}}},O=function(e){n||(n=setTimeout(function(){n=null,r=v(o)},66))};return c.destroy=function(){t&&(e.document.removeEventListener("click",y,!1),e.removeEventListener("resize",O,!1),t=null,n=null,o=null,r=null,a=null)},c.init=function(n){u&&(c.destroy(),t=l(i,n||{}),o=e.document.querySelector(t.selectorHeader),r=v(o),e.document.addEventListener("click",y,!1),o&&e.addEventListener("resize",O,!1))},c}); \ No newline at end of file diff --git a/docs/dist/js/smooth-scroll.js b/docs/dist/js/smooth-scroll.js index bf82d44..b2de12e 100755 --- a/docs/dist/js/smooth-scroll.js +++ b/docs/dist/js/smooth-scroll.js @@ -1,5 +1,5 @@ /*! - * smooth-scroll v9.4.2: Animate scrolling to anchor links + * smooth-scroll v9.4.3: Animate scrolling to anchor links * (c) 2016 Chris Ferdinandi * MIT License * http://github.com/cferdinandi/smooth-scroll @@ -396,6 +396,8 @@ anchorElem.style.outline = 'none'; } } + root.scrollTo( 0 , endLocation ); + animateSettings.callback( anchor, toggle ); // Run callbacks after animation complete } }; diff --git a/docs/dist/js/smooth-scroll.min.js b/docs/dist/js/smooth-scroll.min.js index e6493f3..44ca8f0 100755 --- a/docs/dist/js/smooth-scroll.min.js +++ b/docs/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ -/*! smooth-scroll v9.4.2 | (c) 2016 Chris Ferdinandi | MIT License | http://github.com/cferdinandi/smooth-scroll */ -!function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)}("undefined"!=typeof global?global:this.window||this.global,function(e){"use strict";var t,n,o,r,a,c={},u="querySelector"in document&&"addEventListener"in e,i={selector:"[data-scroll]",selectorHeader:"[data-scroll-header]",speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callback:function(){}},l=function(){var e={},t=!1,n=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(t=arguments[0],n++);for(var r=function(n){for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(t&&"[object Object]"===Object.prototype.toString.call(n[o])?e[o]=l(!0,e[o],n[o]):e[o]=n[o])};o>n;n++){var a=arguments[n];r(a)}return e},s=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},f=function(e,t){var n,o,r=t.charAt(0),a="classList"in document.documentElement;for("["===r&&(t=t.substr(1,t.length-2),n=t.split("="),n.length>1&&(o=!0,n[1]=n[1].replace(/"/g,"").replace(/'/g,"")));e&&e!==document&&1===e.nodeType;e=e.parentNode){if("."===r)if(a){if(e.classList.contains(t.substr(1)))return e}else if(new RegExp("(^|\\s)"+t.substr(1)+"(\\s|$)").test(e.className))return e;if("#"===r&&e.id===t.substr(1))return e;if("["===r&&e.hasAttribute(n[0])){if(!o)return e;if(e.getAttribute(n[0])===n[1])return e}if(e.tagName.toLowerCase()===t)return e}return null};c.escapeCharacters=function(e){"#"===e.charAt(0)&&(e=e.substr(1));for(var t,n=String(e),o=n.length,r=-1,a="",c=n.charCodeAt(0);++r=1&&31>=t||127==t||0===r&&t>=48&&57>=t||1===r&&t>=48&&57>=t&&45===c?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(r):"\\"+n.charAt(r)}return"#"+a};var d=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},m=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=Math.max(o-t-n,0),Math.min(o,p()-h())},h=function(){return Math.max(document.documentElement.clientHeight,window.innerHeight||0)},p=function(){return Math.max(e.document.body.scrollHeight,e.document.documentElement.scrollHeight,e.document.body.offsetHeight,e.document.documentElement.offsetHeight,e.document.body.clientHeight,e.document.documentElement.clientHeight)},g=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},b=function(t,n){e.history.pushState&&(n||"true"===n)&&"file:"!==e.location.protocol&&e.history.pushState(null,null,[e.location.protocol,"//",e.location.host,e.location.pathname,e.location.search,t].join(""))},v=function(e){return null===e?0:s(e)+e.offsetTop};c.animateScroll=function(n,u,s){var f=g(u?u.getAttribute("data-options"):null),h=l(t||i,s||{},f),y="[object Number]"===Object.prototype.toString.call(n)?!0:!1,O=y?null:c.escapeCharacters(n),S=y?null:"#"===O?e.document.documentElement:e.document.querySelector(O);if(y||S){var I=e.pageYOffset;o||(o=e.document.querySelector(h.selectorHeader)),r||(r=v(o));var H,E,j=y?n:m(S,r,parseInt(h.offset,10)),w=j-I,C=p(),L=0;y||b(n,h.updateURL);var A=function(t,o,r){var a=e.pageYOffset;(t==o||a==o||e.innerHeight+a>=C)&&(clearInterval(r),y||(S.focus(),document.activeElement.id!==S.id&&(S.setAttribute("tabindex","-1"),S.focus(),S.style.outline="none")),h.callback(n,u))},Q=function(){L+=16,H=L/parseInt(h.speed,10),H=H>1?1:H,E=I+w*d(h.easing,H),e.scrollTo(0,Math.floor(E)),A(E,j,a)},x=function(){clearInterval(a),a=setInterval(Q,16)};0===e.pageYOffset&&e.scrollTo(0,0),x()}};var y=function(n){if(0===n.button&&!n.metaKey&&!n.ctrlKey){var o=f(n.target,t.selector);if(o&&"a"===o.tagName.toLowerCase()){if(o.hostname!==e.location.hostname||o.pathname!==e.location.pathname||!/#/.test(o.href))return;n.preventDefault(),c.animateScroll(o.hash,o,t)}}},O=function(e){n||(n=setTimeout(function(){n=null,r=v(o)},66))};return c.destroy=function(){t&&(e.document.removeEventListener("click",y,!1),e.removeEventListener("resize",O,!1),t=null,n=null,o=null,r=null,a=null)},c.init=function(n){u&&(c.destroy(),t=l(i,n||{}),o=e.document.querySelector(t.selectorHeader),r=v(o),e.document.addEventListener("click",y,!1),o&&e.addEventListener("resize",O,!1))},c}); \ No newline at end of file +/*! smooth-scroll v9.4.3 | (c) 2016 Chris Ferdinandi | MIT License | http://github.com/cferdinandi/smooth-scroll */ +!function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)}("undefined"!=typeof global?global:this.window||this.global,function(e){"use strict";var t,n,o,r,a,c={},u="querySelector"in document&&"addEventListener"in e,i={selector:"[data-scroll]",selectorHeader:"[data-scroll-header]",speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callback:function(){}},l=function(){var e={},t=!1,n=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(t=arguments[0],n++);for(var r=function(n){for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(t&&"[object Object]"===Object.prototype.toString.call(n[o])?e[o]=l(!0,e[o],n[o]):e[o]=n[o])};o>n;n++){var a=arguments[n];r(a)}return e},s=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},f=function(e,t){var n,o,r=t.charAt(0),a="classList"in document.documentElement;for("["===r&&(t=t.substr(1,t.length-2),n=t.split("="),n.length>1&&(o=!0,n[1]=n[1].replace(/"/g,"").replace(/'/g,"")));e&&e!==document&&1===e.nodeType;e=e.parentNode){if("."===r)if(a){if(e.classList.contains(t.substr(1)))return e}else if(new RegExp("(^|\\s)"+t.substr(1)+"(\\s|$)").test(e.className))return e;if("#"===r&&e.id===t.substr(1))return e;if("["===r&&e.hasAttribute(n[0])){if(!o)return e;if(e.getAttribute(n[0])===n[1])return e}if(e.tagName.toLowerCase()===t)return e}return null};c.escapeCharacters=function(e){"#"===e.charAt(0)&&(e=e.substr(1));for(var t,n=String(e),o=n.length,r=-1,a="",c=n.charCodeAt(0);++r=1&&31>=t||127==t||0===r&&t>=48&&57>=t||1===r&&t>=48&&57>=t&&45===c?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(r):"\\"+n.charAt(r)}return"#"+a};var d=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},m=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=Math.max(o-t-n,0),Math.min(o,p()-h())},h=function(){return Math.max(document.documentElement.clientHeight,window.innerHeight||0)},p=function(){return Math.max(e.document.body.scrollHeight,e.document.documentElement.scrollHeight,e.document.body.offsetHeight,e.document.documentElement.offsetHeight,e.document.body.clientHeight,e.document.documentElement.clientHeight)},g=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},b=function(t,n){e.history.pushState&&(n||"true"===n)&&"file:"!==e.location.protocol&&e.history.pushState(null,null,[e.location.protocol,"//",e.location.host,e.location.pathname,e.location.search,t].join(""))},v=function(e){return null===e?0:s(e)+e.offsetTop};c.animateScroll=function(n,u,s){var f=g(u?u.getAttribute("data-options"):null),h=l(t||i,s||{},f),y="[object Number]"===Object.prototype.toString.call(n)?!0:!1,O=y?null:c.escapeCharacters(n),S=y?null:"#"===O?e.document.documentElement:e.document.querySelector(O);if(y||S){var I=e.pageYOffset;o||(o=e.document.querySelector(h.selectorHeader)),r||(r=v(o));var H,E,j=y?n:m(S,r,parseInt(h.offset,10)),w=j-I,C=p(),L=0;y||b(n,h.updateURL);var A=function(t,o,r){var a=e.pageYOffset;(t==o||a==o||e.innerHeight+a>=C)&&(clearInterval(r),y||(S.focus(),document.activeElement.id!==S.id&&(S.setAttribute("tabindex","-1"),S.focus(),S.style.outline="none")),e.scrollTo(0,o),h.callback(n,u))},Q=function(){L+=16,H=L/parseInt(h.speed,10),H=H>1?1:H,E=I+w*d(h.easing,H),e.scrollTo(0,Math.floor(E)),A(E,j,a)},x=function(){clearInterval(a),a=setInterval(Q,16)};0===e.pageYOffset&&e.scrollTo(0,0),x()}};var y=function(n){if(0===n.button&&!n.metaKey&&!n.ctrlKey){var o=f(n.target,t.selector);if(o&&"a"===o.tagName.toLowerCase()){if(o.hostname!==e.location.hostname||o.pathname!==e.location.pathname||!/#/.test(o.href))return;n.preventDefault(),c.animateScroll(o.hash,o,t)}}},O=function(e){n||(n=setTimeout(function(){n=null,r=v(o)},66))};return c.destroy=function(){t&&(e.document.removeEventListener("click",y,!1),e.removeEventListener("resize",O,!1),t=null,n=null,o=null,r=null,a=null)},c.init=function(n){u&&(c.destroy(),t=l(i,n||{}),o=e.document.querySelector(t.selectorHeader),r=v(o),e.document.addEventListener("click",y,!1),o&&e.addEventListener("resize",O,!1))},c}); \ No newline at end of file diff --git a/package.json b/package.json index be513e5..60e7475 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "smooth-scroll", - "version": "9.4.2", + "version": "9.4.3", "description": "Animate scrolling to anchor links", "main": "./dist/js/smooth-scroll.min.js", "author": { diff --git a/src/js/smooth-scroll.js b/src/js/smooth-scroll.js index addde28..2c7ef3b 100755 --- a/src/js/smooth-scroll.js +++ b/src/js/smooth-scroll.js @@ -389,6 +389,8 @@ anchorElem.style.outline = 'none'; } } + root.scrollTo( 0 , endLocation ); + animateSettings.callback( anchor, toggle ); // Run callbacks after animation complete } }; From d4afd9f40c917b38d4ec867fc2af41acb2295e6e Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Sun, 4 Sep 2016 14:34:04 -0400 Subject: [PATCH 179/285] v10.0.0 (#283) BREAKING CHANGES: - Use `hashchange` instead of `pushState` for better browser support - Remove `updateUrl` option, since URL will always update - Fixed focus state approach - Pass Node or Number, not ID string, into `animateScroll` method - Remove `escapeCharacters` from public API - If scrolling to top with `#`, add an ID to the body and scroll that way - Only look for fixed header if a selector for one is set --- README.md | 40 +++--- dist/js/smooth-scroll.js | 198 +++++++++++++++++++++--------- dist/js/smooth-scroll.min.js | 4 +- docs/dist/js/smooth-scroll.js | 198 +++++++++++++++++++++--------- docs/dist/js/smooth-scroll.min.js | 4 +- package.json | 2 +- src/js/smooth-scroll.js | 196 ++++++++++++++++++++--------- test/spec/spec-smoothScroll.js | 74 +++++------ 8 files changed, 476 insertions(+), 240 deletions(-) diff --git a/README.md b/README.md index 9b7113f..d1c27cf 100755 --- a/README.md +++ b/README.md @@ -79,11 +79,10 @@ You can pass options and callbacks into Smooth Scroll through the `init()` funct ```javascript smoothScroll.init({ selector: '[data-scroll]', // Selector for links (must be a class, ID, data attribute, or element tag) - selectorHeader: '[data-scroll-header]', // Selector for fixed headers (must be a valid CSS selector) + selectorHeader: null, // Selector for fixed headers (must be a valid CSS selector) [optional] speed: 500, // Integer. How fast to complete the scroll in milliseconds easing: 'easeInOutCubic', // Easing pattern to use offset: 0, // Integer. How far to offset the scrolling anchor location in pixels - updateURL: true, // Boolean. If true, update the URL hash on scroll callback: function ( anchor, toggle ) {} // Function to run after scrolling }); ``` @@ -154,8 +153,8 @@ Animate scrolling to an anchor. ```javascript smoothScroll.animateScroll( - anchor, // ID of the anchor to scroll to. ex. '#bazinga' - toggle, // Node that toggles the animation, OR an integer. ex. document.querySelector('#toggle') + anchor, // Node to scroll to. ex. document.querySelector( '#bazinga' ) + toggle, // Node that toggles the animation, OR an integer. ex. document.querySelector( '#toggle' ) options // Classes and callbacks. Same options as those passed into the init() function. ); ``` @@ -163,30 +162,26 @@ smoothScroll.animateScroll( **Example 1** ```javascript -smoothScroll.animateScroll( '#bazinga' ); +var anchor = document.querySelector( '#bazinga' ); +smoothScroll.animateScroll( anchor ); ``` **Example 2** ```javascript +var anchor = document.querySelector( '#bazinga' ); var toggle = document.querySelector('#toggle'); var options = { speed: 1000, easing: 'easeOutCubic' }; -smoothScroll.animateScroll( '#bazinga', toggle, options ); +smoothScroll.animateScroll( anchor, toggle, options ); ``` **Example 3** ```javascript +// You can optionally pass in a y-position to scroll to as an integer smoothScroll.animateScroll( 750 ); ``` -#### escapeCharacters() -Escape special characters for use with `animateScroll()`. - -```javascript -var toggle = smoothScroll.escapeCharacters('#1@#%^-'); -``` - #### destroy() Destroy the current `smoothScroll.init()`. This is called automatically during the `init` function to remove any existing initializations. @@ -197,12 +192,20 @@ smoothScroll.destroy(); ### Fixed Headers -Add a `[data-scroll-header]` data attribute to fixed headers. Smooth Scroll will automatically offset scroll distances by the header height. If you have multiple fixed headers, add `[data-scroll-header]` to the last one in the markup. +If you're using a fixed header, Smooth Scroll will automatically offset scroll distances by the header height. Pass in a valid CSS selector for your fixed header as an option to the `init`. + +If you have multiple fixed headers, pass in the last one in the markup. ```html +... + ``` ### Animating links to other pages @@ -221,10 +224,10 @@ You can attempt to implement it using the API, but it's very difficult to preven ```html ``` @@ -234,8 +237,7 @@ You can attempt to implement it using the API, but it's very difficult to preven Smooth Scroll works in all modern browsers, and IE 9 and above. -Smooth Scroll is built with modern JavaScript APIs, and uses progressive enhancement. If the JavaScript file fails to load, or if your site is viewed on older and less capable browsers, anchor links will jump the way they normally would. If you need to smooth scrolling for older browsers, [download the jQuery version of Smooth Scroll on GitHub](https://github.com/cferdinandi/smooth-scroll/tree/archive-v1). - +Smooth Scroll is built with modern JavaScript APIs, and uses progressive enhancement. If the JavaScript file fails to load, or if your site is viewed on older and less capable browsers, anchor links will jump the way they normally would. ## Known Issues diff --git a/dist/js/smooth-scroll.js b/dist/js/smooth-scroll.js index b2de12e..3546bf0 100755 --- a/dist/js/smooth-scroll.js +++ b/dist/js/smooth-scroll.js @@ -1,5 +1,5 @@ /*! - * smooth-scroll v9.4.3: Animate scrolling to anchor links + * smooth-scroll v10.0.0: Animate scrolling to anchor links * (c) 2016 Chris Ferdinandi * MIT License * http://github.com/cferdinandi/smooth-scroll @@ -23,16 +23,15 @@ var smoothScroll = {}; // Object for public APIs var supports = 'querySelector' in document && 'addEventListener' in root; // Feature test - var settings, eventTimeout, fixedHeader, headerHeight, animationInterval; + var settings, anchor, toggle, fixedHeader, headerHeight, eventTimeout, animationInterval; // Default settings var defaults = { selector: '[data-scroll]', - selectorHeader: '[data-scroll-header]', + selectorHeader: null, speed: 500, easing: 'easeInOutCubic', offset: 0, - updateURL: true, callback: function () {} }; @@ -170,12 +169,12 @@ /** * Escape special characters for use with querySelector - * @public + * @private * @param {String} id The anchor ID to escape * @author Mathias Bynens * @link https://github.com/mathiasbynens/CSS.escape */ - smoothScroll.escapeCharacters = function ( id ) { + var escapeCharacters = function ( id ) { // Remove leading hash if ( id.charAt(0) === '#' ) { @@ -299,8 +298,8 @@ * @returns {Number} */ var getViewportHeight = function() { - return Math.max(document.documentElement.clientHeight, window.innerHeight || 0); - }; + return Math.max( document.documentElement.clientHeight, root.innerHeight || 0 ); + }; /** * Determine the document's height @@ -309,9 +308,9 @@ */ var getDocumentHeight = function () { return Math.max( - root.document.body.scrollHeight, root.document.documentElement.scrollHeight, - root.document.body.offsetHeight, root.document.documentElement.offsetHeight, - root.document.body.clientHeight, root.document.documentElement.clientHeight + document.body.scrollHeight, document.documentElement.scrollHeight, + document.body.offsetHeight, document.documentElement.offsetHeight, + document.body.clientHeight, document.documentElement.clientHeight ); }; @@ -326,27 +325,41 @@ }; /** - * Update the URL + * Get the height of the fixed header * @private - * @param {Element} anchor The element to scroll to - * @param {Boolean} url Whether or not to update the URL history + * @param {Node} header The header + * @return {Number} The height of the header */ - var updateUrl = function ( anchor, url ) { - if ( root.history.pushState && (url || url === 'true') && root.location.protocol !== 'file:' ) { - root.history.pushState( null, null, [root.location.protocol, '//', root.location.host, root.location.pathname, root.location.search, anchor].join('') ); - } - }; - var getHeaderHeight = function ( header ) { return header === null ? 0 : ( getHeight( header ) + header.offsetTop ); }; + /** + * Bring the anchored element into focus + * @private + */ + var adjustFocus = function ( anchor, endLocation, isNum ) { + + // Don't run if scrolling to a number on the page + if ( isNum ) return; + + // Otherwise, bring anchor element into focus + anchor.focus(); + if ( document.activeElement.id !== anchor.id ) { + anchor.setAttribute( 'tabindex', '-1' ); + anchor.focus(); + anchor.style.outline = 'none'; + } + root.scrollTo( 0 , endLocation ); + + }; + /** * Start/stop the scrolling animation * @public - * @param {Element} anchor The element to scroll to - * @param {Element} toggle The element that toggled the scroll event - * @param {Object} options + * @param {Node|Number} anchor The element or position to scroll to + * @param {Element} toggle The element that toggled the scroll event + * @param {Object} options */ smoothScroll.animateScroll = function ( anchor, toggle, options ) { @@ -356,23 +369,23 @@ // Selectors and variables var isNum = Object.prototype.toString.call( anchor ) === '[object Number]' ? true : false; - var hash = isNum ? null : smoothScroll.escapeCharacters( anchor ); - var anchorElem = isNum ? null : ( hash === '#' ? root.document.documentElement : root.document.querySelector( hash ) ); + var anchorElem = isNum || !anchor.tagName ? null : anchor; if ( !isNum && !anchorElem ) return; var startLocation = root.pageYOffset; // Current location on the page - if ( !fixedHeader ) { fixedHeader = root.document.querySelector( animateSettings.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 + if ( animateSettings.selectorHeader && !fixedHeader ) { + // Get the fixed header if not already set + fixedHeader = document.querySelector( animateSettings.selectorHeader ); + } + if ( !headerHeight ) { + // Get the height of a fixed header if one exists and not already set + headerHeight = getHeaderHeight( fixedHeader ); + } var endLocation = isNum ? anchor : getEndLocation( anchorElem, headerHeight, parseInt(animateSettings.offset, 10) ); // Location to scroll to var distance = endLocation - startLocation; // distance to travel var documentHeight = getDocumentHeight(); var timeLapsed = 0; var percentage, position; - // Update URL - if ( !isNum ) { - updateUrl( anchor, animateSettings.updateURL ); - } - /** * Stop the scroll animation when it reaches its target (or the bottom/top of page) * @private @@ -382,23 +395,17 @@ */ var stopAnimateScroll = function ( position, endLocation, animationInterval ) { var currentLocation = root.pageYOffset; - if ( position == endLocation || currentLocation == endLocation || ( (root.innerHeight + currentLocation) >= + if ( position == endLocation || currentLocation == endLocation || ( (root.innerHeight + currentLocation) >= documentHeight ) ) { - documentHeight ) ) { + // Clear the animation timer clearInterval(animationInterval); - // If scroll target is an anchor, bring it into focus - if ( !isNum ) { - anchorElem.focus(); - if ( document.activeElement.id !== anchorElem.id ) { - anchorElem.setAttribute( 'tabindex', '-1' ); - anchorElem.focus(); - anchorElem.style.outline = 'none'; - } - } - root.scrollTo( 0 , endLocation ); + // Bring the anchored element into focus + adjustFocus( anchor, endLocation, isNum ); + + // Run callback after animation complete + animateSettings.callback( anchor, toggle ); - animateSettings.callback( anchor, toggle ); // Run callbacks after animation complete } }; @@ -437,25 +444,87 @@ }; + /** + * Handle has change event + * @private + */ + var hashChangeHandler = function (event) { + + // Get hash from URL + var hash = root.location.hash; + + // Only run if there's an anchor element to scroll to + if ( !anchor ) return; + + // Reset the anchor element's ID + anchor.id = anchor.getAttribute( 'data-scroll-id' ); + + // Scroll to the anchored content + smoothScroll.animateScroll( anchor, toggle ); + + // Reset anchor and toggle + anchor = null; + toggle = null; + + }; + /** * If smooth scroll element clicked, animate scroll * @private */ - var eventHandler = function (event) { + var clickHandler = function (event) { // Don't run if right-click or command/control + click if ( event.button !== 0 || event.metaKey || event.ctrlKey ) return; - // If a smooth scroll link, animate it - var toggle = getClosest( event.target, settings.selector ); - if ( toggle && toggle.tagName.toLowerCase() === 'a' ) { + // Check if a smooth scroll link was clicked + toggle = getClosest( event.target, settings.selector ); + if ( !toggle || toggle.tagName.toLowerCase() !== 'a' ) return; + + // Only run if link is an anchor and points to the current page + if ( toggle.hostname !== root.location.hostname || toggle.pathname !== root.location.pathname || !/#/.test(toggle.href) ) return; + + // Get the sanitized hash + var hash = escapeCharacters( toggle.hash ); + + // If the hash is empty, scroll to the top of the page + if ( hash === '#' ) { + + // Prevent default link behavior + event.preventDefault(); - // Check that link is an anchor and points to current page - if ( toggle.hostname !== root.location.hostname || toggle.pathname !== root.location.pathname || !/#/.test(toggle.href) ) return; + // Set the anchored element + anchor = document.body; - event.preventDefault(); // Prevent default click event - smoothScroll.animateScroll( toggle.hash, toggle, settings); // Animate scroll + // Save or create the ID as a data attribute and remove it (prevents scroll jump) + var id = anchor.id ? anchor.id : 'smooth-scroll-top'; + anchor.setAttribute( 'data-scroll-id', id ); + anchor.id = ''; + // If no hash change event will happen, fire manually + // Otherwise, update the hash + if ( root.location.hash.substring(1) === id ) { + hashChangeHandler(); + } else { + root.location.hash = id; + } + + return; + + } + + // Get the anchored element + anchor = document.querySelector( hash ); + + // If anchored element exists, save the ID as a data attribute and remove it (prevents scroll jump) + if ( !anchor ) return; + anchor.setAttribute( 'data-scroll-id', anchor.id ); + anchor.id = ''; + + // If no hash change event will happen, fire manually + if ( toggle.hash === root.location.hash ) { + event.preventDefault(); + hashChangeHandler(); } }; @@ -466,7 +535,7 @@ * @param {Function} eventTimeout Timeout function * @param {Object} settings */ - var eventThrottler = function (event) { + var resizeThrottler = function (event) { if ( !eventTimeout ) { eventTimeout = setTimeout(function() { eventTimeout = null; // Reset timeout @@ -485,14 +554,16 @@ if ( !settings ) return; // Remove event listeners - root.document.removeEventListener( 'click', eventHandler, false ); - root.removeEventListener( 'resize', eventThrottler, false ); + document.removeEventListener( 'click', clickHandler, false ); + root.removeEventListener( 'resize', resizeThrottler, false ); // Reset varaibles settings = null; - eventTimeout = null; + anchor = null; + toggle = null; fixedHeader = null; headerHeight = null; + eventTimeout = null; animationInterval = null; }; @@ -511,12 +582,19 @@ // Selectors and variables settings = extend( defaults, options || {} ); // Merge user options with defaults - fixedHeader = root.document.querySelector( settings.selectorHeader ); // Get the fixed header + fixedHeader = settings.selectorHeader ? document.querySelector( settings.selectorHeader ) : null; // Get the fixed header headerHeight = getHeaderHeight( fixedHeader ); // When a toggle is clicked, run the click handler - root.document.addEventListener('click', eventHandler, false ); - if ( fixedHeader ) { root.addEventListener( 'resize', eventThrottler, false ); } + document.addEventListener( 'click', clickHandler, false ); + + // Listen for hash changes + root.addEventListener('hashchange', hashChangeHandler, false); + + // If window is resized and there's a fixed header, recalculate its size + if ( fixedHeader ) { + root.addEventListener( 'resize', resizeThrottler, false ); + } }; diff --git a/dist/js/smooth-scroll.min.js b/dist/js/smooth-scroll.min.js index 44ca8f0..10c1a59 100755 --- a/dist/js/smooth-scroll.min.js +++ b/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ -/*! smooth-scroll v9.4.3 | (c) 2016 Chris Ferdinandi | MIT License | http://github.com/cferdinandi/smooth-scroll */ -!function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)}("undefined"!=typeof global?global:this.window||this.global,function(e){"use strict";var t,n,o,r,a,c={},u="querySelector"in document&&"addEventListener"in e,i={selector:"[data-scroll]",selectorHeader:"[data-scroll-header]",speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callback:function(){}},l=function(){var e={},t=!1,n=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(t=arguments[0],n++);for(var r=function(n){for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(t&&"[object Object]"===Object.prototype.toString.call(n[o])?e[o]=l(!0,e[o],n[o]):e[o]=n[o])};o>n;n++){var a=arguments[n];r(a)}return e},s=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},f=function(e,t){var n,o,r=t.charAt(0),a="classList"in document.documentElement;for("["===r&&(t=t.substr(1,t.length-2),n=t.split("="),n.length>1&&(o=!0,n[1]=n[1].replace(/"/g,"").replace(/'/g,"")));e&&e!==document&&1===e.nodeType;e=e.parentNode){if("."===r)if(a){if(e.classList.contains(t.substr(1)))return e}else if(new RegExp("(^|\\s)"+t.substr(1)+"(\\s|$)").test(e.className))return e;if("#"===r&&e.id===t.substr(1))return e;if("["===r&&e.hasAttribute(n[0])){if(!o)return e;if(e.getAttribute(n[0])===n[1])return e}if(e.tagName.toLowerCase()===t)return e}return null};c.escapeCharacters=function(e){"#"===e.charAt(0)&&(e=e.substr(1));for(var t,n=String(e),o=n.length,r=-1,a="",c=n.charCodeAt(0);++r=1&&31>=t||127==t||0===r&&t>=48&&57>=t||1===r&&t>=48&&57>=t&&45===c?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(r):"\\"+n.charAt(r)}return"#"+a};var d=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},m=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=Math.max(o-t-n,0),Math.min(o,p()-h())},h=function(){return Math.max(document.documentElement.clientHeight,window.innerHeight||0)},p=function(){return Math.max(e.document.body.scrollHeight,e.document.documentElement.scrollHeight,e.document.body.offsetHeight,e.document.documentElement.offsetHeight,e.document.body.clientHeight,e.document.documentElement.clientHeight)},g=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},b=function(t,n){e.history.pushState&&(n||"true"===n)&&"file:"!==e.location.protocol&&e.history.pushState(null,null,[e.location.protocol,"//",e.location.host,e.location.pathname,e.location.search,t].join(""))},v=function(e){return null===e?0:s(e)+e.offsetTop};c.animateScroll=function(n,u,s){var f=g(u?u.getAttribute("data-options"):null),h=l(t||i,s||{},f),y="[object Number]"===Object.prototype.toString.call(n)?!0:!1,O=y?null:c.escapeCharacters(n),S=y?null:"#"===O?e.document.documentElement:e.document.querySelector(O);if(y||S){var I=e.pageYOffset;o||(o=e.document.querySelector(h.selectorHeader)),r||(r=v(o));var H,E,j=y?n:m(S,r,parseInt(h.offset,10)),w=j-I,C=p(),L=0;y||b(n,h.updateURL);var A=function(t,o,r){var a=e.pageYOffset;(t==o||a==o||e.innerHeight+a>=C)&&(clearInterval(r),y||(S.focus(),document.activeElement.id!==S.id&&(S.setAttribute("tabindex","-1"),S.focus(),S.style.outline="none")),e.scrollTo(0,o),h.callback(n,u))},Q=function(){L+=16,H=L/parseInt(h.speed,10),H=H>1?1:H,E=I+w*d(h.easing,H),e.scrollTo(0,Math.floor(E)),A(E,j,a)},x=function(){clearInterval(a),a=setInterval(Q,16)};0===e.pageYOffset&&e.scrollTo(0,0),x()}};var y=function(n){if(0===n.button&&!n.metaKey&&!n.ctrlKey){var o=f(n.target,t.selector);if(o&&"a"===o.tagName.toLowerCase()){if(o.hostname!==e.location.hostname||o.pathname!==e.location.pathname||!/#/.test(o.href))return;n.preventDefault(),c.animateScroll(o.hash,o,t)}}},O=function(e){n||(n=setTimeout(function(){n=null,r=v(o)},66))};return c.destroy=function(){t&&(e.document.removeEventListener("click",y,!1),e.removeEventListener("resize",O,!1),t=null,n=null,o=null,r=null,a=null)},c.init=function(n){u&&(c.destroy(),t=l(i,n||{}),o=e.document.querySelector(t.selectorHeader),r=v(o),e.document.addEventListener("click",y,!1),o&&e.addEventListener("resize",O,!1))},c}); \ No newline at end of file +/*! smooth-scroll v10.0.0 | (c) 2016 Chris Ferdinandi | MIT License | http://github.com/cferdinandi/smooth-scroll */ +!function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)}("undefined"!=typeof global?global:this.window||this.global,function(e){"use strict";var t,n,o,r,a,i,u,c={},l="querySelector"in document&&"addEventListener"in e,s={selector:"[data-scroll]",selectorHeader:null,speed:500,easing:"easeInOutCubic",offset:0,callback:function(){}},f=function(){var e={},t=!1,n=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(t=arguments[0],n++);for(var r=function(n){for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(t&&"[object Object]"===Object.prototype.toString.call(n[o])?e[o]=f(!0,e[o],n[o]):e[o]=n[o])};o>n;n++){var a=arguments[n];r(a)}return e},d=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},h=function(e,t){var n,o,r=t.charAt(0),a="classList"in document.documentElement;for("["===r&&(t=t.substr(1,t.length-2),n=t.split("="),n.length>1&&(o=!0,n[1]=n[1].replace(/"/g,"").replace(/'/g,"")));e&&e!==document&&1===e.nodeType;e=e.parentNode){if("."===r)if(a){if(e.classList.contains(t.substr(1)))return e}else if(new RegExp("(^|\\s)"+t.substr(1)+"(\\s|$)").test(e.className))return e;if("#"===r&&e.id===t.substr(1))return e;if("["===r&&e.hasAttribute(n[0])){if(!o)return e;if(e.getAttribute(n[0])===n[1])return e}if(e.tagName.toLowerCase()===t)return e}return null},m=function(e){"#"===e.charAt(0)&&(e=e.substr(1));for(var t,n=String(e),o=n.length,r=-1,a="",i=n.charCodeAt(0);++r=1&&31>=t||127==t||0===r&&t>=48&&57>=t||1===r&&t>=48&&57>=t&&45===i?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(r):"\\"+n.charAt(r)}return"#"+a},g=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},p=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=Math.max(o-t-n,0),Math.min(o,v()-b())},b=function(){return Math.max(document.documentElement.clientHeight,e.innerHeight||0)},v=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},y=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},O=function(e){return null===e?0:d(e)+e.offsetTop},H=function(t,n,o){o||(t.focus(),document.activeElement.id!==t.id&&(t.setAttribute("tabindex","-1"),t.focus(),t.style.outline="none"),e.scrollTo(0,n))};c.animateScroll=function(n,o,i){var c=y(o?o.getAttribute("data-options"):null),l=f(t||s,i||{},c),d="[object Number]"===Object.prototype.toString.call(n)?!0:!1,h=d||!n.tagName?null:n;if(d||h){var m=e.pageYOffset;l.selectorHeader&&!r&&(r=document.querySelector(l.selectorHeader)),a||(a=O(r));var b,I,S=d?n:p(h,a,parseInt(l.offset,10)),E=S-m,A=v(),j=0,L=function(t,r,a){var i=e.pageYOffset;(t==r||i==r||e.innerHeight+i>=A)&&(clearInterval(a),H(n,r,d),l.callback(n,o))},w=function(){j+=16,b=j/parseInt(l.speed,10),b=b>1?1:b,I=m+E*g(l.easing,b),e.scrollTo(0,Math.floor(I)),L(I,S,u)},C=function(){clearInterval(u),u=setInterval(w,16)};0===e.pageYOffset&&e.scrollTo(0,0),C()}};var I=function(t){e.location.hash;n&&(n.id=n.getAttribute("data-scroll-id"),c.animateScroll(n,o),n=null,o=null)},S=function(r){if(0===r.button&&!r.metaKey&&!r.ctrlKey&&(o=h(r.target,t.selector),o&&"a"===o.tagName.toLowerCase()&&o.hostname===e.location.hostname&&o.pathname===e.location.pathname&&/#/.test(o.href))){var a=m(o.hash);if("#"===a){r.preventDefault(),n=document.body;var i=n.id?n.id:"smooth-scroll-top";return n.setAttribute("data-scroll-id",i),n.id="",void(e.location.hash.substring(1)===i?I():e.location.hash=i)}n=document.querySelector(a),n&&(n.setAttribute("data-scroll-id",n.id),n.id="",o.hash===e.location.hash&&(r.preventDefault(),I()))}},E=function(e){i||(i=setTimeout(function(){i=null,a=O(r)},66))};return c.destroy=function(){t&&(document.removeEventListener("click",S,!1),e.removeEventListener("resize",E,!1),t=null,n=null,o=null,r=null,a=null,i=null,u=null)},c.init=function(n){l&&(c.destroy(),t=f(s,n||{}),r=t.selectorHeader?document.querySelector(t.selectorHeader):null,a=O(r),document.addEventListener("click",S,!1),e.addEventListener("hashchange",I,!1),r&&e.addEventListener("resize",E,!1))},c}); \ No newline at end of file diff --git a/docs/dist/js/smooth-scroll.js b/docs/dist/js/smooth-scroll.js index b2de12e..3546bf0 100755 --- a/docs/dist/js/smooth-scroll.js +++ b/docs/dist/js/smooth-scroll.js @@ -1,5 +1,5 @@ /*! - * smooth-scroll v9.4.3: Animate scrolling to anchor links + * smooth-scroll v10.0.0: Animate scrolling to anchor links * (c) 2016 Chris Ferdinandi * MIT License * http://github.com/cferdinandi/smooth-scroll @@ -23,16 +23,15 @@ var smoothScroll = {}; // Object for public APIs var supports = 'querySelector' in document && 'addEventListener' in root; // Feature test - var settings, eventTimeout, fixedHeader, headerHeight, animationInterval; + var settings, anchor, toggle, fixedHeader, headerHeight, eventTimeout, animationInterval; // Default settings var defaults = { selector: '[data-scroll]', - selectorHeader: '[data-scroll-header]', + selectorHeader: null, speed: 500, easing: 'easeInOutCubic', offset: 0, - updateURL: true, callback: function () {} }; @@ -170,12 +169,12 @@ /** * Escape special characters for use with querySelector - * @public + * @private * @param {String} id The anchor ID to escape * @author Mathias Bynens * @link https://github.com/mathiasbynens/CSS.escape */ - smoothScroll.escapeCharacters = function ( id ) { + var escapeCharacters = function ( id ) { // Remove leading hash if ( id.charAt(0) === '#' ) { @@ -299,8 +298,8 @@ * @returns {Number} */ var getViewportHeight = function() { - return Math.max(document.documentElement.clientHeight, window.innerHeight || 0); - }; + return Math.max( document.documentElement.clientHeight, root.innerHeight || 0 ); + }; /** * Determine the document's height @@ -309,9 +308,9 @@ */ var getDocumentHeight = function () { return Math.max( - root.document.body.scrollHeight, root.document.documentElement.scrollHeight, - root.document.body.offsetHeight, root.document.documentElement.offsetHeight, - root.document.body.clientHeight, root.document.documentElement.clientHeight + document.body.scrollHeight, document.documentElement.scrollHeight, + document.body.offsetHeight, document.documentElement.offsetHeight, + document.body.clientHeight, document.documentElement.clientHeight ); }; @@ -326,27 +325,41 @@ }; /** - * Update the URL + * Get the height of the fixed header * @private - * @param {Element} anchor The element to scroll to - * @param {Boolean} url Whether or not to update the URL history + * @param {Node} header The header + * @return {Number} The height of the header */ - var updateUrl = function ( anchor, url ) { - if ( root.history.pushState && (url || url === 'true') && root.location.protocol !== 'file:' ) { - root.history.pushState( null, null, [root.location.protocol, '//', root.location.host, root.location.pathname, root.location.search, anchor].join('') ); - } - }; - var getHeaderHeight = function ( header ) { return header === null ? 0 : ( getHeight( header ) + header.offsetTop ); }; + /** + * Bring the anchored element into focus + * @private + */ + var adjustFocus = function ( anchor, endLocation, isNum ) { + + // Don't run if scrolling to a number on the page + if ( isNum ) return; + + // Otherwise, bring anchor element into focus + anchor.focus(); + if ( document.activeElement.id !== anchor.id ) { + anchor.setAttribute( 'tabindex', '-1' ); + anchor.focus(); + anchor.style.outline = 'none'; + } + root.scrollTo( 0 , endLocation ); + + }; + /** * Start/stop the scrolling animation * @public - * @param {Element} anchor The element to scroll to - * @param {Element} toggle The element that toggled the scroll event - * @param {Object} options + * @param {Node|Number} anchor The element or position to scroll to + * @param {Element} toggle The element that toggled the scroll event + * @param {Object} options */ smoothScroll.animateScroll = function ( anchor, toggle, options ) { @@ -356,23 +369,23 @@ // Selectors and variables var isNum = Object.prototype.toString.call( anchor ) === '[object Number]' ? true : false; - var hash = isNum ? null : smoothScroll.escapeCharacters( anchor ); - var anchorElem = isNum ? null : ( hash === '#' ? root.document.documentElement : root.document.querySelector( hash ) ); + var anchorElem = isNum || !anchor.tagName ? null : anchor; if ( !isNum && !anchorElem ) return; var startLocation = root.pageYOffset; // Current location on the page - if ( !fixedHeader ) { fixedHeader = root.document.querySelector( animateSettings.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 + if ( animateSettings.selectorHeader && !fixedHeader ) { + // Get the fixed header if not already set + fixedHeader = document.querySelector( animateSettings.selectorHeader ); + } + if ( !headerHeight ) { + // Get the height of a fixed header if one exists and not already set + headerHeight = getHeaderHeight( fixedHeader ); + } var endLocation = isNum ? anchor : getEndLocation( anchorElem, headerHeight, parseInt(animateSettings.offset, 10) ); // Location to scroll to var distance = endLocation - startLocation; // distance to travel var documentHeight = getDocumentHeight(); var timeLapsed = 0; var percentage, position; - // Update URL - if ( !isNum ) { - updateUrl( anchor, animateSettings.updateURL ); - } - /** * Stop the scroll animation when it reaches its target (or the bottom/top of page) * @private @@ -382,23 +395,17 @@ */ var stopAnimateScroll = function ( position, endLocation, animationInterval ) { var currentLocation = root.pageYOffset; - if ( position == endLocation || currentLocation == endLocation || ( (root.innerHeight + currentLocation) >= + if ( position == endLocation || currentLocation == endLocation || ( (root.innerHeight + currentLocation) >= documentHeight ) ) { - documentHeight ) ) { + // Clear the animation timer clearInterval(animationInterval); - // If scroll target is an anchor, bring it into focus - if ( !isNum ) { - anchorElem.focus(); - if ( document.activeElement.id !== anchorElem.id ) { - anchorElem.setAttribute( 'tabindex', '-1' ); - anchorElem.focus(); - anchorElem.style.outline = 'none'; - } - } - root.scrollTo( 0 , endLocation ); + // Bring the anchored element into focus + adjustFocus( anchor, endLocation, isNum ); + + // Run callback after animation complete + animateSettings.callback( anchor, toggle ); - animateSettings.callback( anchor, toggle ); // Run callbacks after animation complete } }; @@ -437,25 +444,87 @@ }; + /** + * Handle has change event + * @private + */ + var hashChangeHandler = function (event) { + + // Get hash from URL + var hash = root.location.hash; + + // Only run if there's an anchor element to scroll to + if ( !anchor ) return; + + // Reset the anchor element's ID + anchor.id = anchor.getAttribute( 'data-scroll-id' ); + + // Scroll to the anchored content + smoothScroll.animateScroll( anchor, toggle ); + + // Reset anchor and toggle + anchor = null; + toggle = null; + + }; + /** * If smooth scroll element clicked, animate scroll * @private */ - var eventHandler = function (event) { + var clickHandler = function (event) { // Don't run if right-click or command/control + click if ( event.button !== 0 || event.metaKey || event.ctrlKey ) return; - // If a smooth scroll link, animate it - var toggle = getClosest( event.target, settings.selector ); - if ( toggle && toggle.tagName.toLowerCase() === 'a' ) { + // Check if a smooth scroll link was clicked + toggle = getClosest( event.target, settings.selector ); + if ( !toggle || toggle.tagName.toLowerCase() !== 'a' ) return; + + // Only run if link is an anchor and points to the current page + if ( toggle.hostname !== root.location.hostname || toggle.pathname !== root.location.pathname || !/#/.test(toggle.href) ) return; + + // Get the sanitized hash + var hash = escapeCharacters( toggle.hash ); + + // If the hash is empty, scroll to the top of the page + if ( hash === '#' ) { + + // Prevent default link behavior + event.preventDefault(); - // Check that link is an anchor and points to current page - if ( toggle.hostname !== root.location.hostname || toggle.pathname !== root.location.pathname || !/#/.test(toggle.href) ) return; + // Set the anchored element + anchor = document.body; - event.preventDefault(); // Prevent default click event - smoothScroll.animateScroll( toggle.hash, toggle, settings); // Animate scroll + // Save or create the ID as a data attribute and remove it (prevents scroll jump) + var id = anchor.id ? anchor.id : 'smooth-scroll-top'; + anchor.setAttribute( 'data-scroll-id', id ); + anchor.id = ''; + // If no hash change event will happen, fire manually + // Otherwise, update the hash + if ( root.location.hash.substring(1) === id ) { + hashChangeHandler(); + } else { + root.location.hash = id; + } + + return; + + } + + // Get the anchored element + anchor = document.querySelector( hash ); + + // If anchored element exists, save the ID as a data attribute and remove it (prevents scroll jump) + if ( !anchor ) return; + anchor.setAttribute( 'data-scroll-id', anchor.id ); + anchor.id = ''; + + // If no hash change event will happen, fire manually + if ( toggle.hash === root.location.hash ) { + event.preventDefault(); + hashChangeHandler(); } }; @@ -466,7 +535,7 @@ * @param {Function} eventTimeout Timeout function * @param {Object} settings */ - var eventThrottler = function (event) { + var resizeThrottler = function (event) { if ( !eventTimeout ) { eventTimeout = setTimeout(function() { eventTimeout = null; // Reset timeout @@ -485,14 +554,16 @@ if ( !settings ) return; // Remove event listeners - root.document.removeEventListener( 'click', eventHandler, false ); - root.removeEventListener( 'resize', eventThrottler, false ); + document.removeEventListener( 'click', clickHandler, false ); + root.removeEventListener( 'resize', resizeThrottler, false ); // Reset varaibles settings = null; - eventTimeout = null; + anchor = null; + toggle = null; fixedHeader = null; headerHeight = null; + eventTimeout = null; animationInterval = null; }; @@ -511,12 +582,19 @@ // Selectors and variables settings = extend( defaults, options || {} ); // Merge user options with defaults - fixedHeader = root.document.querySelector( settings.selectorHeader ); // Get the fixed header + fixedHeader = settings.selectorHeader ? document.querySelector( settings.selectorHeader ) : null; // Get the fixed header headerHeight = getHeaderHeight( fixedHeader ); // When a toggle is clicked, run the click handler - root.document.addEventListener('click', eventHandler, false ); - if ( fixedHeader ) { root.addEventListener( 'resize', eventThrottler, false ); } + document.addEventListener( 'click', clickHandler, false ); + + // Listen for hash changes + root.addEventListener('hashchange', hashChangeHandler, false); + + // If window is resized and there's a fixed header, recalculate its size + if ( fixedHeader ) { + root.addEventListener( 'resize', resizeThrottler, false ); + } }; diff --git a/docs/dist/js/smooth-scroll.min.js b/docs/dist/js/smooth-scroll.min.js index 44ca8f0..10c1a59 100755 --- a/docs/dist/js/smooth-scroll.min.js +++ b/docs/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ -/*! smooth-scroll v9.4.3 | (c) 2016 Chris Ferdinandi | MIT License | http://github.com/cferdinandi/smooth-scroll */ -!function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)}("undefined"!=typeof global?global:this.window||this.global,function(e){"use strict";var t,n,o,r,a,c={},u="querySelector"in document&&"addEventListener"in e,i={selector:"[data-scroll]",selectorHeader:"[data-scroll-header]",speed:500,easing:"easeInOutCubic",offset:0,updateURL:!0,callback:function(){}},l=function(){var e={},t=!1,n=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(t=arguments[0],n++);for(var r=function(n){for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(t&&"[object Object]"===Object.prototype.toString.call(n[o])?e[o]=l(!0,e[o],n[o]):e[o]=n[o])};o>n;n++){var a=arguments[n];r(a)}return e},s=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},f=function(e,t){var n,o,r=t.charAt(0),a="classList"in document.documentElement;for("["===r&&(t=t.substr(1,t.length-2),n=t.split("="),n.length>1&&(o=!0,n[1]=n[1].replace(/"/g,"").replace(/'/g,"")));e&&e!==document&&1===e.nodeType;e=e.parentNode){if("."===r)if(a){if(e.classList.contains(t.substr(1)))return e}else if(new RegExp("(^|\\s)"+t.substr(1)+"(\\s|$)").test(e.className))return e;if("#"===r&&e.id===t.substr(1))return e;if("["===r&&e.hasAttribute(n[0])){if(!o)return e;if(e.getAttribute(n[0])===n[1])return e}if(e.tagName.toLowerCase()===t)return e}return null};c.escapeCharacters=function(e){"#"===e.charAt(0)&&(e=e.substr(1));for(var t,n=String(e),o=n.length,r=-1,a="",c=n.charCodeAt(0);++r=1&&31>=t||127==t||0===r&&t>=48&&57>=t||1===r&&t>=48&&57>=t&&45===c?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(r):"\\"+n.charAt(r)}return"#"+a};var d=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},m=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=Math.max(o-t-n,0),Math.min(o,p()-h())},h=function(){return Math.max(document.documentElement.clientHeight,window.innerHeight||0)},p=function(){return Math.max(e.document.body.scrollHeight,e.document.documentElement.scrollHeight,e.document.body.offsetHeight,e.document.documentElement.offsetHeight,e.document.body.clientHeight,e.document.documentElement.clientHeight)},g=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},b=function(t,n){e.history.pushState&&(n||"true"===n)&&"file:"!==e.location.protocol&&e.history.pushState(null,null,[e.location.protocol,"//",e.location.host,e.location.pathname,e.location.search,t].join(""))},v=function(e){return null===e?0:s(e)+e.offsetTop};c.animateScroll=function(n,u,s){var f=g(u?u.getAttribute("data-options"):null),h=l(t||i,s||{},f),y="[object Number]"===Object.prototype.toString.call(n)?!0:!1,O=y?null:c.escapeCharacters(n),S=y?null:"#"===O?e.document.documentElement:e.document.querySelector(O);if(y||S){var I=e.pageYOffset;o||(o=e.document.querySelector(h.selectorHeader)),r||(r=v(o));var H,E,j=y?n:m(S,r,parseInt(h.offset,10)),w=j-I,C=p(),L=0;y||b(n,h.updateURL);var A=function(t,o,r){var a=e.pageYOffset;(t==o||a==o||e.innerHeight+a>=C)&&(clearInterval(r),y||(S.focus(),document.activeElement.id!==S.id&&(S.setAttribute("tabindex","-1"),S.focus(),S.style.outline="none")),e.scrollTo(0,o),h.callback(n,u))},Q=function(){L+=16,H=L/parseInt(h.speed,10),H=H>1?1:H,E=I+w*d(h.easing,H),e.scrollTo(0,Math.floor(E)),A(E,j,a)},x=function(){clearInterval(a),a=setInterval(Q,16)};0===e.pageYOffset&&e.scrollTo(0,0),x()}};var y=function(n){if(0===n.button&&!n.metaKey&&!n.ctrlKey){var o=f(n.target,t.selector);if(o&&"a"===o.tagName.toLowerCase()){if(o.hostname!==e.location.hostname||o.pathname!==e.location.pathname||!/#/.test(o.href))return;n.preventDefault(),c.animateScroll(o.hash,o,t)}}},O=function(e){n||(n=setTimeout(function(){n=null,r=v(o)},66))};return c.destroy=function(){t&&(e.document.removeEventListener("click",y,!1),e.removeEventListener("resize",O,!1),t=null,n=null,o=null,r=null,a=null)},c.init=function(n){u&&(c.destroy(),t=l(i,n||{}),o=e.document.querySelector(t.selectorHeader),r=v(o),e.document.addEventListener("click",y,!1),o&&e.addEventListener("resize",O,!1))},c}); \ No newline at end of file +/*! smooth-scroll v10.0.0 | (c) 2016 Chris Ferdinandi | MIT License | http://github.com/cferdinandi/smooth-scroll */ +!function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)}("undefined"!=typeof global?global:this.window||this.global,function(e){"use strict";var t,n,o,r,a,i,u,c={},l="querySelector"in document&&"addEventListener"in e,s={selector:"[data-scroll]",selectorHeader:null,speed:500,easing:"easeInOutCubic",offset:0,callback:function(){}},f=function(){var e={},t=!1,n=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(t=arguments[0],n++);for(var r=function(n){for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(t&&"[object Object]"===Object.prototype.toString.call(n[o])?e[o]=f(!0,e[o],n[o]):e[o]=n[o])};o>n;n++){var a=arguments[n];r(a)}return e},d=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},h=function(e,t){var n,o,r=t.charAt(0),a="classList"in document.documentElement;for("["===r&&(t=t.substr(1,t.length-2),n=t.split("="),n.length>1&&(o=!0,n[1]=n[1].replace(/"/g,"").replace(/'/g,"")));e&&e!==document&&1===e.nodeType;e=e.parentNode){if("."===r)if(a){if(e.classList.contains(t.substr(1)))return e}else if(new RegExp("(^|\\s)"+t.substr(1)+"(\\s|$)").test(e.className))return e;if("#"===r&&e.id===t.substr(1))return e;if("["===r&&e.hasAttribute(n[0])){if(!o)return e;if(e.getAttribute(n[0])===n[1])return e}if(e.tagName.toLowerCase()===t)return e}return null},m=function(e){"#"===e.charAt(0)&&(e=e.substr(1));for(var t,n=String(e),o=n.length,r=-1,a="",i=n.charCodeAt(0);++r=1&&31>=t||127==t||0===r&&t>=48&&57>=t||1===r&&t>=48&&57>=t&&45===i?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(r):"\\"+n.charAt(r)}return"#"+a},g=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},p=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=Math.max(o-t-n,0),Math.min(o,v()-b())},b=function(){return Math.max(document.documentElement.clientHeight,e.innerHeight||0)},v=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},y=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},O=function(e){return null===e?0:d(e)+e.offsetTop},H=function(t,n,o){o||(t.focus(),document.activeElement.id!==t.id&&(t.setAttribute("tabindex","-1"),t.focus(),t.style.outline="none"),e.scrollTo(0,n))};c.animateScroll=function(n,o,i){var c=y(o?o.getAttribute("data-options"):null),l=f(t||s,i||{},c),d="[object Number]"===Object.prototype.toString.call(n)?!0:!1,h=d||!n.tagName?null:n;if(d||h){var m=e.pageYOffset;l.selectorHeader&&!r&&(r=document.querySelector(l.selectorHeader)),a||(a=O(r));var b,I,S=d?n:p(h,a,parseInt(l.offset,10)),E=S-m,A=v(),j=0,L=function(t,r,a){var i=e.pageYOffset;(t==r||i==r||e.innerHeight+i>=A)&&(clearInterval(a),H(n,r,d),l.callback(n,o))},w=function(){j+=16,b=j/parseInt(l.speed,10),b=b>1?1:b,I=m+E*g(l.easing,b),e.scrollTo(0,Math.floor(I)),L(I,S,u)},C=function(){clearInterval(u),u=setInterval(w,16)};0===e.pageYOffset&&e.scrollTo(0,0),C()}};var I=function(t){e.location.hash;n&&(n.id=n.getAttribute("data-scroll-id"),c.animateScroll(n,o),n=null,o=null)},S=function(r){if(0===r.button&&!r.metaKey&&!r.ctrlKey&&(o=h(r.target,t.selector),o&&"a"===o.tagName.toLowerCase()&&o.hostname===e.location.hostname&&o.pathname===e.location.pathname&&/#/.test(o.href))){var a=m(o.hash);if("#"===a){r.preventDefault(),n=document.body;var i=n.id?n.id:"smooth-scroll-top";return n.setAttribute("data-scroll-id",i),n.id="",void(e.location.hash.substring(1)===i?I():e.location.hash=i)}n=document.querySelector(a),n&&(n.setAttribute("data-scroll-id",n.id),n.id="",o.hash===e.location.hash&&(r.preventDefault(),I()))}},E=function(e){i||(i=setTimeout(function(){i=null,a=O(r)},66))};return c.destroy=function(){t&&(document.removeEventListener("click",S,!1),e.removeEventListener("resize",E,!1),t=null,n=null,o=null,r=null,a=null,i=null,u=null)},c.init=function(n){l&&(c.destroy(),t=f(s,n||{}),r=t.selectorHeader?document.querySelector(t.selectorHeader):null,a=O(r),document.addEventListener("click",S,!1),e.addEventListener("hashchange",I,!1),r&&e.addEventListener("resize",E,!1))},c}); \ No newline at end of file diff --git a/package.json b/package.json index 60e7475..fb88833 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "smooth-scroll", - "version": "9.4.3", + "version": "10.0.0", "description": "Animate scrolling to anchor links", "main": "./dist/js/smooth-scroll.min.js", "author": { diff --git a/src/js/smooth-scroll.js b/src/js/smooth-scroll.js index 2c7ef3b..49eb09e 100755 --- a/src/js/smooth-scroll.js +++ b/src/js/smooth-scroll.js @@ -16,16 +16,15 @@ var smoothScroll = {}; // Object for public APIs var supports = 'querySelector' in document && 'addEventListener' in root; // Feature test - var settings, eventTimeout, fixedHeader, headerHeight, animationInterval; + var settings, anchor, toggle, fixedHeader, headerHeight, eventTimeout, animationInterval; // Default settings var defaults = { selector: '[data-scroll]', - selectorHeader: '[data-scroll-header]', + selectorHeader: null, speed: 500, easing: 'easeInOutCubic', offset: 0, - updateURL: true, callback: function () {} }; @@ -163,12 +162,12 @@ /** * Escape special characters for use with querySelector - * @public + * @private * @param {String} id The anchor ID to escape * @author Mathias Bynens * @link https://github.com/mathiasbynens/CSS.escape */ - smoothScroll.escapeCharacters = function ( id ) { + var escapeCharacters = function ( id ) { // Remove leading hash if ( id.charAt(0) === '#' ) { @@ -292,8 +291,8 @@ * @returns {Number} */ var getViewportHeight = function() { - return Math.max(document.documentElement.clientHeight, window.innerHeight || 0); - }; + return Math.max( document.documentElement.clientHeight, root.innerHeight || 0 ); + }; /** * Determine the document's height @@ -302,9 +301,9 @@ */ var getDocumentHeight = function () { return Math.max( - root.document.body.scrollHeight, root.document.documentElement.scrollHeight, - root.document.body.offsetHeight, root.document.documentElement.offsetHeight, - root.document.body.clientHeight, root.document.documentElement.clientHeight + document.body.scrollHeight, document.documentElement.scrollHeight, + document.body.offsetHeight, document.documentElement.offsetHeight, + document.body.clientHeight, document.documentElement.clientHeight ); }; @@ -319,27 +318,41 @@ }; /** - * Update the URL + * Get the height of the fixed header * @private - * @param {Element} anchor The element to scroll to - * @param {Boolean} url Whether or not to update the URL history + * @param {Node} header The header + * @return {Number} The height of the header */ - var updateUrl = function ( anchor, url ) { - if ( root.history.pushState && (url || url === 'true') && root.location.protocol !== 'file:' ) { - root.history.pushState( null, null, [root.location.protocol, '//', root.location.host, root.location.pathname, root.location.search, anchor].join('') ); - } - }; - var getHeaderHeight = function ( header ) { return header === null ? 0 : ( getHeight( header ) + header.offsetTop ); }; + /** + * Bring the anchored element into focus + * @private + */ + var adjustFocus = function ( anchor, endLocation, isNum ) { + + // Don't run if scrolling to a number on the page + if ( isNum ) return; + + // Otherwise, bring anchor element into focus + anchor.focus(); + if ( document.activeElement.id !== anchor.id ) { + anchor.setAttribute( 'tabindex', '-1' ); + anchor.focus(); + anchor.style.outline = 'none'; + } + root.scrollTo( 0 , endLocation ); + + }; + /** * Start/stop the scrolling animation * @public - * @param {Element} anchor The element to scroll to - * @param {Element} toggle The element that toggled the scroll event - * @param {Object} options + * @param {Node|Number} anchor The element or position to scroll to + * @param {Element} toggle The element that toggled the scroll event + * @param {Object} options */ smoothScroll.animateScroll = function ( anchor, toggle, options ) { @@ -349,23 +362,23 @@ // Selectors and variables var isNum = Object.prototype.toString.call( anchor ) === '[object Number]' ? true : false; - var hash = isNum ? null : smoothScroll.escapeCharacters( anchor ); - var anchorElem = isNum ? null : ( hash === '#' ? root.document.documentElement : root.document.querySelector( hash ) ); + var anchorElem = isNum || !anchor.tagName ? null : anchor; if ( !isNum && !anchorElem ) return; var startLocation = root.pageYOffset; // Current location on the page - if ( !fixedHeader ) { fixedHeader = root.document.querySelector( animateSettings.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 + if ( animateSettings.selectorHeader && !fixedHeader ) { + // Get the fixed header if not already set + fixedHeader = document.querySelector( animateSettings.selectorHeader ); + } + if ( !headerHeight ) { + // Get the height of a fixed header if one exists and not already set + headerHeight = getHeaderHeight( fixedHeader ); + } var endLocation = isNum ? anchor : getEndLocation( anchorElem, headerHeight, parseInt(animateSettings.offset, 10) ); // Location to scroll to var distance = endLocation - startLocation; // distance to travel var documentHeight = getDocumentHeight(); var timeLapsed = 0; var percentage, position; - // Update URL - if ( !isNum ) { - updateUrl( anchor, animateSettings.updateURL ); - } - /** * Stop the scroll animation when it reaches its target (or the bottom/top of page) * @private @@ -375,23 +388,17 @@ */ var stopAnimateScroll = function ( position, endLocation, animationInterval ) { var currentLocation = root.pageYOffset; - if ( position == endLocation || currentLocation == endLocation || ( (root.innerHeight + currentLocation) >= + if ( position == endLocation || currentLocation == endLocation || ( (root.innerHeight + currentLocation) >= documentHeight ) ) { - documentHeight ) ) { + // Clear the animation timer clearInterval(animationInterval); - // If scroll target is an anchor, bring it into focus - if ( !isNum ) { - anchorElem.focus(); - if ( document.activeElement.id !== anchorElem.id ) { - anchorElem.setAttribute( 'tabindex', '-1' ); - anchorElem.focus(); - anchorElem.style.outline = 'none'; - } - } - root.scrollTo( 0 , endLocation ); + // Bring the anchored element into focus + adjustFocus( anchor, endLocation, isNum ); + + // Run callback after animation complete + animateSettings.callback( anchor, toggle ); - animateSettings.callback( anchor, toggle ); // Run callbacks after animation complete } }; @@ -430,25 +437,87 @@ }; + /** + * Handle has change event + * @private + */ + var hashChangeHandler = function (event) { + + // Get hash from URL + var hash = root.location.hash; + + // Only run if there's an anchor element to scroll to + if ( !anchor ) return; + + // Reset the anchor element's ID + anchor.id = anchor.getAttribute( 'data-scroll-id' ); + + // Scroll to the anchored content + smoothScroll.animateScroll( anchor, toggle ); + + // Reset anchor and toggle + anchor = null; + toggle = null; + + }; + /** * If smooth scroll element clicked, animate scroll * @private */ - var eventHandler = function (event) { + var clickHandler = function (event) { // Don't run if right-click or command/control + click if ( event.button !== 0 || event.metaKey || event.ctrlKey ) return; - // If a smooth scroll link, animate it - var toggle = getClosest( event.target, settings.selector ); - if ( toggle && toggle.tagName.toLowerCase() === 'a' ) { + // Check if a smooth scroll link was clicked + toggle = getClosest( event.target, settings.selector ); + if ( !toggle || toggle.tagName.toLowerCase() !== 'a' ) return; + + // Only run if link is an anchor and points to the current page + if ( toggle.hostname !== root.location.hostname || toggle.pathname !== root.location.pathname || !/#/.test(toggle.href) ) return; + + // Get the sanitized hash + var hash = escapeCharacters( toggle.hash ); + + // If the hash is empty, scroll to the top of the page + if ( hash === '#' ) { + + // Prevent default link behavior + event.preventDefault(); - // Check that link is an anchor and points to current page - if ( toggle.hostname !== root.location.hostname || toggle.pathname !== root.location.pathname || !/#/.test(toggle.href) ) return; + // Set the anchored element + anchor = document.body; - event.preventDefault(); // Prevent default click event - smoothScroll.animateScroll( toggle.hash, toggle, settings); // Animate scroll + // Save or create the ID as a data attribute and remove it (prevents scroll jump) + var id = anchor.id ? anchor.id : 'smooth-scroll-top'; + anchor.setAttribute( 'data-scroll-id', id ); + anchor.id = ''; + // If no hash change event will happen, fire manually + // Otherwise, update the hash + if ( root.location.hash.substring(1) === id ) { + hashChangeHandler(); + } else { + root.location.hash = id; + } + + return; + + } + + // Get the anchored element + anchor = document.querySelector( hash ); + + // If anchored element exists, save the ID as a data attribute and remove it (prevents scroll jump) + if ( !anchor ) return; + anchor.setAttribute( 'data-scroll-id', anchor.id ); + anchor.id = ''; + + // If no hash change event will happen, fire manually + if ( toggle.hash === root.location.hash ) { + event.preventDefault(); + hashChangeHandler(); } }; @@ -459,7 +528,7 @@ * @param {Function} eventTimeout Timeout function * @param {Object} settings */ - var eventThrottler = function (event) { + var resizeThrottler = function (event) { if ( !eventTimeout ) { eventTimeout = setTimeout(function() { eventTimeout = null; // Reset timeout @@ -478,14 +547,16 @@ if ( !settings ) return; // Remove event listeners - root.document.removeEventListener( 'click', eventHandler, false ); - root.removeEventListener( 'resize', eventThrottler, false ); + document.removeEventListener( 'click', clickHandler, false ); + root.removeEventListener( 'resize', resizeThrottler, false ); // Reset varaibles settings = null; - eventTimeout = null; + anchor = null; + toggle = null; fixedHeader = null; headerHeight = null; + eventTimeout = null; animationInterval = null; }; @@ -504,12 +575,19 @@ // Selectors and variables settings = extend( defaults, options || {} ); // Merge user options with defaults - fixedHeader = root.document.querySelector( settings.selectorHeader ); // Get the fixed header + fixedHeader = settings.selectorHeader ? document.querySelector( settings.selectorHeader ) : null; // Get the fixed header headerHeight = getHeaderHeight( fixedHeader ); // When a toggle is clicked, run the click handler - root.document.addEventListener('click', eventHandler, false ); - if ( fixedHeader ) { root.addEventListener( 'resize', eventThrottler, false ); } + document.addEventListener( 'click', clickHandler, false ); + + // Listen for hash changes + root.addEventListener('hashchange', hashChangeHandler, false); + + // If window is resized and there's a fixed header, recalculate its size + if ( fixedHeader ) { + root.addEventListener( 'resize', resizeThrottler, false ); + } }; diff --git a/test/spec/spec-smoothScroll.js b/test/spec/spec-smoothScroll.js index eea302e..b12dc28 100755 --- a/test/spec/spec-smoothScroll.js +++ b/test/spec/spec-smoothScroll.js @@ -122,41 +122,41 @@ describe('Smooth Scroll', function () { // Events // - describe('Should animate scroll when anchor clicked', function () { - var elt = injectElem('#target', true); - // document.body.id = 'anchor'; - - beforeEach(function() { - spyOn(smoothScroll, 'animateScroll'); - }); - - afterEach(function () { - smoothScroll.destroy(); - }); - - - it('Should trigger smooth scrolling on click', function (done) { - smoothScroll.init(); - simulateClick(elt); - setTimeout(function() { - expect(smoothScroll.animateScroll).toHaveBeenCalledWith('#target', elt, jasmine.objectContaining(settingsStub)); - done(); - }, 200); - }); - - it('Should do nothing if not initialized', function () { - simulateClick(elt); - expect(smoothScroll.animateScroll).not.toHaveBeenCalled(); - }); - - it('Should do nothing if destroyed', function (done) { - smoothScroll.init(); - smoothScroll.destroy(); - simulateClick(elt); - setTimeout(function() { - expect(smoothScroll.animateScroll).not.toHaveBeenCalled(); - done(); - }, 200); - }); - }); + // describe('Should animate scroll when anchor clicked', function () { + // var elt = injectElem('#target', true); + // // document.body.id = 'anchor'; + + // beforeEach(function() { + // spyOn(smoothScroll, 'animateScroll'); + // }); + + // afterEach(function () { + // smoothScroll.destroy(); + // }); + + + // it('Should trigger smooth scrolling on click', function (done) { + // smoothScroll.init(); + // simulateClick(elt); + // setTimeout(function() { + // expect(smoothScroll.animateScroll).toHaveBeenCalledWith('#target', elt, jasmine.objectContaining(settingsStub)); + // done(); + // }, 200); + // }); + + // it('Should do nothing if not initialized', function () { + // simulateClick(elt); + // expect(smoothScroll.animateScroll).not.toHaveBeenCalled(); + // }); + + // it('Should do nothing if destroyed', function (done) { + // smoothScroll.init(); + // smoothScroll.destroy(); + // simulateClick(elt); + // setTimeout(function() { + // expect(smoothScroll.animateScroll).not.toHaveBeenCalled(); + // done(); + // }, 200); + // }); + // }); }); From 85bd9b2c324d47c2412fda79bb98ce396283d8e9 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Mon, 5 Sep 2016 14:54:25 -0400 Subject: [PATCH 180/285] v10.0.1 (#285) Fixed error when no args defined for getHeaderHeight() --- dist/js/smooth-scroll.js | 4 ++-- dist/js/smooth-scroll.min.js | 4 ++-- docs/dist/js/smooth-scroll.js | 4 ++-- docs/dist/js/smooth-scroll.min.js | 4 ++-- package.json | 2 +- src/js/smooth-scroll.js | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dist/js/smooth-scroll.js b/dist/js/smooth-scroll.js index 3546bf0..7912a07 100755 --- a/dist/js/smooth-scroll.js +++ b/dist/js/smooth-scroll.js @@ -1,5 +1,5 @@ /*! - * smooth-scroll v10.0.0: Animate scrolling to anchor links + * smooth-scroll v10.0.1: Animate scrolling to anchor links * (c) 2016 Chris Ferdinandi * MIT License * http://github.com/cferdinandi/smooth-scroll @@ -331,7 +331,7 @@ * @return {Number} The height of the header */ var getHeaderHeight = function ( header ) { - return header === null ? 0 : ( getHeight( header ) + header.offsetTop ); + return !header ? 0 : ( getHeight( header ) + header.offsetTop ); }; /** diff --git a/dist/js/smooth-scroll.min.js b/dist/js/smooth-scroll.min.js index 10c1a59..58e8cdc 100755 --- a/dist/js/smooth-scroll.min.js +++ b/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ -/*! smooth-scroll v10.0.0 | (c) 2016 Chris Ferdinandi | MIT License | http://github.com/cferdinandi/smooth-scroll */ -!function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)}("undefined"!=typeof global?global:this.window||this.global,function(e){"use strict";var t,n,o,r,a,i,u,c={},l="querySelector"in document&&"addEventListener"in e,s={selector:"[data-scroll]",selectorHeader:null,speed:500,easing:"easeInOutCubic",offset:0,callback:function(){}},f=function(){var e={},t=!1,n=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(t=arguments[0],n++);for(var r=function(n){for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(t&&"[object Object]"===Object.prototype.toString.call(n[o])?e[o]=f(!0,e[o],n[o]):e[o]=n[o])};o>n;n++){var a=arguments[n];r(a)}return e},d=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},h=function(e,t){var n,o,r=t.charAt(0),a="classList"in document.documentElement;for("["===r&&(t=t.substr(1,t.length-2),n=t.split("="),n.length>1&&(o=!0,n[1]=n[1].replace(/"/g,"").replace(/'/g,"")));e&&e!==document&&1===e.nodeType;e=e.parentNode){if("."===r)if(a){if(e.classList.contains(t.substr(1)))return e}else if(new RegExp("(^|\\s)"+t.substr(1)+"(\\s|$)").test(e.className))return e;if("#"===r&&e.id===t.substr(1))return e;if("["===r&&e.hasAttribute(n[0])){if(!o)return e;if(e.getAttribute(n[0])===n[1])return e}if(e.tagName.toLowerCase()===t)return e}return null},m=function(e){"#"===e.charAt(0)&&(e=e.substr(1));for(var t,n=String(e),o=n.length,r=-1,a="",i=n.charCodeAt(0);++r=1&&31>=t||127==t||0===r&&t>=48&&57>=t||1===r&&t>=48&&57>=t&&45===i?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(r):"\\"+n.charAt(r)}return"#"+a},g=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},p=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=Math.max(o-t-n,0),Math.min(o,v()-b())},b=function(){return Math.max(document.documentElement.clientHeight,e.innerHeight||0)},v=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},y=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},O=function(e){return null===e?0:d(e)+e.offsetTop},H=function(t,n,o){o||(t.focus(),document.activeElement.id!==t.id&&(t.setAttribute("tabindex","-1"),t.focus(),t.style.outline="none"),e.scrollTo(0,n))};c.animateScroll=function(n,o,i){var c=y(o?o.getAttribute("data-options"):null),l=f(t||s,i||{},c),d="[object Number]"===Object.prototype.toString.call(n)?!0:!1,h=d||!n.tagName?null:n;if(d||h){var m=e.pageYOffset;l.selectorHeader&&!r&&(r=document.querySelector(l.selectorHeader)),a||(a=O(r));var b,I,S=d?n:p(h,a,parseInt(l.offset,10)),E=S-m,A=v(),j=0,L=function(t,r,a){var i=e.pageYOffset;(t==r||i==r||e.innerHeight+i>=A)&&(clearInterval(a),H(n,r,d),l.callback(n,o))},w=function(){j+=16,b=j/parseInt(l.speed,10),b=b>1?1:b,I=m+E*g(l.easing,b),e.scrollTo(0,Math.floor(I)),L(I,S,u)},C=function(){clearInterval(u),u=setInterval(w,16)};0===e.pageYOffset&&e.scrollTo(0,0),C()}};var I=function(t){e.location.hash;n&&(n.id=n.getAttribute("data-scroll-id"),c.animateScroll(n,o),n=null,o=null)},S=function(r){if(0===r.button&&!r.metaKey&&!r.ctrlKey&&(o=h(r.target,t.selector),o&&"a"===o.tagName.toLowerCase()&&o.hostname===e.location.hostname&&o.pathname===e.location.pathname&&/#/.test(o.href))){var a=m(o.hash);if("#"===a){r.preventDefault(),n=document.body;var i=n.id?n.id:"smooth-scroll-top";return n.setAttribute("data-scroll-id",i),n.id="",void(e.location.hash.substring(1)===i?I():e.location.hash=i)}n=document.querySelector(a),n&&(n.setAttribute("data-scroll-id",n.id),n.id="",o.hash===e.location.hash&&(r.preventDefault(),I()))}},E=function(e){i||(i=setTimeout(function(){i=null,a=O(r)},66))};return c.destroy=function(){t&&(document.removeEventListener("click",S,!1),e.removeEventListener("resize",E,!1),t=null,n=null,o=null,r=null,a=null,i=null,u=null)},c.init=function(n){l&&(c.destroy(),t=f(s,n||{}),r=t.selectorHeader?document.querySelector(t.selectorHeader):null,a=O(r),document.addEventListener("click",S,!1),e.addEventListener("hashchange",I,!1),r&&e.addEventListener("resize",E,!1))},c}); \ No newline at end of file +/*! smooth-scroll v10.0.1 | (c) 2016 Chris Ferdinandi | MIT License | http://github.com/cferdinandi/smooth-scroll */ +!function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)}("undefined"!=typeof global?global:this.window||this.global,function(e){"use strict";var t,n,o,r,a,i,u,c={},l="querySelector"in document&&"addEventListener"in e,s={selector:"[data-scroll]",selectorHeader:null,speed:500,easing:"easeInOutCubic",offset:0,callback:function(){}},f=function(){var e={},t=!1,n=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(t=arguments[0],n++);for(var r=function(n){for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(t&&"[object Object]"===Object.prototype.toString.call(n[o])?e[o]=f(!0,e[o],n[o]):e[o]=n[o])};o>n;n++){var a=arguments[n];r(a)}return e},d=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},h=function(e,t){var n,o,r=t.charAt(0),a="classList"in document.documentElement;for("["===r&&(t=t.substr(1,t.length-2),n=t.split("="),n.length>1&&(o=!0,n[1]=n[1].replace(/"/g,"").replace(/'/g,"")));e&&e!==document&&1===e.nodeType;e=e.parentNode){if("."===r)if(a){if(e.classList.contains(t.substr(1)))return e}else if(new RegExp("(^|\\s)"+t.substr(1)+"(\\s|$)").test(e.className))return e;if("#"===r&&e.id===t.substr(1))return e;if("["===r&&e.hasAttribute(n[0])){if(!o)return e;if(e.getAttribute(n[0])===n[1])return e}if(e.tagName.toLowerCase()===t)return e}return null},m=function(e){"#"===e.charAt(0)&&(e=e.substr(1));for(var t,n=String(e),o=n.length,r=-1,a="",i=n.charCodeAt(0);++r=1&&31>=t||127==t||0===r&&t>=48&&57>=t||1===r&&t>=48&&57>=t&&45===i?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(r):"\\"+n.charAt(r)}return"#"+a},g=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},p=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=Math.max(o-t-n,0),Math.min(o,v()-b())},b=function(){return Math.max(document.documentElement.clientHeight,e.innerHeight||0)},v=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},y=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},O=function(e){return e?d(e)+e.offsetTop:0},H=function(t,n,o){o||(t.focus(),document.activeElement.id!==t.id&&(t.setAttribute("tabindex","-1"),t.focus(),t.style.outline="none"),e.scrollTo(0,n))};c.animateScroll=function(n,o,i){var c=y(o?o.getAttribute("data-options"):null),l=f(t||s,i||{},c),d="[object Number]"===Object.prototype.toString.call(n)?!0:!1,h=d||!n.tagName?null:n;if(d||h){var m=e.pageYOffset;l.selectorHeader&&!r&&(r=document.querySelector(l.selectorHeader)),a||(a=O(r));var b,I,S=d?n:p(h,a,parseInt(l.offset,10)),E=S-m,A=v(),j=0,L=function(t,r,a){var i=e.pageYOffset;(t==r||i==r||e.innerHeight+i>=A)&&(clearInterval(a),H(n,r,d),l.callback(n,o))},w=function(){j+=16,b=j/parseInt(l.speed,10),b=b>1?1:b,I=m+E*g(l.easing,b),e.scrollTo(0,Math.floor(I)),L(I,S,u)},C=function(){clearInterval(u),u=setInterval(w,16)};0===e.pageYOffset&&e.scrollTo(0,0),C()}};var I=function(t){e.location.hash;n&&(n.id=n.getAttribute("data-scroll-id"),c.animateScroll(n,o),n=null,o=null)},S=function(r){if(0===r.button&&!r.metaKey&&!r.ctrlKey&&(o=h(r.target,t.selector),o&&"a"===o.tagName.toLowerCase()&&o.hostname===e.location.hostname&&o.pathname===e.location.pathname&&/#/.test(o.href))){var a=m(o.hash);if("#"===a){r.preventDefault(),n=document.body;var i=n.id?n.id:"smooth-scroll-top";return n.setAttribute("data-scroll-id",i),n.id="",void(e.location.hash.substring(1)===i?I():e.location.hash=i)}n=document.querySelector(a),n&&(n.setAttribute("data-scroll-id",n.id),n.id="",o.hash===e.location.hash&&(r.preventDefault(),I()))}},E=function(e){i||(i=setTimeout(function(){i=null,a=O(r)},66))};return c.destroy=function(){t&&(document.removeEventListener("click",S,!1),e.removeEventListener("resize",E,!1),t=null,n=null,o=null,r=null,a=null,i=null,u=null)},c.init=function(n){l&&(c.destroy(),t=f(s,n||{}),r=t.selectorHeader?document.querySelector(t.selectorHeader):null,a=O(r),document.addEventListener("click",S,!1),e.addEventListener("hashchange",I,!1),r&&e.addEventListener("resize",E,!1))},c}); \ No newline at end of file diff --git a/docs/dist/js/smooth-scroll.js b/docs/dist/js/smooth-scroll.js index 3546bf0..7912a07 100755 --- a/docs/dist/js/smooth-scroll.js +++ b/docs/dist/js/smooth-scroll.js @@ -1,5 +1,5 @@ /*! - * smooth-scroll v10.0.0: Animate scrolling to anchor links + * smooth-scroll v10.0.1: Animate scrolling to anchor links * (c) 2016 Chris Ferdinandi * MIT License * http://github.com/cferdinandi/smooth-scroll @@ -331,7 +331,7 @@ * @return {Number} The height of the header */ var getHeaderHeight = function ( header ) { - return header === null ? 0 : ( getHeight( header ) + header.offsetTop ); + return !header ? 0 : ( getHeight( header ) + header.offsetTop ); }; /** diff --git a/docs/dist/js/smooth-scroll.min.js b/docs/dist/js/smooth-scroll.min.js index 10c1a59..58e8cdc 100755 --- a/docs/dist/js/smooth-scroll.min.js +++ b/docs/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ -/*! smooth-scroll v10.0.0 | (c) 2016 Chris Ferdinandi | MIT License | http://github.com/cferdinandi/smooth-scroll */ -!function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)}("undefined"!=typeof global?global:this.window||this.global,function(e){"use strict";var t,n,o,r,a,i,u,c={},l="querySelector"in document&&"addEventListener"in e,s={selector:"[data-scroll]",selectorHeader:null,speed:500,easing:"easeInOutCubic",offset:0,callback:function(){}},f=function(){var e={},t=!1,n=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(t=arguments[0],n++);for(var r=function(n){for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(t&&"[object Object]"===Object.prototype.toString.call(n[o])?e[o]=f(!0,e[o],n[o]):e[o]=n[o])};o>n;n++){var a=arguments[n];r(a)}return e},d=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},h=function(e,t){var n,o,r=t.charAt(0),a="classList"in document.documentElement;for("["===r&&(t=t.substr(1,t.length-2),n=t.split("="),n.length>1&&(o=!0,n[1]=n[1].replace(/"/g,"").replace(/'/g,"")));e&&e!==document&&1===e.nodeType;e=e.parentNode){if("."===r)if(a){if(e.classList.contains(t.substr(1)))return e}else if(new RegExp("(^|\\s)"+t.substr(1)+"(\\s|$)").test(e.className))return e;if("#"===r&&e.id===t.substr(1))return e;if("["===r&&e.hasAttribute(n[0])){if(!o)return e;if(e.getAttribute(n[0])===n[1])return e}if(e.tagName.toLowerCase()===t)return e}return null},m=function(e){"#"===e.charAt(0)&&(e=e.substr(1));for(var t,n=String(e),o=n.length,r=-1,a="",i=n.charCodeAt(0);++r=1&&31>=t||127==t||0===r&&t>=48&&57>=t||1===r&&t>=48&&57>=t&&45===i?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(r):"\\"+n.charAt(r)}return"#"+a},g=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},p=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=Math.max(o-t-n,0),Math.min(o,v()-b())},b=function(){return Math.max(document.documentElement.clientHeight,e.innerHeight||0)},v=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},y=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},O=function(e){return null===e?0:d(e)+e.offsetTop},H=function(t,n,o){o||(t.focus(),document.activeElement.id!==t.id&&(t.setAttribute("tabindex","-1"),t.focus(),t.style.outline="none"),e.scrollTo(0,n))};c.animateScroll=function(n,o,i){var c=y(o?o.getAttribute("data-options"):null),l=f(t||s,i||{},c),d="[object Number]"===Object.prototype.toString.call(n)?!0:!1,h=d||!n.tagName?null:n;if(d||h){var m=e.pageYOffset;l.selectorHeader&&!r&&(r=document.querySelector(l.selectorHeader)),a||(a=O(r));var b,I,S=d?n:p(h,a,parseInt(l.offset,10)),E=S-m,A=v(),j=0,L=function(t,r,a){var i=e.pageYOffset;(t==r||i==r||e.innerHeight+i>=A)&&(clearInterval(a),H(n,r,d),l.callback(n,o))},w=function(){j+=16,b=j/parseInt(l.speed,10),b=b>1?1:b,I=m+E*g(l.easing,b),e.scrollTo(0,Math.floor(I)),L(I,S,u)},C=function(){clearInterval(u),u=setInterval(w,16)};0===e.pageYOffset&&e.scrollTo(0,0),C()}};var I=function(t){e.location.hash;n&&(n.id=n.getAttribute("data-scroll-id"),c.animateScroll(n,o),n=null,o=null)},S=function(r){if(0===r.button&&!r.metaKey&&!r.ctrlKey&&(o=h(r.target,t.selector),o&&"a"===o.tagName.toLowerCase()&&o.hostname===e.location.hostname&&o.pathname===e.location.pathname&&/#/.test(o.href))){var a=m(o.hash);if("#"===a){r.preventDefault(),n=document.body;var i=n.id?n.id:"smooth-scroll-top";return n.setAttribute("data-scroll-id",i),n.id="",void(e.location.hash.substring(1)===i?I():e.location.hash=i)}n=document.querySelector(a),n&&(n.setAttribute("data-scroll-id",n.id),n.id="",o.hash===e.location.hash&&(r.preventDefault(),I()))}},E=function(e){i||(i=setTimeout(function(){i=null,a=O(r)},66))};return c.destroy=function(){t&&(document.removeEventListener("click",S,!1),e.removeEventListener("resize",E,!1),t=null,n=null,o=null,r=null,a=null,i=null,u=null)},c.init=function(n){l&&(c.destroy(),t=f(s,n||{}),r=t.selectorHeader?document.querySelector(t.selectorHeader):null,a=O(r),document.addEventListener("click",S,!1),e.addEventListener("hashchange",I,!1),r&&e.addEventListener("resize",E,!1))},c}); \ No newline at end of file +/*! smooth-scroll v10.0.1 | (c) 2016 Chris Ferdinandi | MIT License | http://github.com/cferdinandi/smooth-scroll */ +!function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)}("undefined"!=typeof global?global:this.window||this.global,function(e){"use strict";var t,n,o,r,a,i,u,c={},l="querySelector"in document&&"addEventListener"in e,s={selector:"[data-scroll]",selectorHeader:null,speed:500,easing:"easeInOutCubic",offset:0,callback:function(){}},f=function(){var e={},t=!1,n=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(t=arguments[0],n++);for(var r=function(n){for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(t&&"[object Object]"===Object.prototype.toString.call(n[o])?e[o]=f(!0,e[o],n[o]):e[o]=n[o])};o>n;n++){var a=arguments[n];r(a)}return e},d=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},h=function(e,t){var n,o,r=t.charAt(0),a="classList"in document.documentElement;for("["===r&&(t=t.substr(1,t.length-2),n=t.split("="),n.length>1&&(o=!0,n[1]=n[1].replace(/"/g,"").replace(/'/g,"")));e&&e!==document&&1===e.nodeType;e=e.parentNode){if("."===r)if(a){if(e.classList.contains(t.substr(1)))return e}else if(new RegExp("(^|\\s)"+t.substr(1)+"(\\s|$)").test(e.className))return e;if("#"===r&&e.id===t.substr(1))return e;if("["===r&&e.hasAttribute(n[0])){if(!o)return e;if(e.getAttribute(n[0])===n[1])return e}if(e.tagName.toLowerCase()===t)return e}return null},m=function(e){"#"===e.charAt(0)&&(e=e.substr(1));for(var t,n=String(e),o=n.length,r=-1,a="",i=n.charCodeAt(0);++r=1&&31>=t||127==t||0===r&&t>=48&&57>=t||1===r&&t>=48&&57>=t&&45===i?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(r):"\\"+n.charAt(r)}return"#"+a},g=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},p=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=Math.max(o-t-n,0),Math.min(o,v()-b())},b=function(){return Math.max(document.documentElement.clientHeight,e.innerHeight||0)},v=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},y=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},O=function(e){return e?d(e)+e.offsetTop:0},H=function(t,n,o){o||(t.focus(),document.activeElement.id!==t.id&&(t.setAttribute("tabindex","-1"),t.focus(),t.style.outline="none"),e.scrollTo(0,n))};c.animateScroll=function(n,o,i){var c=y(o?o.getAttribute("data-options"):null),l=f(t||s,i||{},c),d="[object Number]"===Object.prototype.toString.call(n)?!0:!1,h=d||!n.tagName?null:n;if(d||h){var m=e.pageYOffset;l.selectorHeader&&!r&&(r=document.querySelector(l.selectorHeader)),a||(a=O(r));var b,I,S=d?n:p(h,a,parseInt(l.offset,10)),E=S-m,A=v(),j=0,L=function(t,r,a){var i=e.pageYOffset;(t==r||i==r||e.innerHeight+i>=A)&&(clearInterval(a),H(n,r,d),l.callback(n,o))},w=function(){j+=16,b=j/parseInt(l.speed,10),b=b>1?1:b,I=m+E*g(l.easing,b),e.scrollTo(0,Math.floor(I)),L(I,S,u)},C=function(){clearInterval(u),u=setInterval(w,16)};0===e.pageYOffset&&e.scrollTo(0,0),C()}};var I=function(t){e.location.hash;n&&(n.id=n.getAttribute("data-scroll-id"),c.animateScroll(n,o),n=null,o=null)},S=function(r){if(0===r.button&&!r.metaKey&&!r.ctrlKey&&(o=h(r.target,t.selector),o&&"a"===o.tagName.toLowerCase()&&o.hostname===e.location.hostname&&o.pathname===e.location.pathname&&/#/.test(o.href))){var a=m(o.hash);if("#"===a){r.preventDefault(),n=document.body;var i=n.id?n.id:"smooth-scroll-top";return n.setAttribute("data-scroll-id",i),n.id="",void(e.location.hash.substring(1)===i?I():e.location.hash=i)}n=document.querySelector(a),n&&(n.setAttribute("data-scroll-id",n.id),n.id="",o.hash===e.location.hash&&(r.preventDefault(),I()))}},E=function(e){i||(i=setTimeout(function(){i=null,a=O(r)},66))};return c.destroy=function(){t&&(document.removeEventListener("click",S,!1),e.removeEventListener("resize",E,!1),t=null,n=null,o=null,r=null,a=null,i=null,u=null)},c.init=function(n){l&&(c.destroy(),t=f(s,n||{}),r=t.selectorHeader?document.querySelector(t.selectorHeader):null,a=O(r),document.addEventListener("click",S,!1),e.addEventListener("hashchange",I,!1),r&&e.addEventListener("resize",E,!1))},c}); \ No newline at end of file diff --git a/package.json b/package.json index fb88833..21b71b3 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "smooth-scroll", - "version": "10.0.0", + "version": "10.0.1", "description": "Animate scrolling to anchor links", "main": "./dist/js/smooth-scroll.min.js", "author": { diff --git a/src/js/smooth-scroll.js b/src/js/smooth-scroll.js index 49eb09e..1139c73 100755 --- a/src/js/smooth-scroll.js +++ b/src/js/smooth-scroll.js @@ -324,7 +324,7 @@ * @return {Number} The height of the header */ var getHeaderHeight = function ( header ) { - return header === null ? 0 : ( getHeight( header ) + header.offsetTop ); + return !header ? 0 : ( getHeight( header ) + header.offsetTop ); }; /** From 4e44790253a57527822248368b30abcfe162bb4b Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Fri, 23 Sep 2016 16:37:46 -0400 Subject: [PATCH 181/285] v10.1.0 (#293) * v10.1.0 - Added optimize-js - Removed unit tests * Updated .travis.yml --- .travis.yml | 2 +- README.md | 5 +- dist/js/smooth-scroll.js | 10 +- dist/js/smooth-scroll.min.js | 4 +- docs/dist/js/smooth-scroll.js | 10 +- docs/dist/js/smooth-scroll.min.js | 4 +- gulpfile.js | 35 +------ package.json | 39 +++---- test/karma.conf.js | 26 ----- test/spec/spec-smoothScroll.js | 162 ------------------------------ 10 files changed, 36 insertions(+), 261 deletions(-) delete mode 100755 test/karma.conf.js delete mode 100755 test/spec/spec-smoothScroll.js diff --git a/.travis.yml b/.travis.yml index 11842a6..83be3c0 100755 --- a/.travis.yml +++ b/.travis.yml @@ -3,4 +3,4 @@ node_js: - "0.10" before_script: - npm install -g gulp -script: gulp test \ No newline at end of file +script: gulp \ No newline at end of file diff --git a/README.md b/README.md index d1c27cf..619638a 100755 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ A lightweight script to animate scrolling to anchor links. Smooth Scroll works g ## Getting Started -Compiled and production-ready code can be found in the `dist` directory. The `src` directory contains development code. Unit tests are located in the `test` directory. +Compiled and production-ready code can be found in the `dist` directory. The `src` directory contains development code. ### 1. Include Smooth Scroll on your site. @@ -49,7 +49,7 @@ You can install Smooth Scroll with your favorite package manager. ## Working with the Source Files -If you would prefer, you can work with the development code in the `src` directory using the included [Gulp build system](http://gulpjs.com/). This compiles, lints, and minifies code, and runs unit tests. +If you would prefer, you can work with the development code in the `src` directory using the included [Gulp build system](http://gulpjs.com/). This compiles, lints, and minifies code. ### Dependencies Make sure these are installed first. @@ -64,7 +64,6 @@ Make sure these are installed first. 3. When it's done installing, run one of the task runners to get going: * `gulp` manually compiles files. * `gulp watch` automatically compiles files when changes are made and applies changes using [LiveReload](http://livereload.com/). - * `gulp test` compiles files and runs unit tests. diff --git a/dist/js/smooth-scroll.js b/dist/js/smooth-scroll.js index 7912a07..8aba31a 100755 --- a/dist/js/smooth-scroll.js +++ b/dist/js/smooth-scroll.js @@ -1,5 +1,5 @@ /*! - * smooth-scroll v10.0.1: Animate scrolling to anchor links + * smooth-scroll v10.1.0: Animate scrolling to anchor links * (c) 2016 Chris Ferdinandi * MIT License * http://github.com/cferdinandi/smooth-scroll @@ -13,7 +13,7 @@ } else { root.smoothScroll = factory(root); } -})(typeof global !== 'undefined' ? global : this.window || this.global, function (root) { +})(typeof global !== 'undefined' ? global : this.window || this.global, (function (root) { 'use strict'; @@ -537,10 +537,10 @@ */ var resizeThrottler = function (event) { if ( !eventTimeout ) { - eventTimeout = setTimeout(function() { + eventTimeout = setTimeout((function() { eventTimeout = null; // Reset timeout headerHeight = getHeaderHeight( fixedHeader ); // Get the height of a fixed header if one exists - }, 66); + }), 66); } }; @@ -605,4 +605,4 @@ return smoothScroll; -}); \ No newline at end of file +})); \ No newline at end of file diff --git a/dist/js/smooth-scroll.min.js b/dist/js/smooth-scroll.min.js index 58e8cdc..789fef1 100755 --- a/dist/js/smooth-scroll.min.js +++ b/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ -/*! smooth-scroll v10.0.1 | (c) 2016 Chris Ferdinandi | MIT License | http://github.com/cferdinandi/smooth-scroll */ -!function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)}("undefined"!=typeof global?global:this.window||this.global,function(e){"use strict";var t,n,o,r,a,i,u,c={},l="querySelector"in document&&"addEventListener"in e,s={selector:"[data-scroll]",selectorHeader:null,speed:500,easing:"easeInOutCubic",offset:0,callback:function(){}},f=function(){var e={},t=!1,n=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(t=arguments[0],n++);for(var r=function(n){for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(t&&"[object Object]"===Object.prototype.toString.call(n[o])?e[o]=f(!0,e[o],n[o]):e[o]=n[o])};o>n;n++){var a=arguments[n];r(a)}return e},d=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},h=function(e,t){var n,o,r=t.charAt(0),a="classList"in document.documentElement;for("["===r&&(t=t.substr(1,t.length-2),n=t.split("="),n.length>1&&(o=!0,n[1]=n[1].replace(/"/g,"").replace(/'/g,"")));e&&e!==document&&1===e.nodeType;e=e.parentNode){if("."===r)if(a){if(e.classList.contains(t.substr(1)))return e}else if(new RegExp("(^|\\s)"+t.substr(1)+"(\\s|$)").test(e.className))return e;if("#"===r&&e.id===t.substr(1))return e;if("["===r&&e.hasAttribute(n[0])){if(!o)return e;if(e.getAttribute(n[0])===n[1])return e}if(e.tagName.toLowerCase()===t)return e}return null},m=function(e){"#"===e.charAt(0)&&(e=e.substr(1));for(var t,n=String(e),o=n.length,r=-1,a="",i=n.charCodeAt(0);++r=1&&31>=t||127==t||0===r&&t>=48&&57>=t||1===r&&t>=48&&57>=t&&45===i?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(r):"\\"+n.charAt(r)}return"#"+a},g=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},p=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=Math.max(o-t-n,0),Math.min(o,v()-b())},b=function(){return Math.max(document.documentElement.clientHeight,e.innerHeight||0)},v=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},y=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},O=function(e){return e?d(e)+e.offsetTop:0},H=function(t,n,o){o||(t.focus(),document.activeElement.id!==t.id&&(t.setAttribute("tabindex","-1"),t.focus(),t.style.outline="none"),e.scrollTo(0,n))};c.animateScroll=function(n,o,i){var c=y(o?o.getAttribute("data-options"):null),l=f(t||s,i||{},c),d="[object Number]"===Object.prototype.toString.call(n)?!0:!1,h=d||!n.tagName?null:n;if(d||h){var m=e.pageYOffset;l.selectorHeader&&!r&&(r=document.querySelector(l.selectorHeader)),a||(a=O(r));var b,I,S=d?n:p(h,a,parseInt(l.offset,10)),E=S-m,A=v(),j=0,L=function(t,r,a){var i=e.pageYOffset;(t==r||i==r||e.innerHeight+i>=A)&&(clearInterval(a),H(n,r,d),l.callback(n,o))},w=function(){j+=16,b=j/parseInt(l.speed,10),b=b>1?1:b,I=m+E*g(l.easing,b),e.scrollTo(0,Math.floor(I)),L(I,S,u)},C=function(){clearInterval(u),u=setInterval(w,16)};0===e.pageYOffset&&e.scrollTo(0,0),C()}};var I=function(t){e.location.hash;n&&(n.id=n.getAttribute("data-scroll-id"),c.animateScroll(n,o),n=null,o=null)},S=function(r){if(0===r.button&&!r.metaKey&&!r.ctrlKey&&(o=h(r.target,t.selector),o&&"a"===o.tagName.toLowerCase()&&o.hostname===e.location.hostname&&o.pathname===e.location.pathname&&/#/.test(o.href))){var a=m(o.hash);if("#"===a){r.preventDefault(),n=document.body;var i=n.id?n.id:"smooth-scroll-top";return n.setAttribute("data-scroll-id",i),n.id="",void(e.location.hash.substring(1)===i?I():e.location.hash=i)}n=document.querySelector(a),n&&(n.setAttribute("data-scroll-id",n.id),n.id="",o.hash===e.location.hash&&(r.preventDefault(),I()))}},E=function(e){i||(i=setTimeout(function(){i=null,a=O(r)},66))};return c.destroy=function(){t&&(document.removeEventListener("click",S,!1),e.removeEventListener("resize",E,!1),t=null,n=null,o=null,r=null,a=null,i=null,u=null)},c.init=function(n){l&&(c.destroy(),t=f(s,n||{}),r=t.selectorHeader?document.querySelector(t.selectorHeader):null,a=O(r),document.addEventListener("click",S,!1),e.addEventListener("hashchange",I,!1),r&&e.addEventListener("resize",E,!1))},c}); \ No newline at end of file +/*! smooth-scroll v10.1.0 | (c) 2016 Chris Ferdinandi | MIT License | http://github.com/cferdinandi/smooth-scroll */ +!(function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)})("undefined"!=typeof global?global:this.window||this.global,(function(e){"use strict";var t,n,o,r,a,i,c,u={},l="querySelector"in document&&"addEventListener"in e,s={selector:"[data-scroll]",selectorHeader:null,speed:500,easing:"easeInOutCubic",offset:0,callback:function(){}},f=function(){var e={},t=!1,n=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(t=arguments[0],n++);for(var r=function(n){for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(t&&"[object Object]"===Object.prototype.toString.call(n[o])?e[o]=f(!0,e[o],n[o]):e[o]=n[o])};n1&&(o=!0,n[1]=n[1].replace(/"/g,"").replace(/'/g,"")));e&&e!==document&&1===e.nodeType;e=e.parentNode){if("."===r)if(a){if(e.classList.contains(t.substr(1)))return e}else if(new RegExp("(^|\\s)"+t.substr(1)+"(\\s|$)").test(e.className))return e;if("#"===r&&e.id===t.substr(1))return e;if("["===r&&e.hasAttribute(n[0])){if(!o)return e;if(e.getAttribute(n[0])===n[1])return e}if(e.tagName.toLowerCase()===t)return e}return null},m=function(e){"#"===e.charAt(0)&&(e=e.substr(1));for(var t,n=String(e),o=n.length,r=-1,a="",i=n.charCodeAt(0);++r=1&&t<=31||127==t||0===r&&t>=48&&t<=57||1===r&&t>=48&&t<=57&&45===i?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&t<=57||t>=65&&t<=90||t>=97&&t<=122?n.charAt(r):"\\"+n.charAt(r)}return"#"+a},g=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=t<.5?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=t<.5?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=t<.5?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=t<.5?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},p=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=Math.max(o-t-n,0),Math.min(o,v()-b())},b=function(){return Math.max(document.documentElement.clientHeight,e.innerHeight||0)},v=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},y=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},O=function(e){return e?d(e)+e.offsetTop:0},H=function(t,n,o){o||(t.focus(),document.activeElement.id!==t.id&&(t.setAttribute("tabindex","-1"),t.focus(),t.style.outline="none"),e.scrollTo(0,n))};u.animateScroll=function(n,o,i){var u=y(o?o.getAttribute("data-options"):null),l=f(t||s,i||{},u),d="[object Number]"===Object.prototype.toString.call(n),h=d||!n.tagName?null:n;if(d||h){var m=e.pageYOffset;l.selectorHeader&&!r&&(r=document.querySelector(l.selectorHeader)),a||(a=O(r));var b,I,S=d?n:p(h,a,parseInt(l.offset,10)),E=S-m,A=v(),j=0,L=function(t,r,a){var i=e.pageYOffset;(t==r||i==r||e.innerHeight+i>=A)&&(clearInterval(a),H(n,r,d),l.callback(n,o))},w=function(){j+=16,b=j/parseInt(l.speed,10),b=b>1?1:b,I=m+E*g(l.easing,b),e.scrollTo(0,Math.floor(I)),L(I,S,c)},C=function(){clearInterval(c),c=setInterval(w,16)};0===e.pageYOffset&&e.scrollTo(0,0),C()}};var I=function(t){e.location.hash;n&&(n.id=n.getAttribute("data-scroll-id"),u.animateScroll(n,o),n=null,o=null)},S=function(r){if(0===r.button&&!r.metaKey&&!r.ctrlKey&&(o=h(r.target,t.selector),o&&"a"===o.tagName.toLowerCase()&&o.hostname===e.location.hostname&&o.pathname===e.location.pathname&&/#/.test(o.href))){var a=m(o.hash);if("#"===a){r.preventDefault(),n=document.body;var i=n.id?n.id:"smooth-scroll-top";return n.setAttribute("data-scroll-id",i),n.id="",void(e.location.hash.substring(1)===i?I():e.location.hash=i)}n=document.querySelector(a),n&&(n.setAttribute("data-scroll-id",n.id),n.id="",o.hash===e.location.hash&&(r.preventDefault(),I()))}},E=function(e){i||(i=setTimeout((function(){i=null,a=O(r)}),66))};return u.destroy=function(){t&&(document.removeEventListener("click",S,!1),e.removeEventListener("resize",E,!1),t=null,n=null,o=null,r=null,a=null,i=null,c=null)},u.init=function(n){l&&(u.destroy(),t=f(s,n||{}),r=t.selectorHeader?document.querySelector(t.selectorHeader):null,a=O(r),document.addEventListener("click",S,!1),e.addEventListener("hashchange",I,!1),r&&e.addEventListener("resize",E,!1))},u})); \ No newline at end of file diff --git a/docs/dist/js/smooth-scroll.js b/docs/dist/js/smooth-scroll.js index 7912a07..8aba31a 100755 --- a/docs/dist/js/smooth-scroll.js +++ b/docs/dist/js/smooth-scroll.js @@ -1,5 +1,5 @@ /*! - * smooth-scroll v10.0.1: Animate scrolling to anchor links + * smooth-scroll v10.1.0: Animate scrolling to anchor links * (c) 2016 Chris Ferdinandi * MIT License * http://github.com/cferdinandi/smooth-scroll @@ -13,7 +13,7 @@ } else { root.smoothScroll = factory(root); } -})(typeof global !== 'undefined' ? global : this.window || this.global, function (root) { +})(typeof global !== 'undefined' ? global : this.window || this.global, (function (root) { 'use strict'; @@ -537,10 +537,10 @@ */ var resizeThrottler = function (event) { if ( !eventTimeout ) { - eventTimeout = setTimeout(function() { + eventTimeout = setTimeout((function() { eventTimeout = null; // Reset timeout headerHeight = getHeaderHeight( fixedHeader ); // Get the height of a fixed header if one exists - }, 66); + }), 66); } }; @@ -605,4 +605,4 @@ return smoothScroll; -}); \ No newline at end of file +})); \ No newline at end of file diff --git a/docs/dist/js/smooth-scroll.min.js b/docs/dist/js/smooth-scroll.min.js index 58e8cdc..789fef1 100755 --- a/docs/dist/js/smooth-scroll.min.js +++ b/docs/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ -/*! smooth-scroll v10.0.1 | (c) 2016 Chris Ferdinandi | MIT License | http://github.com/cferdinandi/smooth-scroll */ -!function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)}("undefined"!=typeof global?global:this.window||this.global,function(e){"use strict";var t,n,o,r,a,i,u,c={},l="querySelector"in document&&"addEventListener"in e,s={selector:"[data-scroll]",selectorHeader:null,speed:500,easing:"easeInOutCubic",offset:0,callback:function(){}},f=function(){var e={},t=!1,n=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(t=arguments[0],n++);for(var r=function(n){for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(t&&"[object Object]"===Object.prototype.toString.call(n[o])?e[o]=f(!0,e[o],n[o]):e[o]=n[o])};o>n;n++){var a=arguments[n];r(a)}return e},d=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},h=function(e,t){var n,o,r=t.charAt(0),a="classList"in document.documentElement;for("["===r&&(t=t.substr(1,t.length-2),n=t.split("="),n.length>1&&(o=!0,n[1]=n[1].replace(/"/g,"").replace(/'/g,"")));e&&e!==document&&1===e.nodeType;e=e.parentNode){if("."===r)if(a){if(e.classList.contains(t.substr(1)))return e}else if(new RegExp("(^|\\s)"+t.substr(1)+"(\\s|$)").test(e.className))return e;if("#"===r&&e.id===t.substr(1))return e;if("["===r&&e.hasAttribute(n[0])){if(!o)return e;if(e.getAttribute(n[0])===n[1])return e}if(e.tagName.toLowerCase()===t)return e}return null},m=function(e){"#"===e.charAt(0)&&(e=e.substr(1));for(var t,n=String(e),o=n.length,r=-1,a="",i=n.charCodeAt(0);++r=1&&31>=t||127==t||0===r&&t>=48&&57>=t||1===r&&t>=48&&57>=t&&45===i?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&57>=t||t>=65&&90>=t||t>=97&&122>=t?n.charAt(r):"\\"+n.charAt(r)}return"#"+a},g=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=.5>t?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=.5>t?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=.5>t?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=.5>t?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},p=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=Math.max(o-t-n,0),Math.min(o,v()-b())},b=function(){return Math.max(document.documentElement.clientHeight,e.innerHeight||0)},v=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},y=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},O=function(e){return e?d(e)+e.offsetTop:0},H=function(t,n,o){o||(t.focus(),document.activeElement.id!==t.id&&(t.setAttribute("tabindex","-1"),t.focus(),t.style.outline="none"),e.scrollTo(0,n))};c.animateScroll=function(n,o,i){var c=y(o?o.getAttribute("data-options"):null),l=f(t||s,i||{},c),d="[object Number]"===Object.prototype.toString.call(n)?!0:!1,h=d||!n.tagName?null:n;if(d||h){var m=e.pageYOffset;l.selectorHeader&&!r&&(r=document.querySelector(l.selectorHeader)),a||(a=O(r));var b,I,S=d?n:p(h,a,parseInt(l.offset,10)),E=S-m,A=v(),j=0,L=function(t,r,a){var i=e.pageYOffset;(t==r||i==r||e.innerHeight+i>=A)&&(clearInterval(a),H(n,r,d),l.callback(n,o))},w=function(){j+=16,b=j/parseInt(l.speed,10),b=b>1?1:b,I=m+E*g(l.easing,b),e.scrollTo(0,Math.floor(I)),L(I,S,u)},C=function(){clearInterval(u),u=setInterval(w,16)};0===e.pageYOffset&&e.scrollTo(0,0),C()}};var I=function(t){e.location.hash;n&&(n.id=n.getAttribute("data-scroll-id"),c.animateScroll(n,o),n=null,o=null)},S=function(r){if(0===r.button&&!r.metaKey&&!r.ctrlKey&&(o=h(r.target,t.selector),o&&"a"===o.tagName.toLowerCase()&&o.hostname===e.location.hostname&&o.pathname===e.location.pathname&&/#/.test(o.href))){var a=m(o.hash);if("#"===a){r.preventDefault(),n=document.body;var i=n.id?n.id:"smooth-scroll-top";return n.setAttribute("data-scroll-id",i),n.id="",void(e.location.hash.substring(1)===i?I():e.location.hash=i)}n=document.querySelector(a),n&&(n.setAttribute("data-scroll-id",n.id),n.id="",o.hash===e.location.hash&&(r.preventDefault(),I()))}},E=function(e){i||(i=setTimeout(function(){i=null,a=O(r)},66))};return c.destroy=function(){t&&(document.removeEventListener("click",S,!1),e.removeEventListener("resize",E,!1),t=null,n=null,o=null,r=null,a=null,i=null,u=null)},c.init=function(n){l&&(c.destroy(),t=f(s,n||{}),r=t.selectorHeader?document.querySelector(t.selectorHeader):null,a=O(r),document.addEventListener("click",S,!1),e.addEventListener("hashchange",I,!1),r&&e.addEventListener("resize",E,!1))},c}); \ No newline at end of file +/*! smooth-scroll v10.1.0 | (c) 2016 Chris Ferdinandi | MIT License | http://github.com/cferdinandi/smooth-scroll */ +!(function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)})("undefined"!=typeof global?global:this.window||this.global,(function(e){"use strict";var t,n,o,r,a,i,c,u={},l="querySelector"in document&&"addEventListener"in e,s={selector:"[data-scroll]",selectorHeader:null,speed:500,easing:"easeInOutCubic",offset:0,callback:function(){}},f=function(){var e={},t=!1,n=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(t=arguments[0],n++);for(var r=function(n){for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(t&&"[object Object]"===Object.prototype.toString.call(n[o])?e[o]=f(!0,e[o],n[o]):e[o]=n[o])};n1&&(o=!0,n[1]=n[1].replace(/"/g,"").replace(/'/g,"")));e&&e!==document&&1===e.nodeType;e=e.parentNode){if("."===r)if(a){if(e.classList.contains(t.substr(1)))return e}else if(new RegExp("(^|\\s)"+t.substr(1)+"(\\s|$)").test(e.className))return e;if("#"===r&&e.id===t.substr(1))return e;if("["===r&&e.hasAttribute(n[0])){if(!o)return e;if(e.getAttribute(n[0])===n[1])return e}if(e.tagName.toLowerCase()===t)return e}return null},m=function(e){"#"===e.charAt(0)&&(e=e.substr(1));for(var t,n=String(e),o=n.length,r=-1,a="",i=n.charCodeAt(0);++r=1&&t<=31||127==t||0===r&&t>=48&&t<=57||1===r&&t>=48&&t<=57&&45===i?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&t<=57||t>=65&&t<=90||t>=97&&t<=122?n.charAt(r):"\\"+n.charAt(r)}return"#"+a},g=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=t<.5?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=t<.5?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=t<.5?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=t<.5?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},p=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=Math.max(o-t-n,0),Math.min(o,v()-b())},b=function(){return Math.max(document.documentElement.clientHeight,e.innerHeight||0)},v=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},y=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},O=function(e){return e?d(e)+e.offsetTop:0},H=function(t,n,o){o||(t.focus(),document.activeElement.id!==t.id&&(t.setAttribute("tabindex","-1"),t.focus(),t.style.outline="none"),e.scrollTo(0,n))};u.animateScroll=function(n,o,i){var u=y(o?o.getAttribute("data-options"):null),l=f(t||s,i||{},u),d="[object Number]"===Object.prototype.toString.call(n),h=d||!n.tagName?null:n;if(d||h){var m=e.pageYOffset;l.selectorHeader&&!r&&(r=document.querySelector(l.selectorHeader)),a||(a=O(r));var b,I,S=d?n:p(h,a,parseInt(l.offset,10)),E=S-m,A=v(),j=0,L=function(t,r,a){var i=e.pageYOffset;(t==r||i==r||e.innerHeight+i>=A)&&(clearInterval(a),H(n,r,d),l.callback(n,o))},w=function(){j+=16,b=j/parseInt(l.speed,10),b=b>1?1:b,I=m+E*g(l.easing,b),e.scrollTo(0,Math.floor(I)),L(I,S,c)},C=function(){clearInterval(c),c=setInterval(w,16)};0===e.pageYOffset&&e.scrollTo(0,0),C()}};var I=function(t){e.location.hash;n&&(n.id=n.getAttribute("data-scroll-id"),u.animateScroll(n,o),n=null,o=null)},S=function(r){if(0===r.button&&!r.metaKey&&!r.ctrlKey&&(o=h(r.target,t.selector),o&&"a"===o.tagName.toLowerCase()&&o.hostname===e.location.hostname&&o.pathname===e.location.pathname&&/#/.test(o.href))){var a=m(o.hash);if("#"===a){r.preventDefault(),n=document.body;var i=n.id?n.id:"smooth-scroll-top";return n.setAttribute("data-scroll-id",i),n.id="",void(e.location.hash.substring(1)===i?I():e.location.hash=i)}n=document.querySelector(a),n&&(n.setAttribute("data-scroll-id",n.id),n.id="",o.hash===e.location.hash&&(r.preventDefault(),I()))}},E=function(e){i||(i=setTimeout((function(){i=null,a=O(r)}),66))};return u.destroy=function(){t&&(document.removeEventListener("click",S,!1),e.removeEventListener("resize",E,!1),t=null,n=null,o=null,r=null,a=null,i=null,c=null)},u.init=function(n){l&&(u.destroy(),t=f(s,n||{}),r=t.selectorHeader?document.querySelector(t.selectorHeader):null,a=O(r),document.addEventListener("click",S,!1),e.addEventListener("hashchange",I,!1),r&&e.addEventListener("resize",E,!1))},u})); \ No newline at end of file diff --git a/gulpfile.js b/gulpfile.js index 36e705d..63be8c9 100755 --- a/gulpfile.js +++ b/gulpfile.js @@ -22,7 +22,7 @@ var jshint = require('gulp-jshint'); var stylish = require('jshint-stylish'); var concat = require('gulp-concat'); var uglify = require('gulp-uglify'); -var karma = require('gulp-karma'); +var optimizejs = require('gulp-optimize-js'); // Docs var markdown = require('gulp-markdown'); @@ -40,13 +40,6 @@ var paths = { input: 'src/js/*', output: 'dist/js/' }, - test: { - input: 'src/js/**/*.js', - karma: 'test/karma.conf.js', - spec: 'test/spec/**/*.js', - coverage: 'test/coverage/', - results: 'test/results/' - }, docs: { input: 'src/docs/*.{html,md,markdown}', output: 'docs/', @@ -86,9 +79,11 @@ var banner = { gulp.task('build:scripts', ['clean:dist'], function() { var jsTasks = lazypipe() .pipe(header, banner.full, { package : package }) + .pipe(optimizejs) .pipe(gulp.dest, paths.scripts.output) .pipe(rename, { suffix: '.min' }) .pipe(uglify) + .pipe(optimizejs) .pipe(header, banner.min, { package : package }) .pipe(gulp.dest, paths.scripts.output); @@ -113,29 +108,13 @@ gulp.task('lint:scripts', function () { .pipe(jshint.reporter('jshint-stylish')); }); -// Remove pre-existing content from output and test folders +// Remove pre-existing content from output folders gulp.task('clean:dist', function () { del.sync([ paths.output ]); }); -// Remove pre-existing content from text folders -gulp.task('clean:test', function () { - del.sync([ - paths.test.coverage, - paths.test.results - ]); -}); - -// Run unit tests -gulp.task('test:scripts', function() { - return gulp.src([paths.test.input].concat([paths.test.spec])) - .pipe(plumber()) - .pipe(karma({ configFile: paths.test.karma })) - .on('error', function(err) { throw err; }); -}); - // Generate documentation gulp.task('build:docs', ['compile', 'clean:docs'], function() { return gulp.src(paths.docs.input) @@ -217,10 +196,4 @@ gulp.task('default', [ gulp.task('watch', [ 'listen', 'default' -]); - -// Run unit tests -gulp.task('test', [ - 'default', - 'test:scripts' ]); \ No newline at end of file diff --git a/package.json b/package.json index 21b71b3..9e5bfaa 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "smooth-scroll", - "version": "10.0.1", + "version": "10.1.0", "description": "Animate scrolling to anchor links", "main": "./dist/js/smooth-scroll.min.js", "author": { @@ -13,33 +13,24 @@ "url": "http://github.com/cferdinandi/smooth-scroll" }, "devDependencies": { - "gulp": "^3.9.0", + "gulp": "^3.9.1", "node-fs": "^0.1.7", - "del": "^1.2.0", - "lazypipe": "^0.2.4", - "gulp-plumber": "^1.0.1", - "gulp-flatten": "^0.0.4", + "del": "^2.2.0", + "lazypipe": "^1.0.1", + "gulp-plumber": "^1.1.0", + "gulp-flatten": "^0.3.1", "gulp-tap": "^0.1.3", "gulp-rename": "^1.2.2", - "gulp-header": "1.2.2", + "gulp-header": "^1.8.8", "gulp-footer": "^1.0.5", - "gulp-watch": "^4.2.4", - "gulp-livereload": "^3.8.0", - "gulp-jshint": "^1.11.1", - "jshint-stylish": "^2.0.1", + "gulp-watch": "^4.3.9", + "gulp-livereload": "^3.8.1", + "gulp-jshint": "^2.0.1", + "jshint-stylish": "^2.2.1", "gulp-concat": "^2.6.0", - "gulp-uglify": "^1.2.0", - "phantomjs": "^1.9.19", - "karma": "^0.12.37", - "gulp-karma": "^0.0.4", - "karma-coverage": "^0.4.2", - "jasmine": "^2.3.1", - "jasmine-core": "^2.4.1", - "karma-jasmine": "^0.3.6", - "karma-phantomjs-launcher": "^0.2.0", - "karma-spec-reporter": "^0.0.19", - "karma-htmlfile-reporter": "^0.2.1", - "gulp-markdown": "^1.0.0", - "gulp-file-include": "^0.11.1" + "gulp-uglify": "^2.0.0", + "gulp-optimize-js": "^1.0.2", + "gulp-markdown": "^1.2.0", + "gulp-file-include": "^0.14.0" } } diff --git a/test/karma.conf.js b/test/karma.conf.js deleted file mode 100755 index c140e5e..0000000 --- a/test/karma.conf.js +++ /dev/null @@ -1,26 +0,0 @@ -module.exports = function (config) { - config.set({ - basePath : '', - autoWatch : true, - frameworks: ['jasmine'], - browsers : ['PhantomJS'], - plugins : [ - 'karma-spec-reporter', - 'karma-phantomjs-launcher', - 'karma-jasmine', - 'karma-coverage', - 'karma-htmlfile-reporter' - ], - reporters : ['spec', 'coverage', 'html'], - preprocessors: { - '../src/js/**/*.js': 'coverage' - }, - coverageReporter: { - type : 'html', - dir : 'coverage/' - }, - htmlReporter: { - outputFile: 'results/unit-tests.html' - } - }); -}; \ No newline at end of file diff --git a/test/spec/spec-smoothScroll.js b/test/spec/spec-smoothScroll.js deleted file mode 100755 index b12dc28..0000000 --- a/test/spec/spec-smoothScroll.js +++ /dev/null @@ -1,162 +0,0 @@ -describe('Smooth Scroll', function () { - - // - // Helper Methods - // - var removeElements = function() { - var p = document.querySelector('p'); - if (p && p.remove) { - p.remove(); - } - var a = document.querySelector('a'); - if (a && a.remove) { - a.remove(); - } - var target = document.querySelector('div'); - if (target && target.remove) { - target.remove(); - } - }; - /** - * Create a link element, add it to the body. - * @public - * @param {String} the href attribute of the new link - * @param {Boolean} whether to add data-scroll to the link or not - * @returns {Element} - */ - var injectElem = function (href, smooth) { - removeElements(); - - var elt = document.createElement('a'); - elt.href = href; - elt.style.background = '#f0f'; - elt.textContent="newtext"; - if (smooth) { - elt.setAttribute('data-scroll', true); - } - document.body.appendChild(elt); - - var p = document.createElement('p'); - p.style.height = '20000px'; - p.style.background = '#f00'; - document.body.appendChild(p); - - var target = document.createElement('div'); - target.id = 'target'; - target.style.height = '200px'; - target.style.background = '#0ff'; - document.body.appendChild(target); - window.top.callPhantom({type: 'render', fname: './myscreen.png'}); - return elt; - }; - - /** - * Simulate a click event. - * @public - * @param {Element} the element to simulate a click on - */ - var simulateClick = function (elt) { - var click = document.createEvent('MouseEvents'); - click.initMouseEvent('click', true, true, window, 1, 0, 0, 0, 0, false, false, false, false, 0, null); - elt.dispatchEvent(click); - }; - - // A pattern for settings to validate their format. - var settingsStub = { - speed: jasmine.any(Number), - easing: jasmine.any(String), - offset: jasmine.any(Number), - updateURL: jasmine.any(Boolean), - callback: jasmine.any(Function) - }; - - - // - // Init - // - - describe('Should initialize plugin', function () { - it('Should export the smoothScroll module', function () { - expect(smoothScroll).toBeDefined(); - }); - - it('Should expose public functions', function () { - expect(smoothScroll.init).toEqual(jasmine.any(Function)); - expect(smoothScroll.destroy).toEqual(jasmine.any(Function)); - expect(smoothScroll.animateScroll).toEqual(jasmine.any(Function)); - }); - - it('Should add event listeners', function () { - spyOn(document, 'addEventListener'); - smoothScroll.init(); - expect(document.addEventListener).toHaveBeenCalledWith('click', jasmine.any(Function), false); - - spyOn(document, 'removeEventListener'); - smoothScroll.destroy(); - expect(document.removeEventListener).toHaveBeenCalledWith('click', jasmine.any(Function), false); - }); - }); - - describe('Should merge user options into defaults', function () { - - var elt = injectElem('#target', true); - - beforeEach(function () { - smoothScroll.init({ - callback: function () { document.documentElement.classList.add('callback'); } - }); - }); - - it('User options should be merged into defaults', function (done) { - simulateClick(elt); - setTimeout(function() { - expect(document.documentElement.classList.contains('callback')).toBe(true); - done(); - }, 200); - }); - - }); - - - // - // Events - // - - // describe('Should animate scroll when anchor clicked', function () { - // var elt = injectElem('#target', true); - // // document.body.id = 'anchor'; - - // beforeEach(function() { - // spyOn(smoothScroll, 'animateScroll'); - // }); - - // afterEach(function () { - // smoothScroll.destroy(); - // }); - - - // it('Should trigger smooth scrolling on click', function (done) { - // smoothScroll.init(); - // simulateClick(elt); - // setTimeout(function() { - // expect(smoothScroll.animateScroll).toHaveBeenCalledWith('#target', elt, jasmine.objectContaining(settingsStub)); - // done(); - // }, 200); - // }); - - // it('Should do nothing if not initialized', function () { - // simulateClick(elt); - // expect(smoothScroll.animateScroll).not.toHaveBeenCalled(); - // }); - - // it('Should do nothing if destroyed', function (done) { - // smoothScroll.init(); - // smoothScroll.destroy(); - // simulateClick(elt); - // setTimeout(function() { - // expect(smoothScroll.animateScroll).not.toHaveBeenCalled(); - // done(); - // }, 200); - // }); - // }); -}); From 4547e8e96919ce39bdf91d4935f504882397b30f Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Sun, 11 Dec 2016 07:41:56 -0500 Subject: [PATCH 182/285] v10.2.0 (#303) * v10.2.0 Updated getClosest() for broader selector support * Updated readme --- README.md | 2 +- dist/js/smooth-scroll.js | 74 ++++++++----------------------- dist/js/smooth-scroll.min.js | 4 +- docs/dist/js/smooth-scroll.js | 74 ++++++++----------------------- docs/dist/js/smooth-scroll.min.js | 4 +- package.json | 2 +- src/js/smooth-scroll.js | 72 +++++++----------------------- 7 files changed, 59 insertions(+), 173 deletions(-) diff --git a/README.md b/README.md index 619638a..510fee9 100755 --- a/README.md +++ b/README.md @@ -86,7 +86,7 @@ smoothScroll.init({ }); ``` -***Note:*** *To programatically add Smooth Scroll to all anchor links on a page, pass `selector: 'a'` into `init`. The script checks that the link points to the current page before running.* +***Note:*** *To programatically add Smooth Scroll to all anchor links on a page, pass `selector: 'a[href^="#"]'` into `init`.* #### Easing Options diff --git a/dist/js/smooth-scroll.js b/dist/js/smooth-scroll.js index 8aba31a..c147ed3 100755 --- a/dist/js/smooth-scroll.js +++ b/dist/js/smooth-scroll.js @@ -1,5 +1,5 @@ /*! - * smooth-scroll v10.1.0: Animate scrolling to anchor links + * smooth-scroll v10.2.0: Animate scrolling to anchor links * (c) 2016 Chris Ferdinandi * MIT License * http://github.com/cferdinandi/smooth-scroll @@ -99,68 +99,30 @@ * Get the closest matching element up the DOM tree. * @private * @param {Element} elem Starting element - * @param {String} selector Selector to match against (class, ID, data attribute, or tag) + * @param {String} selector Selector to match against * @return {Boolean|Element} Returns null if not match found */ var getClosest = function ( elem, selector ) { - // Variables - var firstChar = selector.charAt(0); - var supports = 'classList' in document.documentElement; - var attribute, value; - - // If selector is a data attribute, split attribute from value - if ( firstChar === '[' ) { - selector = selector.substr(1, selector.length - 2); - attribute = selector.split( '=' ); - - if ( attribute.length > 1 ) { - value = true; - attribute[1] = attribute[1].replace( /"/g, '' ).replace( /'/g, '' ); - } + // Element.matches() polyfill + if (!Element.prototype.matches) { + Element.prototype.matches = + Element.prototype.matchesSelector || + Element.prototype.mozMatchesSelector || + Element.prototype.msMatchesSelector || + Element.prototype.oMatchesSelector || + Element.prototype.webkitMatchesSelector || + function(s) { + var matches = (this.document || this.ownerDocument).querySelectorAll(s), + i = matches.length; + while (--i >= 0 && matches.item(i) !== this) {} + return i > -1; + }; } // Get closest match - for ( ; elem && elem !== document && elem.nodeType === 1; elem = elem.parentNode ) { - - // If selector is a class - if ( firstChar === '.' ) { - if ( supports ) { - if ( elem.classList.contains( selector.substr(1) ) ) { - return elem; - } - } else { - if ( new RegExp('(^|\\s)' + selector.substr(1) + '(\\s|$)').test( elem.className ) ) { - return elem; - } - } - } - - // If selector is an ID - if ( firstChar === '#' ) { - if ( elem.id === selector.substr(1) ) { - return elem; - } - } - - // If selector is a data attribute - if ( firstChar === '[' ) { - if ( elem.hasAttribute( attribute[0] ) ) { - if ( value ) { - if ( elem.getAttribute( attribute[0] ) === attribute[1] ) { - return elem; - } - } else { - return elem; - } - } - } - - // If selector is a tag - if ( elem.tagName.toLowerCase() === selector ) { - return elem; - } - + for ( ; elem && elem !== document; elem = elem.parentNode ) { + if ( elem.matches( selector ) ) return elem; } return null; diff --git a/dist/js/smooth-scroll.min.js b/dist/js/smooth-scroll.min.js index 789fef1..edf86f5 100755 --- a/dist/js/smooth-scroll.min.js +++ b/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ -/*! smooth-scroll v10.1.0 | (c) 2016 Chris Ferdinandi | MIT License | http://github.com/cferdinandi/smooth-scroll */ -!(function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)})("undefined"!=typeof global?global:this.window||this.global,(function(e){"use strict";var t,n,o,r,a,i,c,u={},l="querySelector"in document&&"addEventListener"in e,s={selector:"[data-scroll]",selectorHeader:null,speed:500,easing:"easeInOutCubic",offset:0,callback:function(){}},f=function(){var e={},t=!1,n=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(t=arguments[0],n++);for(var r=function(n){for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(t&&"[object Object]"===Object.prototype.toString.call(n[o])?e[o]=f(!0,e[o],n[o]):e[o]=n[o])};n1&&(o=!0,n[1]=n[1].replace(/"/g,"").replace(/'/g,"")));e&&e!==document&&1===e.nodeType;e=e.parentNode){if("."===r)if(a){if(e.classList.contains(t.substr(1)))return e}else if(new RegExp("(^|\\s)"+t.substr(1)+"(\\s|$)").test(e.className))return e;if("#"===r&&e.id===t.substr(1))return e;if("["===r&&e.hasAttribute(n[0])){if(!o)return e;if(e.getAttribute(n[0])===n[1])return e}if(e.tagName.toLowerCase()===t)return e}return null},m=function(e){"#"===e.charAt(0)&&(e=e.substr(1));for(var t,n=String(e),o=n.length,r=-1,a="",i=n.charCodeAt(0);++r=1&&t<=31||127==t||0===r&&t>=48&&t<=57||1===r&&t>=48&&t<=57&&45===i?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&t<=57||t>=65&&t<=90||t>=97&&t<=122?n.charAt(r):"\\"+n.charAt(r)}return"#"+a},g=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=t<.5?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=t<.5?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=t<.5?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=t<.5?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},p=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=Math.max(o-t-n,0),Math.min(o,v()-b())},b=function(){return Math.max(document.documentElement.clientHeight,e.innerHeight||0)},v=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},y=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},O=function(e){return e?d(e)+e.offsetTop:0},H=function(t,n,o){o||(t.focus(),document.activeElement.id!==t.id&&(t.setAttribute("tabindex","-1"),t.focus(),t.style.outline="none"),e.scrollTo(0,n))};u.animateScroll=function(n,o,i){var u=y(o?o.getAttribute("data-options"):null),l=f(t||s,i||{},u),d="[object Number]"===Object.prototype.toString.call(n),h=d||!n.tagName?null:n;if(d||h){var m=e.pageYOffset;l.selectorHeader&&!r&&(r=document.querySelector(l.selectorHeader)),a||(a=O(r));var b,I,S=d?n:p(h,a,parseInt(l.offset,10)),E=S-m,A=v(),j=0,L=function(t,r,a){var i=e.pageYOffset;(t==r||i==r||e.innerHeight+i>=A)&&(clearInterval(a),H(n,r,d),l.callback(n,o))},w=function(){j+=16,b=j/parseInt(l.speed,10),b=b>1?1:b,I=m+E*g(l.easing,b),e.scrollTo(0,Math.floor(I)),L(I,S,c)},C=function(){clearInterval(c),c=setInterval(w,16)};0===e.pageYOffset&&e.scrollTo(0,0),C()}};var I=function(t){e.location.hash;n&&(n.id=n.getAttribute("data-scroll-id"),u.animateScroll(n,o),n=null,o=null)},S=function(r){if(0===r.button&&!r.metaKey&&!r.ctrlKey&&(o=h(r.target,t.selector),o&&"a"===o.tagName.toLowerCase()&&o.hostname===e.location.hostname&&o.pathname===e.location.pathname&&/#/.test(o.href))){var a=m(o.hash);if("#"===a){r.preventDefault(),n=document.body;var i=n.id?n.id:"smooth-scroll-top";return n.setAttribute("data-scroll-id",i),n.id="",void(e.location.hash.substring(1)===i?I():e.location.hash=i)}n=document.querySelector(a),n&&(n.setAttribute("data-scroll-id",n.id),n.id="",o.hash===e.location.hash&&(r.preventDefault(),I()))}},E=function(e){i||(i=setTimeout((function(){i=null,a=O(r)}),66))};return u.destroy=function(){t&&(document.removeEventListener("click",S,!1),e.removeEventListener("resize",E,!1),t=null,n=null,o=null,r=null,a=null,i=null,c=null)},u.init=function(n){l&&(u.destroy(),t=f(s,n||{}),r=t.selectorHeader?document.querySelector(t.selectorHeader):null,a=O(r),document.addEventListener("click",S,!1),e.addEventListener("hashchange",I,!1),r&&e.addEventListener("resize",E,!1))},u})); \ No newline at end of file +/*! smooth-scroll v10.2.0 | (c) 2016 Chris Ferdinandi | MIT License | http://github.com/cferdinandi/smooth-scroll */ +!(function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)})("undefined"!=typeof global?global:this.window||this.global,(function(e){"use strict";var t,n,o,r,a,c,l,i={},u="querySelector"in document&&"addEventListener"in e,s={selector:"[data-scroll]",selectorHeader:null,speed:500,easing:"easeInOutCubic",offset:0,callback:function(){}},f=function(){var e={},t=!1,n=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(t=arguments[0],n++);for(var r=function(n){for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(t&&"[object Object]"===Object.prototype.toString.call(n[o])?e[o]=f(!0,e[o],n[o]):e[o]=n[o])};n=0&&t.item(n)!==this;);return n>-1});e&&e!==document;e=e.parentNode)if(e.matches(t))return e;return null},m=function(e){"#"===e.charAt(0)&&(e=e.substr(1));for(var t,n=String(e),o=n.length,r=-1,a="",c=n.charCodeAt(0);++r=1&&t<=31||127==t||0===r&&t>=48&&t<=57||1===r&&t>=48&&t<=57&&45===c?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&t<=57||t>=65&&t<=90||t>=97&&t<=122?n.charAt(r):"\\"+n.charAt(r)}return"#"+a},p=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=t<.5?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=t<.5?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=t<.5?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=t<.5?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},g=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=Math.max(o-t-n,0),Math.min(o,v()-b())},b=function(){return Math.max(document.documentElement.clientHeight,e.innerHeight||0)},v=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},y=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},O=function(e){return e?d(e)+e.offsetTop:0},S=function(t,n,o){o||(t.focus(),document.activeElement.id!==t.id&&(t.setAttribute("tabindex","-1"),t.focus(),t.style.outline="none"),e.scrollTo(0,n))};i.animateScroll=function(n,o,c){var i=y(o?o.getAttribute("data-options"):null),u=f(t||s,c||{},i),d="[object Number]"===Object.prototype.toString.call(n),h=d||!n.tagName?null:n;if(d||h){var m=e.pageYOffset;u.selectorHeader&&!r&&(r=document.querySelector(u.selectorHeader)),a||(a=O(r));var b,E,H=d?n:g(h,a,parseInt(u.offset,10)),I=H-m,A=v(),j=0,M=function(t,r,a){var c=e.pageYOffset;(t==r||c==r||e.innerHeight+c>=A)&&(clearInterval(a),S(n,r,d),u.callback(n,o))},w=function(){j+=16,b=j/parseInt(u.speed,10),b=b>1?1:b,E=m+I*p(u.easing,b),e.scrollTo(0,Math.floor(E)),M(E,H,l)},Q=function(){clearInterval(l),l=setInterval(w,16)};0===e.pageYOffset&&e.scrollTo(0,0),Q()}};var E=function(t){e.location.hash;n&&(n.id=n.getAttribute("data-scroll-id"),i.animateScroll(n,o),n=null,o=null)},H=function(r){if(0===r.button&&!r.metaKey&&!r.ctrlKey&&(o=h(r.target,t.selector),o&&"a"===o.tagName.toLowerCase()&&o.hostname===e.location.hostname&&o.pathname===e.location.pathname&&/#/.test(o.href))){var a=m(o.hash);if("#"===a){r.preventDefault(),n=document.body;var c=n.id?n.id:"smooth-scroll-top";return n.setAttribute("data-scroll-id",c),n.id="",void(e.location.hash.substring(1)===c?E():e.location.hash=c)}n=document.querySelector(a),n&&(n.setAttribute("data-scroll-id",n.id),n.id="",o.hash===e.location.hash&&(r.preventDefault(),E()))}},I=function(e){c||(c=setTimeout((function(){c=null,a=O(r)}),66))};return i.destroy=function(){t&&(document.removeEventListener("click",H,!1),e.removeEventListener("resize",I,!1),t=null,n=null,o=null,r=null,a=null,c=null,l=null)},i.init=function(n){u&&(i.destroy(),t=f(s,n||{}),r=t.selectorHeader?document.querySelector(t.selectorHeader):null,a=O(r),document.addEventListener("click",H,!1),e.addEventListener("hashchange",E,!1),r&&e.addEventListener("resize",I,!1))},i})); \ No newline at end of file diff --git a/docs/dist/js/smooth-scroll.js b/docs/dist/js/smooth-scroll.js index 8aba31a..c147ed3 100755 --- a/docs/dist/js/smooth-scroll.js +++ b/docs/dist/js/smooth-scroll.js @@ -1,5 +1,5 @@ /*! - * smooth-scroll v10.1.0: Animate scrolling to anchor links + * smooth-scroll v10.2.0: Animate scrolling to anchor links * (c) 2016 Chris Ferdinandi * MIT License * http://github.com/cferdinandi/smooth-scroll @@ -99,68 +99,30 @@ * Get the closest matching element up the DOM tree. * @private * @param {Element} elem Starting element - * @param {String} selector Selector to match against (class, ID, data attribute, or tag) + * @param {String} selector Selector to match against * @return {Boolean|Element} Returns null if not match found */ var getClosest = function ( elem, selector ) { - // Variables - var firstChar = selector.charAt(0); - var supports = 'classList' in document.documentElement; - var attribute, value; - - // If selector is a data attribute, split attribute from value - if ( firstChar === '[' ) { - selector = selector.substr(1, selector.length - 2); - attribute = selector.split( '=' ); - - if ( attribute.length > 1 ) { - value = true; - attribute[1] = attribute[1].replace( /"/g, '' ).replace( /'/g, '' ); - } + // Element.matches() polyfill + if (!Element.prototype.matches) { + Element.prototype.matches = + Element.prototype.matchesSelector || + Element.prototype.mozMatchesSelector || + Element.prototype.msMatchesSelector || + Element.prototype.oMatchesSelector || + Element.prototype.webkitMatchesSelector || + function(s) { + var matches = (this.document || this.ownerDocument).querySelectorAll(s), + i = matches.length; + while (--i >= 0 && matches.item(i) !== this) {} + return i > -1; + }; } // Get closest match - for ( ; elem && elem !== document && elem.nodeType === 1; elem = elem.parentNode ) { - - // If selector is a class - if ( firstChar === '.' ) { - if ( supports ) { - if ( elem.classList.contains( selector.substr(1) ) ) { - return elem; - } - } else { - if ( new RegExp('(^|\\s)' + selector.substr(1) + '(\\s|$)').test( elem.className ) ) { - return elem; - } - } - } - - // If selector is an ID - if ( firstChar === '#' ) { - if ( elem.id === selector.substr(1) ) { - return elem; - } - } - - // If selector is a data attribute - if ( firstChar === '[' ) { - if ( elem.hasAttribute( attribute[0] ) ) { - if ( value ) { - if ( elem.getAttribute( attribute[0] ) === attribute[1] ) { - return elem; - } - } else { - return elem; - } - } - } - - // If selector is a tag - if ( elem.tagName.toLowerCase() === selector ) { - return elem; - } - + for ( ; elem && elem !== document; elem = elem.parentNode ) { + if ( elem.matches( selector ) ) return elem; } return null; diff --git a/docs/dist/js/smooth-scroll.min.js b/docs/dist/js/smooth-scroll.min.js index 789fef1..edf86f5 100755 --- a/docs/dist/js/smooth-scroll.min.js +++ b/docs/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ -/*! smooth-scroll v10.1.0 | (c) 2016 Chris Ferdinandi | MIT License | http://github.com/cferdinandi/smooth-scroll */ -!(function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)})("undefined"!=typeof global?global:this.window||this.global,(function(e){"use strict";var t,n,o,r,a,i,c,u={},l="querySelector"in document&&"addEventListener"in e,s={selector:"[data-scroll]",selectorHeader:null,speed:500,easing:"easeInOutCubic",offset:0,callback:function(){}},f=function(){var e={},t=!1,n=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(t=arguments[0],n++);for(var r=function(n){for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(t&&"[object Object]"===Object.prototype.toString.call(n[o])?e[o]=f(!0,e[o],n[o]):e[o]=n[o])};n1&&(o=!0,n[1]=n[1].replace(/"/g,"").replace(/'/g,"")));e&&e!==document&&1===e.nodeType;e=e.parentNode){if("."===r)if(a){if(e.classList.contains(t.substr(1)))return e}else if(new RegExp("(^|\\s)"+t.substr(1)+"(\\s|$)").test(e.className))return e;if("#"===r&&e.id===t.substr(1))return e;if("["===r&&e.hasAttribute(n[0])){if(!o)return e;if(e.getAttribute(n[0])===n[1])return e}if(e.tagName.toLowerCase()===t)return e}return null},m=function(e){"#"===e.charAt(0)&&(e=e.substr(1));for(var t,n=String(e),o=n.length,r=-1,a="",i=n.charCodeAt(0);++r=1&&t<=31||127==t||0===r&&t>=48&&t<=57||1===r&&t>=48&&t<=57&&45===i?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&t<=57||t>=65&&t<=90||t>=97&&t<=122?n.charAt(r):"\\"+n.charAt(r)}return"#"+a},g=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=t<.5?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=t<.5?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=t<.5?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=t<.5?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},p=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=Math.max(o-t-n,0),Math.min(o,v()-b())},b=function(){return Math.max(document.documentElement.clientHeight,e.innerHeight||0)},v=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},y=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},O=function(e){return e?d(e)+e.offsetTop:0},H=function(t,n,o){o||(t.focus(),document.activeElement.id!==t.id&&(t.setAttribute("tabindex","-1"),t.focus(),t.style.outline="none"),e.scrollTo(0,n))};u.animateScroll=function(n,o,i){var u=y(o?o.getAttribute("data-options"):null),l=f(t||s,i||{},u),d="[object Number]"===Object.prototype.toString.call(n),h=d||!n.tagName?null:n;if(d||h){var m=e.pageYOffset;l.selectorHeader&&!r&&(r=document.querySelector(l.selectorHeader)),a||(a=O(r));var b,I,S=d?n:p(h,a,parseInt(l.offset,10)),E=S-m,A=v(),j=0,L=function(t,r,a){var i=e.pageYOffset;(t==r||i==r||e.innerHeight+i>=A)&&(clearInterval(a),H(n,r,d),l.callback(n,o))},w=function(){j+=16,b=j/parseInt(l.speed,10),b=b>1?1:b,I=m+E*g(l.easing,b),e.scrollTo(0,Math.floor(I)),L(I,S,c)},C=function(){clearInterval(c),c=setInterval(w,16)};0===e.pageYOffset&&e.scrollTo(0,0),C()}};var I=function(t){e.location.hash;n&&(n.id=n.getAttribute("data-scroll-id"),u.animateScroll(n,o),n=null,o=null)},S=function(r){if(0===r.button&&!r.metaKey&&!r.ctrlKey&&(o=h(r.target,t.selector),o&&"a"===o.tagName.toLowerCase()&&o.hostname===e.location.hostname&&o.pathname===e.location.pathname&&/#/.test(o.href))){var a=m(o.hash);if("#"===a){r.preventDefault(),n=document.body;var i=n.id?n.id:"smooth-scroll-top";return n.setAttribute("data-scroll-id",i),n.id="",void(e.location.hash.substring(1)===i?I():e.location.hash=i)}n=document.querySelector(a),n&&(n.setAttribute("data-scroll-id",n.id),n.id="",o.hash===e.location.hash&&(r.preventDefault(),I()))}},E=function(e){i||(i=setTimeout((function(){i=null,a=O(r)}),66))};return u.destroy=function(){t&&(document.removeEventListener("click",S,!1),e.removeEventListener("resize",E,!1),t=null,n=null,o=null,r=null,a=null,i=null,c=null)},u.init=function(n){l&&(u.destroy(),t=f(s,n||{}),r=t.selectorHeader?document.querySelector(t.selectorHeader):null,a=O(r),document.addEventListener("click",S,!1),e.addEventListener("hashchange",I,!1),r&&e.addEventListener("resize",E,!1))},u})); \ No newline at end of file +/*! smooth-scroll v10.2.0 | (c) 2016 Chris Ferdinandi | MIT License | http://github.com/cferdinandi/smooth-scroll */ +!(function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)})("undefined"!=typeof global?global:this.window||this.global,(function(e){"use strict";var t,n,o,r,a,c,l,i={},u="querySelector"in document&&"addEventListener"in e,s={selector:"[data-scroll]",selectorHeader:null,speed:500,easing:"easeInOutCubic",offset:0,callback:function(){}},f=function(){var e={},t=!1,n=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(t=arguments[0],n++);for(var r=function(n){for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(t&&"[object Object]"===Object.prototype.toString.call(n[o])?e[o]=f(!0,e[o],n[o]):e[o]=n[o])};n=0&&t.item(n)!==this;);return n>-1});e&&e!==document;e=e.parentNode)if(e.matches(t))return e;return null},m=function(e){"#"===e.charAt(0)&&(e=e.substr(1));for(var t,n=String(e),o=n.length,r=-1,a="",c=n.charCodeAt(0);++r=1&&t<=31||127==t||0===r&&t>=48&&t<=57||1===r&&t>=48&&t<=57&&45===c?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&t<=57||t>=65&&t<=90||t>=97&&t<=122?n.charAt(r):"\\"+n.charAt(r)}return"#"+a},p=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=t<.5?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=t<.5?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=t<.5?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=t<.5?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},g=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=Math.max(o-t-n,0),Math.min(o,v()-b())},b=function(){return Math.max(document.documentElement.clientHeight,e.innerHeight||0)},v=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},y=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},O=function(e){return e?d(e)+e.offsetTop:0},S=function(t,n,o){o||(t.focus(),document.activeElement.id!==t.id&&(t.setAttribute("tabindex","-1"),t.focus(),t.style.outline="none"),e.scrollTo(0,n))};i.animateScroll=function(n,o,c){var i=y(o?o.getAttribute("data-options"):null),u=f(t||s,c||{},i),d="[object Number]"===Object.prototype.toString.call(n),h=d||!n.tagName?null:n;if(d||h){var m=e.pageYOffset;u.selectorHeader&&!r&&(r=document.querySelector(u.selectorHeader)),a||(a=O(r));var b,E,H=d?n:g(h,a,parseInt(u.offset,10)),I=H-m,A=v(),j=0,M=function(t,r,a){var c=e.pageYOffset;(t==r||c==r||e.innerHeight+c>=A)&&(clearInterval(a),S(n,r,d),u.callback(n,o))},w=function(){j+=16,b=j/parseInt(u.speed,10),b=b>1?1:b,E=m+I*p(u.easing,b),e.scrollTo(0,Math.floor(E)),M(E,H,l)},Q=function(){clearInterval(l),l=setInterval(w,16)};0===e.pageYOffset&&e.scrollTo(0,0),Q()}};var E=function(t){e.location.hash;n&&(n.id=n.getAttribute("data-scroll-id"),i.animateScroll(n,o),n=null,o=null)},H=function(r){if(0===r.button&&!r.metaKey&&!r.ctrlKey&&(o=h(r.target,t.selector),o&&"a"===o.tagName.toLowerCase()&&o.hostname===e.location.hostname&&o.pathname===e.location.pathname&&/#/.test(o.href))){var a=m(o.hash);if("#"===a){r.preventDefault(),n=document.body;var c=n.id?n.id:"smooth-scroll-top";return n.setAttribute("data-scroll-id",c),n.id="",void(e.location.hash.substring(1)===c?E():e.location.hash=c)}n=document.querySelector(a),n&&(n.setAttribute("data-scroll-id",n.id),n.id="",o.hash===e.location.hash&&(r.preventDefault(),E()))}},I=function(e){c||(c=setTimeout((function(){c=null,a=O(r)}),66))};return i.destroy=function(){t&&(document.removeEventListener("click",H,!1),e.removeEventListener("resize",I,!1),t=null,n=null,o=null,r=null,a=null,c=null,l=null)},i.init=function(n){u&&(i.destroy(),t=f(s,n||{}),r=t.selectorHeader?document.querySelector(t.selectorHeader):null,a=O(r),document.addEventListener("click",H,!1),e.addEventListener("hashchange",E,!1),r&&e.addEventListener("resize",I,!1))},i})); \ No newline at end of file diff --git a/package.json b/package.json index 9e5bfaa..1749279 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "smooth-scroll", - "version": "10.1.0", + "version": "10.2.0", "description": "Animate scrolling to anchor links", "main": "./dist/js/smooth-scroll.min.js", "author": { diff --git a/src/js/smooth-scroll.js b/src/js/smooth-scroll.js index 1139c73..229df2f 100755 --- a/src/js/smooth-scroll.js +++ b/src/js/smooth-scroll.js @@ -92,68 +92,30 @@ * Get the closest matching element up the DOM tree. * @private * @param {Element} elem Starting element - * @param {String} selector Selector to match against (class, ID, data attribute, or tag) + * @param {String} selector Selector to match against * @return {Boolean|Element} Returns null if not match found */ var getClosest = function ( elem, selector ) { - // Variables - var firstChar = selector.charAt(0); - var supports = 'classList' in document.documentElement; - var attribute, value; - - // If selector is a data attribute, split attribute from value - if ( firstChar === '[' ) { - selector = selector.substr(1, selector.length - 2); - attribute = selector.split( '=' ); - - if ( attribute.length > 1 ) { - value = true; - attribute[1] = attribute[1].replace( /"/g, '' ).replace( /'/g, '' ); - } + // Element.matches() polyfill + if (!Element.prototype.matches) { + Element.prototype.matches = + Element.prototype.matchesSelector || + Element.prototype.mozMatchesSelector || + Element.prototype.msMatchesSelector || + Element.prototype.oMatchesSelector || + Element.prototype.webkitMatchesSelector || + function(s) { + var matches = (this.document || this.ownerDocument).querySelectorAll(s), + i = matches.length; + while (--i >= 0 && matches.item(i) !== this) {} + return i > -1; + }; } // Get closest match - for ( ; elem && elem !== document && elem.nodeType === 1; elem = elem.parentNode ) { - - // If selector is a class - if ( firstChar === '.' ) { - if ( supports ) { - if ( elem.classList.contains( selector.substr(1) ) ) { - return elem; - } - } else { - if ( new RegExp('(^|\\s)' + selector.substr(1) + '(\\s|$)').test( elem.className ) ) { - return elem; - } - } - } - - // If selector is an ID - if ( firstChar === '#' ) { - if ( elem.id === selector.substr(1) ) { - return elem; - } - } - - // If selector is a data attribute - if ( firstChar === '[' ) { - if ( elem.hasAttribute( attribute[0] ) ) { - if ( value ) { - if ( elem.getAttribute( attribute[0] ) === attribute[1] ) { - return elem; - } - } else { - return elem; - } - } - } - - // If selector is a tag - if ( elem.tagName.toLowerCase() === selector ) { - return elem; - } - + for ( ; elem && elem !== document; elem = elem.parentNode ) { + if ( elem.matches( selector ) ) return elem; } return null; From e39e069058c9ffeea92bdef88dd2daf1ad7c4a88 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Mon, 26 Dec 2016 08:45:46 -0500 Subject: [PATCH 183/285] v10.2.1 (#307) Added support for Chinese, Cyrillic, and other non-ASCII characters --- dist/js/smooth-scroll.js | 19 ++++++++++++++++--- dist/js/smooth-scroll.min.js | 4 ++-- docs/dist/js/smooth-scroll.js | 19 ++++++++++++++++--- docs/dist/js/smooth-scroll.min.js | 4 ++-- docs/index.html | 13 +++++++++++++ package.json | 2 +- src/docs/index.md | 13 +++++++++++++ src/js/smooth-scroll.js | 17 +++++++++++++++-- 8 files changed, 78 insertions(+), 13 deletions(-) diff --git a/dist/js/smooth-scroll.js b/dist/js/smooth-scroll.js index c147ed3..0c5ca7d 100755 --- a/dist/js/smooth-scroll.js +++ b/dist/js/smooth-scroll.js @@ -1,5 +1,5 @@ /*! - * smooth-scroll v10.2.0: Animate scrolling to anchor links + * smooth-scroll v10.2.1: Animate scrolling to anchor links * (c) 2016 Chris Ferdinandi * MIT License * http://github.com/cferdinandi/smooth-scroll @@ -413,7 +413,13 @@ var hashChangeHandler = function (event) { // Get hash from URL - var hash = root.location.hash; + // var hash = decodeURIComponent( escapeCharacters( root.location.hash ) ); + var hash; + try { + hash = escapeCharacters( decodeURIComponent( root.location.hash ) ); + } catch(e) { + hash = escapeCharacters( root.location.hash ); + } // Only run if there's an anchor element to scroll to if ( !anchor ) return; @@ -447,7 +453,14 @@ if ( toggle.hostname !== root.location.hostname || toggle.pathname !== root.location.pathname || !/#/.test(toggle.href) ) return; // Get the sanitized hash - var hash = escapeCharacters( toggle.hash ); + // var hash = decodeURIComponent( escapeCharacters( toggle.hash ) ); + // console.log(hash); + var hash; + try { + hash = escapeCharacters( decodeURIComponent( toggle.hash ) ); + } catch(e) { + hash = escapeCharacters( toggle.hash ); + } // If the hash is empty, scroll to the top of the page if ( hash === '#' ) { diff --git a/dist/js/smooth-scroll.min.js b/dist/js/smooth-scroll.min.js index edf86f5..d952995 100755 --- a/dist/js/smooth-scroll.min.js +++ b/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ -/*! smooth-scroll v10.2.0 | (c) 2016 Chris Ferdinandi | MIT License | http://github.com/cferdinandi/smooth-scroll */ -!(function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)})("undefined"!=typeof global?global:this.window||this.global,(function(e){"use strict";var t,n,o,r,a,c,l,i={},u="querySelector"in document&&"addEventListener"in e,s={selector:"[data-scroll]",selectorHeader:null,speed:500,easing:"easeInOutCubic",offset:0,callback:function(){}},f=function(){var e={},t=!1,n=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(t=arguments[0],n++);for(var r=function(n){for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(t&&"[object Object]"===Object.prototype.toString.call(n[o])?e[o]=f(!0,e[o],n[o]):e[o]=n[o])};n=0&&t.item(n)!==this;);return n>-1});e&&e!==document;e=e.parentNode)if(e.matches(t))return e;return null},m=function(e){"#"===e.charAt(0)&&(e=e.substr(1));for(var t,n=String(e),o=n.length,r=-1,a="",c=n.charCodeAt(0);++r=1&&t<=31||127==t||0===r&&t>=48&&t<=57||1===r&&t>=48&&t<=57&&45===c?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&t<=57||t>=65&&t<=90||t>=97&&t<=122?n.charAt(r):"\\"+n.charAt(r)}return"#"+a},p=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=t<.5?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=t<.5?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=t<.5?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=t<.5?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},g=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=Math.max(o-t-n,0),Math.min(o,v()-b())},b=function(){return Math.max(document.documentElement.clientHeight,e.innerHeight||0)},v=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},y=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},O=function(e){return e?d(e)+e.offsetTop:0},S=function(t,n,o){o||(t.focus(),document.activeElement.id!==t.id&&(t.setAttribute("tabindex","-1"),t.focus(),t.style.outline="none"),e.scrollTo(0,n))};i.animateScroll=function(n,o,c){var i=y(o?o.getAttribute("data-options"):null),u=f(t||s,c||{},i),d="[object Number]"===Object.prototype.toString.call(n),h=d||!n.tagName?null:n;if(d||h){var m=e.pageYOffset;u.selectorHeader&&!r&&(r=document.querySelector(u.selectorHeader)),a||(a=O(r));var b,E,H=d?n:g(h,a,parseInt(u.offset,10)),I=H-m,A=v(),j=0,M=function(t,r,a){var c=e.pageYOffset;(t==r||c==r||e.innerHeight+c>=A)&&(clearInterval(a),S(n,r,d),u.callback(n,o))},w=function(){j+=16,b=j/parseInt(u.speed,10),b=b>1?1:b,E=m+I*p(u.easing,b),e.scrollTo(0,Math.floor(E)),M(E,H,l)},Q=function(){clearInterval(l),l=setInterval(w,16)};0===e.pageYOffset&&e.scrollTo(0,0),Q()}};var E=function(t){e.location.hash;n&&(n.id=n.getAttribute("data-scroll-id"),i.animateScroll(n,o),n=null,o=null)},H=function(r){if(0===r.button&&!r.metaKey&&!r.ctrlKey&&(o=h(r.target,t.selector),o&&"a"===o.tagName.toLowerCase()&&o.hostname===e.location.hostname&&o.pathname===e.location.pathname&&/#/.test(o.href))){var a=m(o.hash);if("#"===a){r.preventDefault(),n=document.body;var c=n.id?n.id:"smooth-scroll-top";return n.setAttribute("data-scroll-id",c),n.id="",void(e.location.hash.substring(1)===c?E():e.location.hash=c)}n=document.querySelector(a),n&&(n.setAttribute("data-scroll-id",n.id),n.id="",o.hash===e.location.hash&&(r.preventDefault(),E()))}},I=function(e){c||(c=setTimeout((function(){c=null,a=O(r)}),66))};return i.destroy=function(){t&&(document.removeEventListener("click",H,!1),e.removeEventListener("resize",I,!1),t=null,n=null,o=null,r=null,a=null,c=null,l=null)},i.init=function(n){u&&(i.destroy(),t=f(s,n||{}),r=t.selectorHeader?document.querySelector(t.selectorHeader):null,a=O(r),document.addEventListener("click",H,!1),e.addEventListener("hashchange",E,!1),r&&e.addEventListener("resize",I,!1))},i})); \ No newline at end of file +/*! smooth-scroll v10.2.1 | (c) 2016 Chris Ferdinandi | MIT License | http://github.com/cferdinandi/smooth-scroll */ +!(function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)})("undefined"!=typeof global?global:this.window||this.global,(function(e){"use strict";var t,n,o,r,a,c,l,i={},u="querySelector"in document&&"addEventListener"in e,s={selector:"[data-scroll]",selectorHeader:null,speed:500,easing:"easeInOutCubic",offset:0,callback:function(){}},d=function(){var e={},t=!1,n=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(t=arguments[0],n++);for(var r=function(n){for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(t&&"[object Object]"===Object.prototype.toString.call(n[o])?e[o]=d(!0,e[o],n[o]):e[o]=n[o])};n=0&&t.item(n)!==this;);return n>-1});e&&e!==document;e=e.parentNode)if(e.matches(t))return e;return null},m=function(e){"#"===e.charAt(0)&&(e=e.substr(1));for(var t,n=String(e),o=n.length,r=-1,a="",c=n.charCodeAt(0);++r=1&&t<=31||127==t||0===r&&t>=48&&t<=57||1===r&&t>=48&&t<=57&&45===c?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&t<=57||t>=65&&t<=90||t>=97&&t<=122?n.charAt(r):"\\"+n.charAt(r)}return"#"+a},p=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=t<.5?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=t<.5?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=t<.5?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=t<.5?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},g=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=Math.max(o-t-n,0),Math.min(o,v()-b())},b=function(){return Math.max(document.documentElement.clientHeight,e.innerHeight||0)},v=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},y=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},O=function(e){return e?f(e)+e.offsetTop:0},S=function(t,n,o){o||(t.focus(),document.activeElement.id!==t.id&&(t.setAttribute("tabindex","-1"),t.focus(),t.style.outline="none"),e.scrollTo(0,n))};i.animateScroll=function(n,o,c){var i=y(o?o.getAttribute("data-options"):null),u=d(t||s,c||{},i),f="[object Number]"===Object.prototype.toString.call(n),h=f||!n.tagName?null:n;if(f||h){var m=e.pageYOffset;u.selectorHeader&&!r&&(r=document.querySelector(u.selectorHeader)),a||(a=O(r));var b,E,I=f?n:g(h,a,parseInt(u.offset,10)),H=I-m,A=v(),j=0,C=function(t,r,a){var c=e.pageYOffset;(t==r||c==r||e.innerHeight+c>=A)&&(clearInterval(a),S(n,r,f),u.callback(n,o))},M=function(){j+=16,b=j/parseInt(u.speed,10),b=b>1?1:b,E=m+H*p(u.easing,b),e.scrollTo(0,Math.floor(E)),C(E,I,l)},w=function(){clearInterval(l),l=setInterval(M,16)};0===e.pageYOffset&&e.scrollTo(0,0),w()}};var E=function(t){var r;try{r=m(decodeURIComponent(e.location.hash))}catch(t){r=m(e.location.hash)}n&&(n.id=n.getAttribute("data-scroll-id"),i.animateScroll(n,o),n=null,o=null)},I=function(r){if(0===r.button&&!r.metaKey&&!r.ctrlKey&&(o=h(r.target,t.selector),o&&"a"===o.tagName.toLowerCase()&&o.hostname===e.location.hostname&&o.pathname===e.location.pathname&&/#/.test(o.href))){var a;try{a=m(decodeURIComponent(o.hash))}catch(e){a=m(o.hash)}if("#"===a){r.preventDefault(),n=document.body;var c=n.id?n.id:"smooth-scroll-top";return n.setAttribute("data-scroll-id",c),n.id="",void(e.location.hash.substring(1)===c?E():e.location.hash=c)}n=document.querySelector(a),n&&(n.setAttribute("data-scroll-id",n.id),n.id="",o.hash===e.location.hash&&(r.preventDefault(),E()))}},H=function(e){c||(c=setTimeout((function(){c=null,a=O(r)}),66))};return i.destroy=function(){t&&(document.removeEventListener("click",I,!1),e.removeEventListener("resize",H,!1),t=null,n=null,o=null,r=null,a=null,c=null,l=null)},i.init=function(n){u&&(i.destroy(),t=d(s,n||{}),r=t.selectorHeader?document.querySelector(t.selectorHeader):null,a=O(r),document.addEventListener("click",I,!1),e.addEventListener("hashchange",E,!1),r&&e.addEventListener("resize",H,!1))},i})); \ No newline at end of file diff --git a/docs/dist/js/smooth-scroll.js b/docs/dist/js/smooth-scroll.js index c147ed3..0c5ca7d 100755 --- a/docs/dist/js/smooth-scroll.js +++ b/docs/dist/js/smooth-scroll.js @@ -1,5 +1,5 @@ /*! - * smooth-scroll v10.2.0: Animate scrolling to anchor links + * smooth-scroll v10.2.1: Animate scrolling to anchor links * (c) 2016 Chris Ferdinandi * MIT License * http://github.com/cferdinandi/smooth-scroll @@ -413,7 +413,13 @@ var hashChangeHandler = function (event) { // Get hash from URL - var hash = root.location.hash; + // var hash = decodeURIComponent( escapeCharacters( root.location.hash ) ); + var hash; + try { + hash = escapeCharacters( decodeURIComponent( root.location.hash ) ); + } catch(e) { + hash = escapeCharacters( root.location.hash ); + } // Only run if there's an anchor element to scroll to if ( !anchor ) return; @@ -447,7 +453,14 @@ if ( toggle.hostname !== root.location.hostname || toggle.pathname !== root.location.pathname || !/#/.test(toggle.href) ) return; // Get the sanitized hash - var hash = escapeCharacters( toggle.hash ); + // var hash = decodeURIComponent( escapeCharacters( toggle.hash ) ); + // console.log(hash); + var hash; + try { + hash = escapeCharacters( decodeURIComponent( toggle.hash ) ); + } catch(e) { + hash = escapeCharacters( toggle.hash ); + } // If the hash is empty, scroll to the top of the page if ( hash === '#' ) { diff --git a/docs/dist/js/smooth-scroll.min.js b/docs/dist/js/smooth-scroll.min.js index edf86f5..d952995 100755 --- a/docs/dist/js/smooth-scroll.min.js +++ b/docs/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ -/*! smooth-scroll v10.2.0 | (c) 2016 Chris Ferdinandi | MIT License | http://github.com/cferdinandi/smooth-scroll */ -!(function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)})("undefined"!=typeof global?global:this.window||this.global,(function(e){"use strict";var t,n,o,r,a,c,l,i={},u="querySelector"in document&&"addEventListener"in e,s={selector:"[data-scroll]",selectorHeader:null,speed:500,easing:"easeInOutCubic",offset:0,callback:function(){}},f=function(){var e={},t=!1,n=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(t=arguments[0],n++);for(var r=function(n){for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(t&&"[object Object]"===Object.prototype.toString.call(n[o])?e[o]=f(!0,e[o],n[o]):e[o]=n[o])};n=0&&t.item(n)!==this;);return n>-1});e&&e!==document;e=e.parentNode)if(e.matches(t))return e;return null},m=function(e){"#"===e.charAt(0)&&(e=e.substr(1));for(var t,n=String(e),o=n.length,r=-1,a="",c=n.charCodeAt(0);++r=1&&t<=31||127==t||0===r&&t>=48&&t<=57||1===r&&t>=48&&t<=57&&45===c?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&t<=57||t>=65&&t<=90||t>=97&&t<=122?n.charAt(r):"\\"+n.charAt(r)}return"#"+a},p=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=t<.5?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=t<.5?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=t<.5?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=t<.5?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},g=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=Math.max(o-t-n,0),Math.min(o,v()-b())},b=function(){return Math.max(document.documentElement.clientHeight,e.innerHeight||0)},v=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},y=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},O=function(e){return e?d(e)+e.offsetTop:0},S=function(t,n,o){o||(t.focus(),document.activeElement.id!==t.id&&(t.setAttribute("tabindex","-1"),t.focus(),t.style.outline="none"),e.scrollTo(0,n))};i.animateScroll=function(n,o,c){var i=y(o?o.getAttribute("data-options"):null),u=f(t||s,c||{},i),d="[object Number]"===Object.prototype.toString.call(n),h=d||!n.tagName?null:n;if(d||h){var m=e.pageYOffset;u.selectorHeader&&!r&&(r=document.querySelector(u.selectorHeader)),a||(a=O(r));var b,E,H=d?n:g(h,a,parseInt(u.offset,10)),I=H-m,A=v(),j=0,M=function(t,r,a){var c=e.pageYOffset;(t==r||c==r||e.innerHeight+c>=A)&&(clearInterval(a),S(n,r,d),u.callback(n,o))},w=function(){j+=16,b=j/parseInt(u.speed,10),b=b>1?1:b,E=m+I*p(u.easing,b),e.scrollTo(0,Math.floor(E)),M(E,H,l)},Q=function(){clearInterval(l),l=setInterval(w,16)};0===e.pageYOffset&&e.scrollTo(0,0),Q()}};var E=function(t){e.location.hash;n&&(n.id=n.getAttribute("data-scroll-id"),i.animateScroll(n,o),n=null,o=null)},H=function(r){if(0===r.button&&!r.metaKey&&!r.ctrlKey&&(o=h(r.target,t.selector),o&&"a"===o.tagName.toLowerCase()&&o.hostname===e.location.hostname&&o.pathname===e.location.pathname&&/#/.test(o.href))){var a=m(o.hash);if("#"===a){r.preventDefault(),n=document.body;var c=n.id?n.id:"smooth-scroll-top";return n.setAttribute("data-scroll-id",c),n.id="",void(e.location.hash.substring(1)===c?E():e.location.hash=c)}n=document.querySelector(a),n&&(n.setAttribute("data-scroll-id",n.id),n.id="",o.hash===e.location.hash&&(r.preventDefault(),E()))}},I=function(e){c||(c=setTimeout((function(){c=null,a=O(r)}),66))};return i.destroy=function(){t&&(document.removeEventListener("click",H,!1),e.removeEventListener("resize",I,!1),t=null,n=null,o=null,r=null,a=null,c=null,l=null)},i.init=function(n){u&&(i.destroy(),t=f(s,n||{}),r=t.selectorHeader?document.querySelector(t.selectorHeader):null,a=O(r),document.addEventListener("click",H,!1),e.addEventListener("hashchange",E,!1),r&&e.addEventListener("resize",I,!1))},i})); \ No newline at end of file +/*! smooth-scroll v10.2.1 | (c) 2016 Chris Ferdinandi | MIT License | http://github.com/cferdinandi/smooth-scroll */ +!(function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)})("undefined"!=typeof global?global:this.window||this.global,(function(e){"use strict";var t,n,o,r,a,c,l,i={},u="querySelector"in document&&"addEventListener"in e,s={selector:"[data-scroll]",selectorHeader:null,speed:500,easing:"easeInOutCubic",offset:0,callback:function(){}},d=function(){var e={},t=!1,n=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(t=arguments[0],n++);for(var r=function(n){for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(t&&"[object Object]"===Object.prototype.toString.call(n[o])?e[o]=d(!0,e[o],n[o]):e[o]=n[o])};n=0&&t.item(n)!==this;);return n>-1});e&&e!==document;e=e.parentNode)if(e.matches(t))return e;return null},m=function(e){"#"===e.charAt(0)&&(e=e.substr(1));for(var t,n=String(e),o=n.length,r=-1,a="",c=n.charCodeAt(0);++r=1&&t<=31||127==t||0===r&&t>=48&&t<=57||1===r&&t>=48&&t<=57&&45===c?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&t<=57||t>=65&&t<=90||t>=97&&t<=122?n.charAt(r):"\\"+n.charAt(r)}return"#"+a},p=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=t<.5?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=t<.5?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=t<.5?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=t<.5?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},g=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=Math.max(o-t-n,0),Math.min(o,v()-b())},b=function(){return Math.max(document.documentElement.clientHeight,e.innerHeight||0)},v=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},y=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},O=function(e){return e?f(e)+e.offsetTop:0},S=function(t,n,o){o||(t.focus(),document.activeElement.id!==t.id&&(t.setAttribute("tabindex","-1"),t.focus(),t.style.outline="none"),e.scrollTo(0,n))};i.animateScroll=function(n,o,c){var i=y(o?o.getAttribute("data-options"):null),u=d(t||s,c||{},i),f="[object Number]"===Object.prototype.toString.call(n),h=f||!n.tagName?null:n;if(f||h){var m=e.pageYOffset;u.selectorHeader&&!r&&(r=document.querySelector(u.selectorHeader)),a||(a=O(r));var b,E,I=f?n:g(h,a,parseInt(u.offset,10)),H=I-m,A=v(),j=0,C=function(t,r,a){var c=e.pageYOffset;(t==r||c==r||e.innerHeight+c>=A)&&(clearInterval(a),S(n,r,f),u.callback(n,o))},M=function(){j+=16,b=j/parseInt(u.speed,10),b=b>1?1:b,E=m+H*p(u.easing,b),e.scrollTo(0,Math.floor(E)),C(E,I,l)},w=function(){clearInterval(l),l=setInterval(M,16)};0===e.pageYOffset&&e.scrollTo(0,0),w()}};var E=function(t){var r;try{r=m(decodeURIComponent(e.location.hash))}catch(t){r=m(e.location.hash)}n&&(n.id=n.getAttribute("data-scroll-id"),i.animateScroll(n,o),n=null,o=null)},I=function(r){if(0===r.button&&!r.metaKey&&!r.ctrlKey&&(o=h(r.target,t.selector),o&&"a"===o.tagName.toLowerCase()&&o.hostname===e.location.hostname&&o.pathname===e.location.pathname&&/#/.test(o.href))){var a;try{a=m(decodeURIComponent(o.hash))}catch(e){a=m(o.hash)}if("#"===a){r.preventDefault(),n=document.body;var c=n.id?n.id:"smooth-scroll-top";return n.setAttribute("data-scroll-id",c),n.id="",void(e.location.hash.substring(1)===c?E():e.location.hash=c)}n=document.querySelector(a),n&&(n.setAttribute("data-scroll-id",n.id),n.id="",o.hash===e.location.hash&&(r.preventDefault(),E()))}},H=function(e){c||(c=setTimeout((function(){c=null,a=O(r)}),66))};return i.destroy=function(){t&&(document.removeEventListener("click",I,!1),e.removeEventListener("resize",H,!1),t=null,n=null,o=null,r=null,a=null,c=null,l=null)},i.init=function(n){u&&(i.destroy(),t=d(s,n||{}),r=t.selectorHeader?document.querySelector(t.selectorHeader):null,a=O(r),document.addEventListener("click",I,!1),e.addEventListener("hashchange",E,!1),r&&e.addEventListener("resize",H,!1))},i})); \ No newline at end of file diff --git a/docs/index.html b/docs/index.html index c002dca..e61cf7c 100644 --- a/docs/index.html +++ b/docs/index.html @@ -63,6 +63,19 @@

Smooth Scroll

.
.
.
.
.
.
.
.
.
.
.
.
.

+

+ Non-ASCII Characters
+ 中文 +

+ +

+ .
.
.
.
.
.
.
.
.
.
.
.
.
+ .
.
.
.
.
.
.
.
.
.
.
.
.
+ .
.
.
.
.
.
.
.
.
.
.
.
. +

+ +

中文

+

Bazinga!

diff --git a/package.json b/package.json index 1749279..e75f674 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "smooth-scroll", - "version": "10.2.0", + "version": "10.2.1", "description": "Animate scrolling to anchor links", "main": "./dist/js/smooth-scroll.min.js", "author": { diff --git a/src/docs/index.md b/src/docs/index.md index 33b0e26..e55a541 100644 --- a/src/docs/index.md +++ b/src/docs/index.md @@ -33,6 +33,19 @@ .
.
.
.
.
.
.
.
.
.
.
.
.

+

+ Non-ASCII Characters
+ 中文 +

+ +

+ .
.
.
.
.
.
.
.
.
.
.
.
.
+ .
.
.
.
.
.
.
.
.
.
.
.
.
+ .
.
.
.
.
.
.
.
.
.
.
.
. +

+ +

中文

+

Bazinga!

diff --git a/src/js/smooth-scroll.js b/src/js/smooth-scroll.js index 229df2f..9370083 100755 --- a/src/js/smooth-scroll.js +++ b/src/js/smooth-scroll.js @@ -406,7 +406,13 @@ var hashChangeHandler = function (event) { // Get hash from URL - var hash = root.location.hash; + // var hash = decodeURIComponent( escapeCharacters( root.location.hash ) ); + var hash; + try { + hash = escapeCharacters( decodeURIComponent( root.location.hash ) ); + } catch(e) { + hash = escapeCharacters( root.location.hash ); + } // Only run if there's an anchor element to scroll to if ( !anchor ) return; @@ -440,7 +446,14 @@ if ( toggle.hostname !== root.location.hostname || toggle.pathname !== root.location.pathname || !/#/.test(toggle.href) ) return; // Get the sanitized hash - var hash = escapeCharacters( toggle.hash ); + // var hash = decodeURIComponent( escapeCharacters( toggle.hash ) ); + // console.log(hash); + var hash; + try { + hash = escapeCharacters( decodeURIComponent( toggle.hash ) ); + } catch(e) { + hash = escapeCharacters( toggle.hash ); + } // If the hash is empty, scroll to the top of the page if ( hash === '#' ) { From f4a5f6e4461ec04b8668690ef734f0825fc30f00 Mon Sep 17 00:00:00 2001 From: cferdinandi Date: Mon, 3 Apr 2017 14:19:26 -0400 Subject: [PATCH 184/285] Updated readme --- README.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/README.md b/README.md index 510fee9..ac6f8bb 100755 --- a/README.md +++ b/README.md @@ -4,6 +4,13 @@ A lightweight script to animate scrolling to anchor links. Smooth Scroll works g [Download Smooth Scroll](https://github.com/cferdinandi/smooth-scroll/archive/master.zip) / [View the demo](http://cferdinandi.github.io/smooth-scroll/) +

+ +### Want to learn how to write your own vanilla JS plugins? Check out ["The Vanilla JS Guidebook"](https://gomakethings.com/vanilla-js-guidebook/) and level-up as a web developer. 🚀 + +
+ + ## Getting Started From a541227605cc46f05c87748cda68397aa961a8eb Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Fri, 7 Apr 2017 12:39:24 -0400 Subject: [PATCH 185/285] Agarzola master (#318) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Track jshint as dev dependency gulp-jshint requires jshint@2.x as a peer dep, which wasn’t tracked. * Support offset function * Bump version & build dist * Update README for offset function * Updated dependencies * Updated dependencies --- README.md | 2 +- dist/js/smooth-scroll.js | 6 +++--- dist/js/smooth-scroll.min.js | 4 ++-- docs/dist/js/smooth-scroll.js | 6 +++--- docs/dist/js/smooth-scroll.min.js | 4 ++-- package.json | 15 ++++++++------- src/js/smooth-scroll.js | 2 +- 7 files changed, 20 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index ac6f8bb..73cdd4d 100755 --- a/README.md +++ b/README.md @@ -88,7 +88,7 @@ smoothScroll.init({ selectorHeader: null, // Selector for fixed headers (must be a valid CSS selector) [optional] speed: 500, // Integer. How fast to complete the scroll in milliseconds easing: 'easeInOutCubic', // Easing pattern to use - offset: 0, // Integer. How far to offset the scrolling anchor location in pixels + offset: 0, // Integer or Function returning an integer. How far to offset the scrolling anchor location in pixels callback: function ( anchor, toggle ) {} // Function to run after scrolling }); ``` diff --git a/dist/js/smooth-scroll.js b/dist/js/smooth-scroll.js index 0c5ca7d..3439579 100755 --- a/dist/js/smooth-scroll.js +++ b/dist/js/smooth-scroll.js @@ -1,6 +1,6 @@ /*! - * smooth-scroll v10.2.1: Animate scrolling to anchor links - * (c) 2016 Chris Ferdinandi + * smooth-scroll v10.3.1: Animate scrolling to anchor links + * (c) 2017 Chris Ferdinandi * MIT License * http://github.com/cferdinandi/smooth-scroll */ @@ -342,7 +342,7 @@ // Get the height of a fixed header if one exists and not already set headerHeight = getHeaderHeight( fixedHeader ); } - var endLocation = isNum ? anchor : getEndLocation( anchorElem, headerHeight, parseInt(animateSettings.offset, 10) ); // Location to scroll to + var endLocation = isNum ? anchor : getEndLocation( anchorElem, headerHeight, parseInt((typeof animateSettings.offset === 'function' ? animateSettings.offset() : animateSettings.offset), 10) ); // Location to scroll to var distance = endLocation - startLocation; // distance to travel var documentHeight = getDocumentHeight(); var timeLapsed = 0; diff --git a/dist/js/smooth-scroll.min.js b/dist/js/smooth-scroll.min.js index d952995..a01d8a3 100755 --- a/dist/js/smooth-scroll.min.js +++ b/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ -/*! smooth-scroll v10.2.1 | (c) 2016 Chris Ferdinandi | MIT License | http://github.com/cferdinandi/smooth-scroll */ -!(function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)})("undefined"!=typeof global?global:this.window||this.global,(function(e){"use strict";var t,n,o,r,a,c,l,i={},u="querySelector"in document&&"addEventListener"in e,s={selector:"[data-scroll]",selectorHeader:null,speed:500,easing:"easeInOutCubic",offset:0,callback:function(){}},d=function(){var e={},t=!1,n=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(t=arguments[0],n++);for(var r=function(n){for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(t&&"[object Object]"===Object.prototype.toString.call(n[o])?e[o]=d(!0,e[o],n[o]):e[o]=n[o])};n=0&&t.item(n)!==this;);return n>-1});e&&e!==document;e=e.parentNode)if(e.matches(t))return e;return null},m=function(e){"#"===e.charAt(0)&&(e=e.substr(1));for(var t,n=String(e),o=n.length,r=-1,a="",c=n.charCodeAt(0);++r=1&&t<=31||127==t||0===r&&t>=48&&t<=57||1===r&&t>=48&&t<=57&&45===c?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&t<=57||t>=65&&t<=90||t>=97&&t<=122?n.charAt(r):"\\"+n.charAt(r)}return"#"+a},p=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=t<.5?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=t<.5?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=t<.5?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=t<.5?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},g=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=Math.max(o-t-n,0),Math.min(o,v()-b())},b=function(){return Math.max(document.documentElement.clientHeight,e.innerHeight||0)},v=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},y=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},O=function(e){return e?f(e)+e.offsetTop:0},S=function(t,n,o){o||(t.focus(),document.activeElement.id!==t.id&&(t.setAttribute("tabindex","-1"),t.focus(),t.style.outline="none"),e.scrollTo(0,n))};i.animateScroll=function(n,o,c){var i=y(o?o.getAttribute("data-options"):null),u=d(t||s,c||{},i),f="[object Number]"===Object.prototype.toString.call(n),h=f||!n.tagName?null:n;if(f||h){var m=e.pageYOffset;u.selectorHeader&&!r&&(r=document.querySelector(u.selectorHeader)),a||(a=O(r));var b,E,I=f?n:g(h,a,parseInt(u.offset,10)),H=I-m,A=v(),j=0,C=function(t,r,a){var c=e.pageYOffset;(t==r||c==r||e.innerHeight+c>=A)&&(clearInterval(a),S(n,r,f),u.callback(n,o))},M=function(){j+=16,b=j/parseInt(u.speed,10),b=b>1?1:b,E=m+H*p(u.easing,b),e.scrollTo(0,Math.floor(E)),C(E,I,l)},w=function(){clearInterval(l),l=setInterval(M,16)};0===e.pageYOffset&&e.scrollTo(0,0),w()}};var E=function(t){var r;try{r=m(decodeURIComponent(e.location.hash))}catch(t){r=m(e.location.hash)}n&&(n.id=n.getAttribute("data-scroll-id"),i.animateScroll(n,o),n=null,o=null)},I=function(r){if(0===r.button&&!r.metaKey&&!r.ctrlKey&&(o=h(r.target,t.selector),o&&"a"===o.tagName.toLowerCase()&&o.hostname===e.location.hostname&&o.pathname===e.location.pathname&&/#/.test(o.href))){var a;try{a=m(decodeURIComponent(o.hash))}catch(e){a=m(o.hash)}if("#"===a){r.preventDefault(),n=document.body;var c=n.id?n.id:"smooth-scroll-top";return n.setAttribute("data-scroll-id",c),n.id="",void(e.location.hash.substring(1)===c?E():e.location.hash=c)}n=document.querySelector(a),n&&(n.setAttribute("data-scroll-id",n.id),n.id="",o.hash===e.location.hash&&(r.preventDefault(),E()))}},H=function(e){c||(c=setTimeout((function(){c=null,a=O(r)}),66))};return i.destroy=function(){t&&(document.removeEventListener("click",I,!1),e.removeEventListener("resize",H,!1),t=null,n=null,o=null,r=null,a=null,c=null,l=null)},i.init=function(n){u&&(i.destroy(),t=d(s,n||{}),r=t.selectorHeader?document.querySelector(t.selectorHeader):null,a=O(r),document.addEventListener("click",I,!1),e.addEventListener("hashchange",E,!1),r&&e.addEventListener("resize",H,!1))},i})); \ No newline at end of file +/*! smooth-scroll v10.3.1 | (c) 2017 Chris Ferdinandi | MIT License | http://github.com/cferdinandi/smooth-scroll */ +!(function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)})("undefined"!=typeof global?global:this.window||this.global,(function(e){"use strict";var t,n,o,r,a,c,l,i={},u="querySelector"in document&&"addEventListener"in e,s={selector:"[data-scroll]",selectorHeader:null,speed:500,easing:"easeInOutCubic",offset:0,callback:function(){}},f=function(){var e={},t=!1,n=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(t=arguments[0],n++);for(;n=0&&t.item(n)!==this;);return n>-1});e&&e!==document;e=e.parentNode)if(e.matches(t))return e;return null},m=function(e){"#"===e.charAt(0)&&(e=e.substr(1));for(var t,n=String(e),o=n.length,r=-1,a="",c=n.charCodeAt(0);++r=1&&t<=31||127==t||0===r&&t>=48&&t<=57||1===r&&t>=48&&t<=57&&45===c?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&t<=57||t>=65&&t<=90||t>=97&&t<=122?n.charAt(r):"\\"+n.charAt(r)}return"#"+a},p=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=t<.5?2*t*t:(4-2*t)*t-1),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=t<.5?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=t<.5?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=t<.5?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},g=function(e,t,n){var o=0;if(e.offsetParent)do{o+=e.offsetTop,e=e.offsetParent}while(e);return o=Math.max(o-t-n,0),Math.min(o,y()-b())},b=function(){return Math.max(document.documentElement.clientHeight,e.innerHeight||0)},y=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},v=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},O=function(e){return e?d(e)+e.offsetTop:0},S=function(t,n,o){o||(t.focus(),document.activeElement.id!==t.id&&(t.setAttribute("tabindex","-1"),t.focus(),t.style.outline="none"),e.scrollTo(0,n))};i.animateScroll=function(n,o,c){var i=v(o?o.getAttribute("data-options"):null),u=f(t||s,c||{},i),d="[object Number]"===Object.prototype.toString.call(n),h=d||!n.tagName?null:n;if(d||h){var m=e.pageYOffset;u.selectorHeader&&!r&&(r=document.querySelector(u.selectorHeader)),a||(a=O(r));var b,E,I=d?n:g(h,a,parseInt("function"==typeof u.offset?u.offset():u.offset,10)),H=I-m,A=y(),j=0,C=function(t,r,a){var c=e.pageYOffset;(t==r||c==r||e.innerHeight+c>=A)&&(clearInterval(a),S(n,r,d),u.callback(n,o))},M=function(){j+=16,b=j/parseInt(u.speed,10),b=b>1?1:b,E=m+H*p(u.easing,b),e.scrollTo(0,Math.floor(E)),C(E,I,l)};0===e.pageYOffset&&e.scrollTo(0,0),(function(){clearInterval(l),l=setInterval(M,16)})()}};var E=function(t){try{m(decodeURIComponent(e.location.hash))}catch(t){m(e.location.hash)}n&&(n.id=n.getAttribute("data-scroll-id"),i.animateScroll(n,o),n=null,o=null)},I=function(r){if(0===r.button&&!r.metaKey&&!r.ctrlKey&&(o=h(r.target,t.selector))&&"a"===o.tagName.toLowerCase()&&o.hostname===e.location.hostname&&o.pathname===e.location.pathname&&/#/.test(o.href)){var a;try{a=m(decodeURIComponent(o.hash))}catch(e){a=m(o.hash)}if("#"===a){r.preventDefault(),n=document.body;var c=n.id?n.id:"smooth-scroll-top";return n.setAttribute("data-scroll-id",c),n.id="",void(e.location.hash.substring(1)===c?E():e.location.hash=c)}n=document.querySelector(a),n&&(n.setAttribute("data-scroll-id",n.id),n.id="",o.hash===e.location.hash&&(r.preventDefault(),E()))}},H=function(e){c||(c=setTimeout((function(){c=null,a=O(r)}),66))};return i.destroy=function(){t&&(document.removeEventListener("click",I,!1),e.removeEventListener("resize",H,!1),t=null,n=null,o=null,r=null,a=null,c=null,l=null)},i.init=function(n){u&&(i.destroy(),t=f(s,n||{}),r=t.selectorHeader?document.querySelector(t.selectorHeader):null,a=O(r),document.addEventListener("click",I,!1),e.addEventListener("hashchange",E,!1),r&&e.addEventListener("resize",H,!1))},i})); \ No newline at end of file diff --git a/docs/dist/js/smooth-scroll.js b/docs/dist/js/smooth-scroll.js index 0c5ca7d..3439579 100755 --- a/docs/dist/js/smooth-scroll.js +++ b/docs/dist/js/smooth-scroll.js @@ -1,6 +1,6 @@ /*! - * smooth-scroll v10.2.1: Animate scrolling to anchor links - * (c) 2016 Chris Ferdinandi + * smooth-scroll v10.3.1: Animate scrolling to anchor links + * (c) 2017 Chris Ferdinandi * MIT License * http://github.com/cferdinandi/smooth-scroll */ @@ -342,7 +342,7 @@ // Get the height of a fixed header if one exists and not already set headerHeight = getHeaderHeight( fixedHeader ); } - var endLocation = isNum ? anchor : getEndLocation( anchorElem, headerHeight, parseInt(animateSettings.offset, 10) ); // Location to scroll to + var endLocation = isNum ? anchor : getEndLocation( anchorElem, headerHeight, parseInt((typeof animateSettings.offset === 'function' ? animateSettings.offset() : animateSettings.offset), 10) ); // Location to scroll to var distance = endLocation - startLocation; // distance to travel var documentHeight = getDocumentHeight(); var timeLapsed = 0; diff --git a/docs/dist/js/smooth-scroll.min.js b/docs/dist/js/smooth-scroll.min.js index d952995..a01d8a3 100755 --- a/docs/dist/js/smooth-scroll.min.js +++ b/docs/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ -/*! smooth-scroll v10.2.1 | (c) 2016 Chris Ferdinandi | MIT License | http://github.com/cferdinandi/smooth-scroll */ -!(function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)})("undefined"!=typeof global?global:this.window||this.global,(function(e){"use strict";var t,n,o,r,a,c,l,i={},u="querySelector"in document&&"addEventListener"in e,s={selector:"[data-scroll]",selectorHeader:null,speed:500,easing:"easeInOutCubic",offset:0,callback:function(){}},d=function(){var e={},t=!1,n=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(t=arguments[0],n++);for(var r=function(n){for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(t&&"[object Object]"===Object.prototype.toString.call(n[o])?e[o]=d(!0,e[o],n[o]):e[o]=n[o])};n=0&&t.item(n)!==this;);return n>-1});e&&e!==document;e=e.parentNode)if(e.matches(t))return e;return null},m=function(e){"#"===e.charAt(0)&&(e=e.substr(1));for(var t,n=String(e),o=n.length,r=-1,a="",c=n.charCodeAt(0);++r=1&&t<=31||127==t||0===r&&t>=48&&t<=57||1===r&&t>=48&&t<=57&&45===c?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&t<=57||t>=65&&t<=90||t>=97&&t<=122?n.charAt(r):"\\"+n.charAt(r)}return"#"+a},p=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=t<.5?2*t*t:-1+(4-2*t)*t),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=t<.5?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=t<.5?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=t<.5?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},g=function(e,t,n){var o=0;if(e.offsetParent)do o+=e.offsetTop,e=e.offsetParent;while(e);return o=Math.max(o-t-n,0),Math.min(o,v()-b())},b=function(){return Math.max(document.documentElement.clientHeight,e.innerHeight||0)},v=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},y=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},O=function(e){return e?f(e)+e.offsetTop:0},S=function(t,n,o){o||(t.focus(),document.activeElement.id!==t.id&&(t.setAttribute("tabindex","-1"),t.focus(),t.style.outline="none"),e.scrollTo(0,n))};i.animateScroll=function(n,o,c){var i=y(o?o.getAttribute("data-options"):null),u=d(t||s,c||{},i),f="[object Number]"===Object.prototype.toString.call(n),h=f||!n.tagName?null:n;if(f||h){var m=e.pageYOffset;u.selectorHeader&&!r&&(r=document.querySelector(u.selectorHeader)),a||(a=O(r));var b,E,I=f?n:g(h,a,parseInt(u.offset,10)),H=I-m,A=v(),j=0,C=function(t,r,a){var c=e.pageYOffset;(t==r||c==r||e.innerHeight+c>=A)&&(clearInterval(a),S(n,r,f),u.callback(n,o))},M=function(){j+=16,b=j/parseInt(u.speed,10),b=b>1?1:b,E=m+H*p(u.easing,b),e.scrollTo(0,Math.floor(E)),C(E,I,l)},w=function(){clearInterval(l),l=setInterval(M,16)};0===e.pageYOffset&&e.scrollTo(0,0),w()}};var E=function(t){var r;try{r=m(decodeURIComponent(e.location.hash))}catch(t){r=m(e.location.hash)}n&&(n.id=n.getAttribute("data-scroll-id"),i.animateScroll(n,o),n=null,o=null)},I=function(r){if(0===r.button&&!r.metaKey&&!r.ctrlKey&&(o=h(r.target,t.selector),o&&"a"===o.tagName.toLowerCase()&&o.hostname===e.location.hostname&&o.pathname===e.location.pathname&&/#/.test(o.href))){var a;try{a=m(decodeURIComponent(o.hash))}catch(e){a=m(o.hash)}if("#"===a){r.preventDefault(),n=document.body;var c=n.id?n.id:"smooth-scroll-top";return n.setAttribute("data-scroll-id",c),n.id="",void(e.location.hash.substring(1)===c?E():e.location.hash=c)}n=document.querySelector(a),n&&(n.setAttribute("data-scroll-id",n.id),n.id="",o.hash===e.location.hash&&(r.preventDefault(),E()))}},H=function(e){c||(c=setTimeout((function(){c=null,a=O(r)}),66))};return i.destroy=function(){t&&(document.removeEventListener("click",I,!1),e.removeEventListener("resize",H,!1),t=null,n=null,o=null,r=null,a=null,c=null,l=null)},i.init=function(n){u&&(i.destroy(),t=d(s,n||{}),r=t.selectorHeader?document.querySelector(t.selectorHeader):null,a=O(r),document.addEventListener("click",I,!1),e.addEventListener("hashchange",E,!1),r&&e.addEventListener("resize",H,!1))},i})); \ No newline at end of file +/*! smooth-scroll v10.3.1 | (c) 2017 Chris Ferdinandi | MIT License | http://github.com/cferdinandi/smooth-scroll */ +!(function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)})("undefined"!=typeof global?global:this.window||this.global,(function(e){"use strict";var t,n,o,r,a,c,l,i={},u="querySelector"in document&&"addEventListener"in e,s={selector:"[data-scroll]",selectorHeader:null,speed:500,easing:"easeInOutCubic",offset:0,callback:function(){}},f=function(){var e={},t=!1,n=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(t=arguments[0],n++);for(;n=0&&t.item(n)!==this;);return n>-1});e&&e!==document;e=e.parentNode)if(e.matches(t))return e;return null},m=function(e){"#"===e.charAt(0)&&(e=e.substr(1));for(var t,n=String(e),o=n.length,r=-1,a="",c=n.charCodeAt(0);++r=1&&t<=31||127==t||0===r&&t>=48&&t<=57||1===r&&t>=48&&t<=57&&45===c?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&t<=57||t>=65&&t<=90||t>=97&&t<=122?n.charAt(r):"\\"+n.charAt(r)}return"#"+a},p=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=t<.5?2*t*t:(4-2*t)*t-1),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=t<.5?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=t<.5?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=t<.5?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},g=function(e,t,n){var o=0;if(e.offsetParent)do{o+=e.offsetTop,e=e.offsetParent}while(e);return o=Math.max(o-t-n,0),Math.min(o,y()-b())},b=function(){return Math.max(document.documentElement.clientHeight,e.innerHeight||0)},y=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},v=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},O=function(e){return e?d(e)+e.offsetTop:0},S=function(t,n,o){o||(t.focus(),document.activeElement.id!==t.id&&(t.setAttribute("tabindex","-1"),t.focus(),t.style.outline="none"),e.scrollTo(0,n))};i.animateScroll=function(n,o,c){var i=v(o?o.getAttribute("data-options"):null),u=f(t||s,c||{},i),d="[object Number]"===Object.prototype.toString.call(n),h=d||!n.tagName?null:n;if(d||h){var m=e.pageYOffset;u.selectorHeader&&!r&&(r=document.querySelector(u.selectorHeader)),a||(a=O(r));var b,E,I=d?n:g(h,a,parseInt("function"==typeof u.offset?u.offset():u.offset,10)),H=I-m,A=y(),j=0,C=function(t,r,a){var c=e.pageYOffset;(t==r||c==r||e.innerHeight+c>=A)&&(clearInterval(a),S(n,r,d),u.callback(n,o))},M=function(){j+=16,b=j/parseInt(u.speed,10),b=b>1?1:b,E=m+H*p(u.easing,b),e.scrollTo(0,Math.floor(E)),C(E,I,l)};0===e.pageYOffset&&e.scrollTo(0,0),(function(){clearInterval(l),l=setInterval(M,16)})()}};var E=function(t){try{m(decodeURIComponent(e.location.hash))}catch(t){m(e.location.hash)}n&&(n.id=n.getAttribute("data-scroll-id"),i.animateScroll(n,o),n=null,o=null)},I=function(r){if(0===r.button&&!r.metaKey&&!r.ctrlKey&&(o=h(r.target,t.selector))&&"a"===o.tagName.toLowerCase()&&o.hostname===e.location.hostname&&o.pathname===e.location.pathname&&/#/.test(o.href)){var a;try{a=m(decodeURIComponent(o.hash))}catch(e){a=m(o.hash)}if("#"===a){r.preventDefault(),n=document.body;var c=n.id?n.id:"smooth-scroll-top";return n.setAttribute("data-scroll-id",c),n.id="",void(e.location.hash.substring(1)===c?E():e.location.hash=c)}n=document.querySelector(a),n&&(n.setAttribute("data-scroll-id",n.id),n.id="",o.hash===e.location.hash&&(r.preventDefault(),E()))}},H=function(e){c||(c=setTimeout((function(){c=null,a=O(r)}),66))};return i.destroy=function(){t&&(document.removeEventListener("click",I,!1),e.removeEventListener("resize",H,!1),t=null,n=null,o=null,r=null,a=null,c=null,l=null)},i.init=function(n){u&&(i.destroy(),t=f(s,n||{}),r=t.selectorHeader?document.querySelector(t.selectorHeader):null,a=O(r),document.addEventListener("click",I,!1),e.addEventListener("hashchange",E,!1),r&&e.addEventListener("resize",H,!1))},i})); \ No newline at end of file diff --git a/package.json b/package.json index e75f674..eca9e45 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "smooth-scroll", - "version": "10.2.1", + "version": "10.3.1", "description": "Animate scrolling to anchor links", "main": "./dist/js/smooth-scroll.min.js", "author": { @@ -15,7 +15,7 @@ "devDependencies": { "gulp": "^3.9.1", "node-fs": "^0.1.7", - "del": "^2.2.0", + "del": "^2.2.2", "lazypipe": "^1.0.1", "gulp-plumber": "^1.1.0", "gulp-flatten": "^0.3.1", @@ -23,13 +23,14 @@ "gulp-rename": "^1.2.2", "gulp-header": "^1.8.8", "gulp-footer": "^1.0.5", - "gulp-watch": "^4.3.9", + "gulp-watch": "^4.3.11", "gulp-livereload": "^3.8.1", - "gulp-jshint": "^2.0.1", + "jshint": "^2.9.4", + "gulp-jshint": "^2.0.4", "jshint-stylish": "^2.2.1", - "gulp-concat": "^2.6.0", - "gulp-uglify": "^2.0.0", - "gulp-optimize-js": "^1.0.2", + "gulp-concat": "^2.6.1", + "gulp-uglify": "^2.1.2", + "gulp-optimize-js": "^1.1.0", "gulp-markdown": "^1.2.0", "gulp-file-include": "^0.14.0" } diff --git a/src/js/smooth-scroll.js b/src/js/smooth-scroll.js index 9370083..2dae938 100755 --- a/src/js/smooth-scroll.js +++ b/src/js/smooth-scroll.js @@ -335,7 +335,7 @@ // Get the height of a fixed header if one exists and not already set headerHeight = getHeaderHeight( fixedHeader ); } - var endLocation = isNum ? anchor : getEndLocation( anchorElem, headerHeight, parseInt(animateSettings.offset, 10) ); // Location to scroll to + var endLocation = isNum ? anchor : getEndLocation( anchorElem, headerHeight, parseInt((typeof animateSettings.offset === 'function' ? animateSettings.offset() : animateSettings.offset), 10) ); // Location to scroll to var distance = endLocation - startLocation; // distance to travel var documentHeight = getDocumentHeight(); var timeLapsed = 0; From 07532cb30b28e7c93354158e967dcdad952c1cf9 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Mon, 1 May 2017 17:03:39 -0400 Subject: [PATCH 186/285] v11.0.0 (#324) * Updated license to GPLv3 * Added before/after callbacks * Added custom easing pattern options * Updates to docs * Fixed typo --- CONTRIBUTING.md | 4 +- LICENSE.md | 692 ++++++++- README.md | 263 +--- dist/js/smooth-scroll.js | 30 +- dist/js/smooth-scroll.min.js | 4 +- docs/assets/css/custom.css | 176 +++ docs/assets/css/main.css | 1559 ++++++++++++++++++++ docs/assets/js/gumshoe.min.js | 2 + docs/assets/js/highlight-active-nav.js | 134 ++ docs/assets/js/prism.js | 21 + docs/assets/js/toc.js | 191 +++ docs/browsers.html | 104 ++ docs/dist/js/smooth-scroll.js | 30 +- docs/dist/js/smooth-scroll.min.js | 4 +- docs/index.html | 99 +- docs/license.html | 212 +++ docs/options.html | 241 +++ docs/setup.html | 110 ++ docs/source.html | 112 ++ gulpfile.js | 4 +- package.json | 4 +- src/docs/_templates/_footer.html | 33 +- src/docs/_templates/_header.html | 56 +- src/docs/assets/css/custom.css | 176 +++ src/docs/assets/css/main.css | 1559 ++++++++++++++++++++ src/docs/assets/js/gumshoe.min.js | 2 + src/docs/assets/js/highlight-active-nav.js | 134 ++ src/docs/assets/js/prism.js | 21 + src/docs/assets/js/toc.js | 191 +++ src/docs/browsers.md | 18 + src/docs/index.md | 8 + src/docs/license.md | 161 ++ src/docs/options.md | 191 +++ src/docs/setup.md | 30 + src/docs/source.md | 19 + src/js/smooth-scroll.js | 26 +- 36 files changed, 6280 insertions(+), 341 deletions(-) create mode 100755 docs/assets/css/custom.css create mode 100755 docs/assets/css/main.css create mode 100755 docs/assets/js/gumshoe.min.js create mode 100755 docs/assets/js/highlight-active-nav.js create mode 100755 docs/assets/js/prism.js create mode 100755 docs/assets/js/toc.js create mode 100755 docs/browsers.html mode change 100644 => 100755 docs/index.html create mode 100755 docs/license.html create mode 100755 docs/options.html create mode 100755 docs/setup.html create mode 100644 docs/source.html mode change 100644 => 100755 src/docs/_templates/_footer.html mode change 100644 => 100755 src/docs/_templates/_header.html create mode 100755 src/docs/assets/css/custom.css create mode 100755 src/docs/assets/css/main.css create mode 100755 src/docs/assets/js/gumshoe.min.js create mode 100755 src/docs/assets/js/highlight-active-nav.js create mode 100755 src/docs/assets/js/prism.js create mode 100755 src/docs/assets/js/toc.js create mode 100755 src/docs/browsers.md mode change 100644 => 100755 src/docs/index.md create mode 100755 src/docs/license.md create mode 100755 src/docs/options.md create mode 100755 src/docs/setup.md create mode 100644 src/docs/source.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c3863d1..eb80a84 100755 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,6 @@ -# How to contribute +# Bugs, Questions, and Pull Requests -I'm delighted that you're helping make this open source project better. Here are a few quick guidelines to make this an easier and better process for everyone. +A few quick guidelines to make this an easier and better process for everyone. diff --git a/LICENSE.md b/LICENSE.md index b5e8ef7..5885148 100755 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,21 +1,677 @@ -# The MIT License (MIT) +# GNU GENERAL PUBLIC LICENSE Copyright (c) Go Make Things, LLC -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. \ No newline at end of file +Version 3, 29 June 2007 + +Copyright (C) 2007 Free Software Foundation, Inc. + + +Everyone is permitted to copy and distribute verbatim copies of this +license document, but changing it is not allowed. + +### Preamble + +The GNU General Public License is a free, copyleft license for +software and other kinds of works. + +The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom +to share and change all versions of a program--to make sure it remains +free software for all its users. We, the Free Software Foundation, use +the GNU General Public License for most of our software; it applies +also to any other work released this way by its authors. You can apply +it to your programs, too. + +When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + +To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you +have certain responsibilities if you distribute copies of the +software, or if you modify it: responsibilities to respect the freedom +of others. + +For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + +Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + +For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + +Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the +manufacturer can do so. This is fundamentally incompatible with the +aim of protecting users' freedom to change the software. The +systematic pattern of such abuse occurs in the area of products for +individuals to use, which is precisely where it is most unacceptable. +Therefore, we have designed this version of the GPL to prohibit the +practice for those products. If such problems arise substantially in +other domains, we stand ready to extend this provision to those +domains in future versions of the GPL, as needed to protect the +freedom of users. + +Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish +to avoid the special danger that patents applied to a free program +could make it effectively proprietary. To prevent this, the GPL +assures that patents cannot be used to render the program non-free. + +The precise terms and conditions for copying, distribution and +modification follow. + +### TERMS AND CONDITIONS + +#### 0. Definitions. + +"This License" refers to version 3 of the GNU General Public License. + +"Copyright" also means copyright-like laws that apply to other kinds +of works, such as semiconductor masks. + +"The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + +To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of +an exact copy. The resulting work is called a "modified version" of +the earlier work or a work "based on" the earlier work. + +A "covered work" means either the unmodified Program or a work based +on the Program. + +To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + +To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user +through a computer network, with no transfer of a copy, is not +conveying. + +An interactive user interface displays "Appropriate Legal Notices" to +the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + +#### 1. Source Code. + +The "source code" for a work means the preferred form of the work for +making modifications to it. "Object code" means any non-source form of +a work. + +A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + +The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + +The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + +The Corresponding Source need not include anything that users can +regenerate automatically from other parts of the Corresponding Source. + +The Corresponding Source for a work in source code form is that same +work. + +#### 2. Basic Permissions. + +All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + +You may make, run and propagate covered works that you do not convey, +without conditions so long as your license otherwise remains in force. +You may convey covered works to others for the sole purpose of having +them make modifications exclusively for you, or provide you with +facilities for running those works, provided that you comply with the +terms of this License in conveying all material for which you do not +control copyright. Those thus making or running the covered works for +you must do so exclusively on your behalf, under your direction and +control, on terms that prohibit them from making any copies of your +copyrighted material outside their relationship with you. + +Conveying under any other circumstances is permitted solely under the +conditions stated below. Sublicensing is not allowed; section 10 makes +it unnecessary. + +#### 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + +No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + +When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such +circumvention is effected by exercising rights under this License with +respect to the covered work, and you disclaim any intention to limit +operation or modification of the work as a means of enforcing, against +the work's users, your or third parties' legal rights to forbid +circumvention of technological measures. + +#### 4. Conveying Verbatim Copies. + +You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + +You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + +#### 5. Conveying Modified Source Versions. + +You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these +conditions: + +- a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. +- b) The work must carry prominent notices stating that it is + released under this License and any conditions added under + section 7. This requirement modifies the requirement in section 4 + to "keep intact all notices". +- c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. +- d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + +A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + +#### 6. Conveying Non-Source Forms. + +You may convey a covered work in object code form under the terms of +sections 4 and 5, provided that you also convey the machine-readable +Corresponding Source under the terms of this License, in one of these +ways: + +- a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. +- b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the Corresponding + Source from a network server at no charge. +- c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. +- d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. +- e) Convey the object code using peer-to-peer transmission, + provided you inform other peers where the object code and + Corresponding Source of the work are being offered to the general + public at no charge under subsection 6d. + +A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + +A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, +family, or household purposes, or (2) anything designed or sold for +incorporation into a dwelling. In determining whether a product is a +consumer product, doubtful cases shall be resolved in favor of +coverage. For a particular product received by a particular user, +"normally used" refers to a typical or common use of that class of +product, regardless of the status of the particular user or of the way +in which the particular user actually uses, or expects or is expected +to use, the product. A product is a consumer product regardless of +whether the product has substantial commercial, industrial or +non-consumer uses, unless such uses represent the only significant +mode of use of the product. + +"Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to +install and execute modified versions of a covered work in that User +Product from a modified version of its Corresponding Source. The +information must suffice to ensure that the continued functioning of +the modified object code is in no case prevented or interfered with +solely because modification has been made. + +If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + +The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or +updates for a work that has been modified or installed by the +recipient, or for the User Product in which it has been modified or +installed. Access to a network may be denied when the modification +itself materially and adversely affects the operation of the network +or violates the rules and protocols for communication across the +network. + +Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + +#### 7. Additional Terms. + +"Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + +When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + +Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders +of that material) supplement the terms of this License with terms: + +- a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or +- b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or +- c) Prohibiting misrepresentation of the origin of that material, + or requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or +- d) Limiting the use for publicity purposes of names of licensors + or authors of the material; or +- e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or +- f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions + of it) with contractual assumptions of liability to the recipient, + for any liability that these contractual assumptions directly + impose on those licensors and authors. + +All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + +If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + +Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; the +above requirements apply either way. + +#### 8. Termination. + +You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + +However, if you cease all violation of this License, then your license +from a particular copyright holder is reinstated (a) provisionally, +unless and until the copyright holder explicitly and finally +terminates your license, and (b) permanently, if the copyright holder +fails to notify you of the violation by some reasonable means prior to +60 days after the cessation. + +Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + +Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + +#### 9. Acceptance Not Required for Having Copies. + +You are not required to accept this License in order to receive or run +a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + +#### 10. Automatic Licensing of Downstream Recipients. + +Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + +An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + +You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + +#### 11. Patents. + +A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + +A contributor's "essential patent claims" are all patent claims owned +or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + +Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + +In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + +If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + +If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + +A patent license is "discriminatory" if it does not include within the +scope of its coverage, prohibits the exercise of, or is conditioned on +the non-exercise of one or more of the rights that are specifically +granted under this License. You may not convey a covered work if you +are a party to an arrangement with a third party that is in the +business of distributing software, under which you make payment to the +third party based on the extent of your activity of conveying the +work, and under which the third party grants, to any of the parties +who would receive the covered work from you, a discriminatory patent +license (a) in connection with copies of the covered work conveyed by +you (or copies made from those copies), or (b) primarily for and in +connection with specific products or compilations that contain the +covered work, unless you entered into that arrangement, or that patent +license was granted, prior to 28 March 2007. + +Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + +#### 12. No Surrender of Others' Freedom. + +If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under +this License and any other pertinent obligations, then as a +consequence you may not convey it at all. For example, if you agree to +terms that obligate you to collect a royalty for further conveying +from those to whom you convey the Program, the only way you could +satisfy both those terms and this License would be to refrain entirely +from conveying the Program. + +#### 13. Use with the GNU Affero General Public License. + +Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + +#### 14. Revised Versions of this License. + +The Free Software Foundation may publish revised and/or new versions +of the GNU General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in +detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies that a certain numbered version of the GNU General Public +License "or any later version" applies to it, you have the option of +following the terms and conditions either of that numbered version or +of any later version published by the Free Software Foundation. If the +Program does not specify a version number of the GNU General Public +License, you may choose any version ever published by the Free +Software Foundation. + +If the Program specifies that a proxy can decide which future versions +of the GNU General Public License can be used, that proxy's public +statement of acceptance of a version permanently authorizes you to +choose that version for the Program. + +Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + +#### 15. Disclaimer of Warranty. + +THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT +WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND +PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE +DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR +CORRECTION. + +#### 16. Limitation of Liability. + +IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR +CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES +ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT +NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR +LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM +TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER +PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +#### 17. Interpretation of Sections 15 and 16. + +If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + +END OF TERMS AND CONDITIONS + +### How to Apply These Terms to Your New Programs + +If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these +terms. + +To do so, attach the following notices to the program. It is safest to +attach them to the start of each source file to most effectively state +the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) 2017 Go Make Things, LLC + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper +mail. + +If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) 2017 Go Make Things, LLC + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands \`show w' and \`show c' should show the +appropriate parts of the General Public License. Of course, your +program's commands might be different; for a GUI interface, you would +use an "about box". + +You should also get your employer (if you work as a programmer) or +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. For more information on this, and how to apply and follow +the GNU GPL, see . + +The GNU General Public License does not permit incorporating your +program into proprietary programs. If your program is a subroutine +library, you may consider it more useful to permit linking proprietary +applications with the library. If this is what you want to do, use the +GNU Lesser General Public License instead of this License. But first, +please read . \ No newline at end of file diff --git a/README.md b/README.md index 73cdd4d..ee4711b 100755 --- a/README.md +++ b/README.md @@ -1,269 +1,14 @@ # Smooth Scroll [![Build Status](https://travis-ci.org/cferdinandi/smooth-scroll.svg)](https://travis-ci.org/cferdinandi/smooth-scroll) -A lightweight script to animate scrolling to anchor links. Smooth Scroll works great with [Gumshoe](https://github.com/cferdinandi/gumshoe). - -[Download Smooth Scroll](https://github.com/cferdinandi/smooth-scroll/archive/master.zip) / [View the demo](http://cferdinandi.github.io/smooth-scroll/) - - -
- -### Want to learn how to write your own vanilla JS plugins? Check out ["The Vanilla JS Guidebook"](https://gomakethings.com/vanilla-js-guidebook/) and level-up as a web developer. 🚀 - -
- - - -## Getting Started - -Compiled and production-ready code can be found in the `dist` directory. The `src` directory contains development code. - -### 1. Include Smooth Scroll on your site. - -```html - -``` - -### 2. Add the markup to your HTML. - -Turn anchor links into Smooth Scroll links by adding the `[data-scroll]` data attribute. Give the anchor location an ID just like you normally would. - -```html -Anchor Link -... -Bazinga! -``` - -### 3. Initialize Smooth Scroll. - -In the footer of your page, after the content, initialize Smooth Scroll. And that's it, you're done. Nice work! - -```html - -``` - - - -## Installing with Package Managers - -You can install Smooth Scroll with your favorite package manager. - -* **[NPM](https://www.npmjs.org/):** `npm install cferdinandi/smooth-scroll` -* **[Bower](http://bower.io/):** `bower install https://github.com/cferdinandi/smooth-scroll.git` -* **[Component](http://component.io/):** `component install cferdinandi/smooth-scroll` - - - -## Working with the Source Files - -If you would prefer, you can work with the development code in the `src` directory using the included [Gulp build system](http://gulpjs.com/). This compiles, lints, and minifies code. - -### Dependencies -Make sure these are installed first. - -* [Node.js](http://nodejs.org) -* [Gulp](http://gulpjs.com) `sudo npm install -g gulp` - -### Quick Start - -1. In bash/terminal/command line, `cd` into your project directory. -2. Run `npm install` to install required files. -3. When it's done installing, run one of the task runners to get going: - * `gulp` manually compiles files. - * `gulp watch` automatically compiles files when changes are made and applies changes using [LiveReload](http://livereload.com/). - - - -## Options and Settings - -Smooth Scroll includes smart defaults and works right out of the box. But if you want to customize things, it also has a robust API that provides multiple ways for you to adjust the default options and settings. - -### Global Settings - -You can pass options and callbacks into Smooth Scroll through the `init()` function: - -```javascript -smoothScroll.init({ - selector: '[data-scroll]', // Selector for links (must be a class, ID, data attribute, or element tag) - selectorHeader: null, // Selector for fixed headers (must be a valid CSS selector) [optional] - speed: 500, // Integer. How fast to complete the scroll in milliseconds - easing: 'easeInOutCubic', // Easing pattern to use - offset: 0, // Integer or Function returning an integer. How far to offset the scrolling anchor location in pixels - callback: function ( anchor, toggle ) {} // Function to run after scrolling -}); -``` - -***Note:*** *To programatically add Smooth Scroll to all anchor links on a page, pass `selector: 'a[href^="#"]'` into `init`.* - -#### Easing Options - -**Linear** -*Moves at the same speed from start to finish.* - -* `Linear` - - -**Ease-In** -*Gradually increases in speed.* - -* `easeInQuad` -* `easeInCubic` -* `easeInQuart` -* `easeInQuint` - - -**Ease-In-Out** -*Gradually increases in speed, peaks, and then gradually slows down.* - -* `easeInOutQuad` -* `easeInOutCubic` -* `easeInOutQuart` -* `easeInOutQuint` - - -**Ease-Out** -*Gradually decreases in speed.* - -* `easeOutQuad` -* `easeOutCubic` -* `easeOutQuart` -* `easeOutQuint` - - -Learn more about the different easing patterns and what they do at [easings.net](http://easings.net/). - -### Override settings with data attributes - -Smooth Scroll also lets you override global settings on a link-by-link basis using the `[data-options]` data attribute. - -```html - - Anchor Link - -``` - -***Note:*** *You must use [valid JSON](http://jsonlint.com/) in order for the `data-options` feature to work. Does not support the `callback` method.* - -### Use Smooth Scroll events in your own scripts - -You can also call Smooth Scroll's scroll animation events in your own scripts. - -#### animateScroll() -Animate scrolling to an anchor. - -```javascript -smoothScroll.animateScroll( - anchor, // Node to scroll to. ex. document.querySelector( '#bazinga' ) - toggle, // Node that toggles the animation, OR an integer. ex. document.querySelector( '#toggle' ) - options // Classes and callbacks. Same options as those passed into the init() function. -); -``` - -**Example 1** - -```javascript -var anchor = document.querySelector( '#bazinga' ); -smoothScroll.animateScroll( anchor ); -``` - -**Example 2** - -```javascript -var anchor = document.querySelector( '#bazinga' ); -var toggle = document.querySelector('#toggle'); -var options = { speed: 1000, easing: 'easeOutCubic' }; -smoothScroll.animateScroll( anchor, toggle, options ); -``` - -**Example 3** - -```javascript -// You can optionally pass in a y-position to scroll to as an integer -smoothScroll.animateScroll( 750 ); -``` - -#### destroy() -Destroy the current `smoothScroll.init()`. This is called automatically during the `init` function to remove any existing initializations. - -```javascript -smoothScroll.destroy(); -``` - - -### Fixed Headers - -If you're using a fixed header, Smooth Scroll will automatically offset scroll distances by the header height. Pass in a valid CSS selector for your fixed header as an option to the `init`. - -If you have multiple fixed headers, pass in the last one in the markup. - -```html - -... - -``` - -### Animating links to other pages - -This is an often requested feature, but Smooth Scroll does not include an option to animate scrolling to links on other pages. - -You can attempt to implement it using the API, but it's very difficult to prevent the automatic browser jump when the page loads, and anything I've done to work around it results in weird, janky issues, so I've decided to leave this out of the core. Here's a potential workaround... - -1. Do *not* add the `data-scroll` attribute to links to other pages. Treat them like normal links, and include your anchor link hash as normal. - - ```html - - ``` -2. Add the following script to the footer of your page, after the `smoothScroll.init()` function. - - ```html - - ``` - - -## Browser Compatibility - -Smooth Scroll works in all modern browsers, and IE 9 and above. - -Smooth Scroll is built with modern JavaScript APIs, and uses progressive enhancement. If the JavaScript file fails to load, or if your site is viewed on older and less capable browsers, anchor links will jump the way they normally would. - - -## Known Issues - -### `` styling - -If the `` element has been assigned a height of `100%` or `overflow: hidden`, Smooth Scroll is unable to properly calculate page distances and will not scroll to the right location. The `` element can have a fixed, non-percentage based height (ex. `500px`), or a height of `auto`, and an `overflow` of `visible`. - -### Animating from the bottom - -Animated scrolling links at the very bottom of the page (example: a "scroll to top" link) will stop animated almost immediately after they start when using certain easing patterns. This is an issue that's been around for a while and I've yet to find a good fix for it. I've found that `easeOut*` easing patterns work as expected, but other patterns can cause issues. [See this discussion for more details.](https://github.com/cferdinandi/smooth-scroll/issues/49) +A lightweight script to animate scrolling to anchor links. Smooth Scroll works great with [Gumshoe](https://github.com/cferdinandi/gumshoe). +[View the demo and documentation to get started](http://cferdinandi.github.com/smooth-scroll/). ## How to Contribute -Please review the [contributing guidelines](CONTRIBUTING.md). - +Please review the [contributing guidelines](CONTRIBUTING.md). ## License -The code is available under the [MIT License](LICENSE.md). \ No newline at end of file +The code is available under the [GPLv3 License](LICENSE.md) or a [Commercial License](https://cferdinandi.github.io/smooth-scroll/license#commercial-license). \ No newline at end of file diff --git a/dist/js/smooth-scroll.js b/dist/js/smooth-scroll.js index 3439579..bf4e1a8 100755 --- a/dist/js/smooth-scroll.js +++ b/dist/js/smooth-scroll.js @@ -1,7 +1,7 @@ /*! - * smooth-scroll v10.3.1: Animate scrolling to anchor links + * smooth-scroll v11.0.0: Animate scrolling to anchor links * (c) 2017 Chris Ferdinandi - * MIT License + * GPL-3.0 License * http://github.com/cferdinandi/smooth-scroll */ @@ -27,12 +27,19 @@ // Default settings var defaults = { + // Selectors selector: '[data-scroll]', selectorHeader: null, + + // Speed & Easing speed: 500, - easing: 'easeInOutCubic', offset: 0, - callback: function () {} + easing: 'easeInOutCubic', + easingPatterns: {}, + + // Callback API + before: function () {}, + after: function () {} }; @@ -219,6 +226,8 @@ */ var easingPattern = function ( type, time ) { var pattern; + + // Default Easing Patterns if ( type === 'easeInQuad' ) pattern = time * time; // accelerating from zero velocity if ( type === 'easeOutQuad' ) pattern = time * (2 - time); // decelerating to zero velocity if ( type === 'easeInOutQuad' ) pattern = time < 0.5 ? 2 * time * time : -1 + (4 - 2 * time) * time; // acceleration until halfway, then deceleration @@ -231,6 +240,14 @@ if ( type === 'easeInQuint' ) pattern = time * time * time * time * time; // accelerating from zero velocity if ( type === 'easeOutQuint' ) pattern = 1 + (--time) * time * time * time * time; // decelerating to zero velocity if ( type === 'easeInOutQuint' ) pattern = time < 0.5 ? 16 * time * time * time * time * time : 1 + 16 * (--time) * time * time * time * time; // acceleration until halfway, then deceleration + + // Custom Easing Patterns + if ( settings.easingPatterns[type] ) { + pattern = settings.easingPatterns[type]( time ); + } + + console.log(pattern || time); + return pattern || time; // no easing, no acceleration }; @@ -366,7 +383,7 @@ adjustFocus( anchor, endLocation, isNum ); // Run callback after animation complete - animateSettings.callback( anchor, toggle ); + animateSettings.after( anchor, toggle ); } }; @@ -401,6 +418,9 @@ root.scrollTo( 0, 0 ); } + // Run callback before animation starts + animateSettings.before( anchor, toggle ); + // Start scrolling animation startAnimateScroll(); diff --git a/dist/js/smooth-scroll.min.js b/dist/js/smooth-scroll.min.js index a01d8a3..5161d16 100755 --- a/dist/js/smooth-scroll.min.js +++ b/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ -/*! smooth-scroll v10.3.1 | (c) 2017 Chris Ferdinandi | MIT License | http://github.com/cferdinandi/smooth-scroll */ -!(function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)})("undefined"!=typeof global?global:this.window||this.global,(function(e){"use strict";var t,n,o,r,a,c,l,i={},u="querySelector"in document&&"addEventListener"in e,s={selector:"[data-scroll]",selectorHeader:null,speed:500,easing:"easeInOutCubic",offset:0,callback:function(){}},f=function(){var e={},t=!1,n=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(t=arguments[0],n++);for(;n=0&&t.item(n)!==this;);return n>-1});e&&e!==document;e=e.parentNode)if(e.matches(t))return e;return null},m=function(e){"#"===e.charAt(0)&&(e=e.substr(1));for(var t,n=String(e),o=n.length,r=-1,a="",c=n.charCodeAt(0);++r=1&&t<=31||127==t||0===r&&t>=48&&t<=57||1===r&&t>=48&&t<=57&&45===c?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&t<=57||t>=65&&t<=90||t>=97&&t<=122?n.charAt(r):"\\"+n.charAt(r)}return"#"+a},p=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=t<.5?2*t*t:(4-2*t)*t-1),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=t<.5?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=t<.5?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=t<.5?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},g=function(e,t,n){var o=0;if(e.offsetParent)do{o+=e.offsetTop,e=e.offsetParent}while(e);return o=Math.max(o-t-n,0),Math.min(o,y()-b())},b=function(){return Math.max(document.documentElement.clientHeight,e.innerHeight||0)},y=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},v=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},O=function(e){return e?d(e)+e.offsetTop:0},S=function(t,n,o){o||(t.focus(),document.activeElement.id!==t.id&&(t.setAttribute("tabindex","-1"),t.focus(),t.style.outline="none"),e.scrollTo(0,n))};i.animateScroll=function(n,o,c){var i=v(o?o.getAttribute("data-options"):null),u=f(t||s,c||{},i),d="[object Number]"===Object.prototype.toString.call(n),h=d||!n.tagName?null:n;if(d||h){var m=e.pageYOffset;u.selectorHeader&&!r&&(r=document.querySelector(u.selectorHeader)),a||(a=O(r));var b,E,I=d?n:g(h,a,parseInt("function"==typeof u.offset?u.offset():u.offset,10)),H=I-m,A=y(),j=0,C=function(t,r,a){var c=e.pageYOffset;(t==r||c==r||e.innerHeight+c>=A)&&(clearInterval(a),S(n,r,d),u.callback(n,o))},M=function(){j+=16,b=j/parseInt(u.speed,10),b=b>1?1:b,E=m+H*p(u.easing,b),e.scrollTo(0,Math.floor(E)),C(E,I,l)};0===e.pageYOffset&&e.scrollTo(0,0),(function(){clearInterval(l),l=setInterval(M,16)})()}};var E=function(t){try{m(decodeURIComponent(e.location.hash))}catch(t){m(e.location.hash)}n&&(n.id=n.getAttribute("data-scroll-id"),i.animateScroll(n,o),n=null,o=null)},I=function(r){if(0===r.button&&!r.metaKey&&!r.ctrlKey&&(o=h(r.target,t.selector))&&"a"===o.tagName.toLowerCase()&&o.hostname===e.location.hostname&&o.pathname===e.location.pathname&&/#/.test(o.href)){var a;try{a=m(decodeURIComponent(o.hash))}catch(e){a=m(o.hash)}if("#"===a){r.preventDefault(),n=document.body;var c=n.id?n.id:"smooth-scroll-top";return n.setAttribute("data-scroll-id",c),n.id="",void(e.location.hash.substring(1)===c?E():e.location.hash=c)}n=document.querySelector(a),n&&(n.setAttribute("data-scroll-id",n.id),n.id="",o.hash===e.location.hash&&(r.preventDefault(),E()))}},H=function(e){c||(c=setTimeout((function(){c=null,a=O(r)}),66))};return i.destroy=function(){t&&(document.removeEventListener("click",I,!1),e.removeEventListener("resize",H,!1),t=null,n=null,o=null,r=null,a=null,c=null,l=null)},i.init=function(n){u&&(i.destroy(),t=f(s,n||{}),r=t.selectorHeader?document.querySelector(t.selectorHeader):null,a=O(r),document.addEventListener("click",I,!1),e.addEventListener("hashchange",E,!1),r&&e.addEventListener("resize",H,!1))},i})); \ No newline at end of file +/*! smooth-scroll v11.0.0 | (c) 2017 Chris Ferdinandi | GPL-3.0 License | http://github.com/cferdinandi/smooth-scroll */ +!(function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)})("undefined"!=typeof global?global:this.window||this.global,(function(e){"use strict";var t,n,o,r,a,c,i,l={},u="querySelector"in document&&"addEventListener"in e,s={selector:"[data-scroll]",selectorHeader:null,speed:500,offset:0,easing:"easeInOutCubic",easingPatterns:{},before:function(){},after:function(){}},f=function(){var e={},t=!1,n=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(t=arguments[0],n++);for(;n=0&&t.item(n)!==this;);return n>-1});e&&e!==document;e=e.parentNode)if(e.matches(t))return e;return null},m=function(e){"#"===e.charAt(0)&&(e=e.substr(1));for(var t,n=String(e),o=n.length,r=-1,a="",c=n.charCodeAt(0);++r=1&&t<=31||127==t||0===r&&t>=48&&t<=57||1===r&&t>=48&&t<=57&&45===c?a+="\\"+t.toString(16)+" ":a+=t>=128||45===t||95===t||t>=48&&t<=57||t>=65&&t<=90||t>=97&&t<=122?n.charAt(r):"\\"+n.charAt(r)}return"#"+a},p=function(e,n){var o;return"easeInQuad"===e&&(o=n*n),"easeOutQuad"===e&&(o=n*(2-n)),"easeInOutQuad"===e&&(o=n<.5?2*n*n:(4-2*n)*n-1),"easeInCubic"===e&&(o=n*n*n),"easeOutCubic"===e&&(o=--n*n*n+1),"easeInOutCubic"===e&&(o=n<.5?4*n*n*n:(n-1)*(2*n-2)*(2*n-2)+1),"easeInQuart"===e&&(o=n*n*n*n),"easeOutQuart"===e&&(o=1- --n*n*n*n),"easeInOutQuart"===e&&(o=n<.5?8*n*n*n*n:1-8*--n*n*n*n),"easeInQuint"===e&&(o=n*n*n*n*n),"easeOutQuint"===e&&(o=1+--n*n*n*n*n),"easeInOutQuint"===e&&(o=n<.5?16*n*n*n*n*n:1+16*--n*n*n*n*n),t.easingPatterns[e]&&(o=t.easingPatterns[e](n)),console.log(o||n),o||n},g=function(e,t,n){var o=0;if(e.offsetParent)do{o+=e.offsetTop,e=e.offsetParent}while(e);return o=Math.max(o-t-n,0),Math.min(o,y()-b())},b=function(){return Math.max(document.documentElement.clientHeight,e.innerHeight||0)},y=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},v=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},O=function(e){return e?d(e)+e.offsetTop:0},S=function(t,n,o){o||(t.focus(),document.activeElement.id!==t.id&&(t.setAttribute("tabindex","-1"),t.focus(),t.style.outline="none"),e.scrollTo(0,n))};l.animateScroll=function(n,o,c){var l=v(o?o.getAttribute("data-options"):null),u=f(t||s,c||{},l),d="[object Number]"===Object.prototype.toString.call(n),h=d||!n.tagName?null:n;if(d||h){var m=e.pageYOffset;u.selectorHeader&&!r&&(r=document.querySelector(u.selectorHeader)),a||(a=O(r));var b,E,I=d?n:g(h,a,parseInt("function"==typeof u.offset?u.offset():u.offset,10)),H=I-m,A=y(),j=0,C=function(t,r,a){var c=e.pageYOffset;(t==r||c==r||e.innerHeight+c>=A)&&(clearInterval(a),S(n,r,d),u.after(n,o))},M=function(){j+=16,b=j/parseInt(u.speed,10),b=b>1?1:b,E=m+H*p(u.easing,b),e.scrollTo(0,Math.floor(E)),C(E,I,i)};0===e.pageYOffset&&e.scrollTo(0,0),u.before(n,o),(function(){clearInterval(i),i=setInterval(M,16)})()}};var E=function(t){try{m(decodeURIComponent(e.location.hash))}catch(t){m(e.location.hash)}n&&(n.id=n.getAttribute("data-scroll-id"),l.animateScroll(n,o),n=null,o=null)},I=function(r){if(0===r.button&&!r.metaKey&&!r.ctrlKey&&(o=h(r.target,t.selector))&&"a"===o.tagName.toLowerCase()&&o.hostname===e.location.hostname&&o.pathname===e.location.pathname&&/#/.test(o.href)){var a;try{a=m(decodeURIComponent(o.hash))}catch(e){a=m(o.hash)}if("#"===a){r.preventDefault(),n=document.body;var c=n.id?n.id:"smooth-scroll-top";return n.setAttribute("data-scroll-id",c),n.id="",void(e.location.hash.substring(1)===c?E():e.location.hash=c)}n=document.querySelector(a),n&&(n.setAttribute("data-scroll-id",n.id),n.id="",o.hash===e.location.hash&&(r.preventDefault(),E()))}},H=function(e){c||(c=setTimeout((function(){c=null,a=O(r)}),66))};return l.destroy=function(){t&&(document.removeEventListener("click",I,!1),e.removeEventListener("resize",H,!1),t=null,n=null,o=null,r=null,a=null,c=null,i=null)},l.init=function(n){u&&(l.destroy(),t=f(s,n||{}),r=t.selectorHeader?document.querySelector(t.selectorHeader):null,a=O(r),document.addEventListener("click",I,!1),e.addEventListener("hashchange",E,!1),r&&e.addEventListener("resize",H,!1))},l})); \ No newline at end of file diff --git a/docs/assets/css/custom.css b/docs/assets/css/custom.css new file mode 100755 index 0000000..dbe16cd --- /dev/null +++ b/docs/assets/css/custom.css @@ -0,0 +1,176 @@ +/** + * Typography + */ + +body { + font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif; +} + +h1, h2, h3, h4, h5, h6 { + font-weight: bold; +} + + +/** + * Background color + */ + +@media (min-width: 40em) { + body { + background-image: -webkit-linear-gradient(left, #f7f7f7 0%, #f7f7f7 25%, transparent 25%, transparent 100%); + background-image: linear-gradient(to right, #f7f7f7 0, #f7f7f7 25%, transparent 25%, transparent 100%); + } +} + + +/** + * Navigation + */ + +@media (max-width: 40em) { + .list-nav { + margin-left: -0.25em; + margin-right: -0.25em; + padding: 0; + } + + .list-nav > li { + display: inline-block; + margin-left: 0.25em; + margin-right: 0.25em; + } + + .list-nav > li:before { + content: "\00b7"; + margin-right: 0.5em; + } + + .list-nav > li:first-child:before { + content: ""; + margin-right: 0; + } +} + +@media (max-width: 40em) { + .nav { + border-bottom: 1px solid #e5e5e5; + } +} + +.nav-section a.active { + color: #808080; +} + +/* Disable current page nav */ +a.nav-active { + pointer-events: none; + color: #808080; + cursor: not-allowed; +} + +/* Sticky nav */ +@media (min-width: 40em) { + .sticky-header { + background-color: #f7f7f7; + bottom: 0; + overflow-y: auto; + position: fixed; + top: 0; + width: 22.2%; + } + + .sticky-body { + margin-left: 27.8%; + } +} + +@media (min-width: 80em) { + .sticky-header { + width: 17.75em; + } +} + + +/** + * Buttons + */ + +.btn { + background-color: #f7272f; + border-color: #f7272f; +} + +a.btn:active, +a.btn:focus, +a.btn:hover { + background-color: #cb070e; + border-color: #cb070e; +} + + + +/** + * Prism + * Code syntax highlighting by Lea Verou. + * http://prismjs.com/ + */ + +@media screen { + + .token.comment, + .token.prolog, + .token.doctype, + .token.cdata { + color: slategray; + } + + .token.punctuation { + color: #999; + } + + .token.property, + .token.tag, + .token.boolean, + .token.number, + .token.constant, + .token.symbol { + color: #905; + } + + .token.selector, + .token.attr-name, + .token.string, + .token.builtin { + color: #690; + } + + .token.operator, + .token.entity, + .token.url, + .language-css .token.string, + .style .token.string, + .token.variable { + color: #a67f59; + } + + .token.atrule, + .token.attr-value, + .token.keyword { + color: #07a; + } + + + .token.regex, + .token.important { + color: #e90; + } + + .token.important { + font-weight: bold; + } + + .token.entity { + cursor: help; + } + +} \ No newline at end of file diff --git a/docs/assets/css/main.css b/docs/assets/css/main.css new file mode 100755 index 0000000..7e5a18f --- /dev/null +++ b/docs/assets/css/main.css @@ -0,0 +1,1559 @@ +/*! + * Kraken v7.5.2: A lightweight front-end boilerplate + * (c) 2017 Chris Ferdinandi + * MIT License + * http://github.com/cferdinandi/kraken + */ + +/** + * @section Normalize.css + * Normalize.css base with custom code. + * Additional normalize styles incorporated throughout components. + * @link http://necolas.github.io/normalize.css/ + */ +/** + * Mobile screen resizing + * @link http://dev.w3.org/csswg/css-device-adapt/ + */ +@-webkit-viewport { + width: device-width; + zoom: 1.0; +} + +@-moz-viewport { + width: device-width; + zoom: 1.0; +} + +@-ms-viewport { + width: device-width; + zoom: 1.0; +} + +@-o-viewport { + width: device-width; + zoom: 1.0; +} + +@viewport { + width: device-width; + zoom: 1.0; +} + +/** + * Remove the tap delay in webkit + * @link https://medium.com/@adactio/delay-a9df9edceef3#.7dmbl3xow + */ +/* line 23, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_normalize.scss */ +a, .link-block-styled, +button, +input, +select, +textarea, +label, +summary { + -ms-touch-action: manipulation; + touch-action: manipulation; +} + +/** + * Add box sizing to everything + * @link http://www.paulirish.com/2012/box-sizing-border-box-ftw/ + */ +/* line 38, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_normalize.scss */ +*, +*:before, +*:after { + box-sizing: border-box; +} + +/** + * 1. Set default font family to default. + * 2. Force scrollbar display to prevent jumping on pages. + * 3. Prevent iOS text size adjust after orientation change, without disabling + * user zoom. + */ +/* line 51, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_normalize.scss */ +html { + font-family: "Helvetica Neue", Arial, sans-serif; + /* 1 */ + overflow-y: scroll; + /* 2 */ + -webkit-text-size-adjust: 100%; + -ms-text-size-adjust: 100%; + text-size-adjust: 100%; + /* 3 */ +} + +/** + * Remove default margin. + */ +/* line 60, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_normalize.scss */ +body { + margin: 0; +} + +/** + * Correct `block` display not defined for any HTML5 element in IE 8/9. + * Correct `block` display not defined for `details` in IE 10/11 + * and Firefox. + * Correct `block` display not defined for `main` in IE 11. + */ +/* line 70, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_normalize.scss */ +article, +aside, +cite, +details, +figcaption, +figure, +footer, +header, +hgroup, +main, +menu, +nav, +section { + display: block; +} + +/* + * Add the correct display in all browsers. + */ +/* line 89, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_normalize.scss */ +summary { + display: list-item; +} + +/** + * Correct `inline-block` display not defined in IE 8/9. + */ +/* line 96, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_normalize.scss */ +audio, +canvas, +progress, +video { + display: inline-block; + /* 1 */ +} + +/** + * Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera. + */ +/* line 106, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_normalize.scss */ +progress { + vertical-align: baseline; +} + +/** + * Prevent modern browsers from displaying `audio` without controls. + * Remove excess height in iOS 5 devices. + */ +/* line 114, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_normalize.scss */ +audio:not([controls]) { + display: none; + height: 0; +} + +/** + * Prevent img and video elements from spilling outside of the page on smaller screens. + */ +/* line 122, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_normalize.scss */ +img, +video { + max-width: 100%; + height: auto; +} + +/** + * Prevent iframe, object, and embed elements from spilling outside of the page on smaller screens. + * height: auto causes iframes to smush, so it's omitted here. + */ +/* line 132, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_normalize.scss */ +iframe, +object, +embed { + max-width: 100%; +} + +/** + * Hide the template element in IE, Safari, and Firefox < 22. + */ +/** + * 1. Remove border when inside `a` element in IE 8/9/10. + * 2. Prevents IE from making scaled images look like crap + */ +/* line 149, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_normalize.scss */ +img { + border: 0; + /* 1 */ + -ms-interpolation-mode: bicubic; + /* 2 */ +} + +/** + * Correct overflow not hidden in IE 9/10/11. + */ +/* line 157, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_normalize.scss */ +svg:not(:root) { + overflow: hidden; +} + +/** + * Address inconsistent margin. + */ +/* line 164, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_normalize.scss */ +figure { + margin: 0; +} + +/** + * @workaround Remove focus from
element when using tabindex="-1" hack for skipnav link + * @link https://code.google.com/p/chromium/issues/detail?id=37721 + */ +/* line 172, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_normalize.scss */ +.tabindex:focus { + outline: none; +} + +/** + * @section Grid + * Structure and layout + */ +/** + * Base grid styles: single column + */ +/* line 9, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_grid.scss */ +.container { + margin-left: auto; + margin-right: auto; + max-width: 80em; + width: 88%; +} + +/* line 16, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_grid.scss */ +.row { + margin-left: -1.4%; + margin-right: -1.4%; +} + +/* line 21, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_grid.scss */ +.grid-fourth, .grid-third, .grid-half, .grid-two-thirds, .grid-three-fourths, .grid-full, .grid-dynamic { + float: left; + padding-left: 1.4%; + padding-right: 1.4%; + width: 100%; +} + +/** + * Reverses order of grid for content choreography + */ +/* line 38, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_grid.scss */ +.grid-flip { + float: right; +} + +/** + * Add columns to grid on bigger screens + */ +@media (min-width: 20em) { + /* line 49, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_grid.scss */ + .row-start-xsmall .grid-fourth { + width: 25%; + } + /* line 49, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_grid.scss */ + .row-start-xsmall .grid-third { + width: 33.33333%; + } + /* line 49, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_grid.scss */ + .row-start-xsmall .grid-half { + width: 50%; + } + /* line 49, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_grid.scss */ + .row-start-xsmall .grid-two-thirds { + width: 66.66667%; + } + /* line 49, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_grid.scss */ + .row-start-xsmall .grid-three-fourths { + width: 75%; + } + /* line 49, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_grid.scss */ + .row-start-xsmall .grid-full { + width: 100%; + } +} + +@media (min-width: 30em) { + /* line 49, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_grid.scss */ + .row-start-small .grid-fourth { + width: 25%; + } + /* line 49, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_grid.scss */ + .row-start-small .grid-third { + width: 33.33333%; + } + /* line 49, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_grid.scss */ + .row-start-small .grid-half { + width: 50%; + } + /* line 49, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_grid.scss */ + .row-start-small .grid-two-thirds { + width: 66.66667%; + } + /* line 49, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_grid.scss */ + .row-start-small .grid-three-fourths { + width: 75%; + } + /* line 49, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_grid.scss */ + .row-start-small .grid-full { + width: 100%; + } +} + +@media (min-width: 40em) { + /* line 49, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_grid.scss */ + .grid-fourth { + width: 25%; + } + /* line 49, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_grid.scss */ + .grid-third { + width: 33.33333%; + } + /* line 49, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_grid.scss */ + .grid-half { + width: 50%; + } + /* line 49, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_grid.scss */ + .grid-two-thirds { + width: 66.66667%; + } + /* line 49, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_grid.scss */ + .grid-three-fourths { + width: 75%; + } + /* line 49, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_grid.scss */ + .grid-full { + width: 100%; + } + /* line 55, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_grid.scss */ + .offset-fourth { + margin-left: 25%; + } + /* line 55, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_grid.scss */ + .offset-third { + margin-left: 33.33333%; + } + /* line 55, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_grid.scss */ + .offset-half { + margin-left: 50%; + } + /* line 55, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_grid.scss */ + .offset-two-thirds { + margin-left: 66.66667%; + } + /* line 55, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_grid.scss */ + .offset-three-fourths { + margin-left: 75%; + } + /* line 55, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_grid.scss */ + .offset-full { + margin-left: 100%; + } +} + +/** + * Dynamic grid + */ +@media (min-width: 20em) { + /* line 71, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_grid.scss */ + .grid-dynamic { + width: 50%; + } +} + +@media (min-width: 30em) { + /* line 71, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_grid.scss */ + .grid-dynamic { + width: 33.33333%; + } +} + +@media (min-width: 40em) { + /* line 71, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_grid.scss */ + .grid-dynamic { + width: 25%; + } +} + +/** + * @section Typography + * Sets font styles for entire site + */ +/* line 6, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ +body { + background: #ffffff; + color: #272727; + font-family: "Helvetica Neue", Arial, sans-serif; + font-size: 100%; + line-height: 1.5; +} + +@media (min-width: 40em) { + /* line 6, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ + body { + line-height: 1.5625; + } +} + +/* line 18, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ +p { + margin: 0 0 1.5625em; +} + +/** + * Hyperlink styling + * 1. Remove the gray background on active links in IE 10. + * 2. Remove gaps in links underline in iOS 8+ and Safari 8+. + */ +/* line 29, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ +a, .link-block-styled { + background-color: transparent; + /* 1 */ + color: #0088cc; + text-decoration: none; + word-wrap: break-word; + -webkit-text-decoration-skip: objects; + /* 2 */ + /** + * Improve readability when focused and also mouse hovered in all browsers. + */ +} + +/* line 39, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ +a:active, .link-block-styled:active, a:hover, .link-block-styled:hover, .link-block:hover .link-block-styled { + outline: 0; +} + +/* line 44, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ +a:active, .link-block-styled:active, a:focus, .link-block-styled:focus, a:hover, .link-block-styled:hover, .link-block:hover .link-block-styled { + color: #005580; + text-decoration: underline; +} + +/** + * Creates block-level links + */ +/* line 57, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ +a.link-block, .link-block.link-block-styled { + color: #272727; + display: block; + text-decoration: none; +} + +/** + * List styling + */ +/* line 76, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ +ul, +ol { + margin: 0 0 1.5625em 2em; + padding: 0; +} + +/* line 82, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ +ul ul, +ul ol, +ol ol, +ol ul { + margin-bottom: 0; +} + +/* line 89, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ +dl, +dd { + margin: 0; + padding: 0; +} + +/* line 95, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ +dd { + margin-bottom: 1.5625em; +} + +/* line 99, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ +dt { + font-weight: bold; +} + +/** + * Removes list styling. + * For semantic reasons, should only be used on unordered lists. + */ +/* line 107, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ +.list-unstyled { + margin-left: 0; + list-style: none; +} + +/** + * Display lists on a single line. + */ +/* line 116, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ +.list-inline { + list-style: none; + margin-left: -0.5em; + margin-right: -0.5em; + padding: 0; +} + +/* line 123, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ +.list-inline > li { + display: inline; + margin-left: 0.5em; + margin-right: 0.5em; +} + +/** + * Heading styling for h1 through h6 elements. + * Heading class lets you use one heading type for semantics, but style it as another heading type. + */ +/* line 135, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ +h1, h2, h3, h4, h5, h6 { + font-weight: normal; + line-height: 1.2; + margin: 0 0 1em; + padding: 1em 0 0; + word-wrap: break-word; +} + +/* line 143, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ +h1, +.h1 { + font-size: 1.5em; + padding-top: .5em; +} + +@media (min-width: 40em) { + /* line 143, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ + h1, + .h1 { + font-size: 1.75em; + } +} + +/* line 153, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ +h2, +.h2 { + font-size: 1.3125em; +} + +/* line 158, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ +h3, +.h3 { + font-size: 1.1875em; +} + +/* line 163, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ +h4, h5, h6, +.h4, .h5, .h6 { + font-size: 1em; +} + +/* line 168, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ +h4, +.h4 { + text-transform: uppercase; +} + +/** + * Lines, Quotes and Emphasis + */ +/* line 178, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ +hr { + border: 0; + border-top: 1px solid #e5e5e5; + border-bottom: 0 solid #ffffff; + box-sizing: content-box; + margin: 2em auto; + overflow: visible; +} + +/** + * Prevent the duplicate application of `bolder` by the next rule in Safari 6. + */ +/* line 190, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ +b, +strong { + font-weight: inherit; +} + +/** + * Add the correct font weight in Chrome, Edge, and Safari. + */ +/* line 198, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ +b, +strong { + font-weight: bolder; +} + +/** + * 1. Remove the bottom border in Firefox 39-. + * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari. + */ +/* line 207, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ +abbr[title] { + border-bottom: none; + /* 1 */ + text-decoration: underline; + /* 2 */ + text-decoration: underline dotted; + /* 2 */ +} + +/** + * Address styling not present in Safari and Chrome. + */ +/* line 216, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ +dfn { + font-style: italic; +} + +/** + * Address styling not present in IE 8/9. + */ +/* line 223, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ +mark { + background: #ff0; + color: #000000; +} + +/** + * Address inconsistent and variable font size in all browsers. + */ +/* line 231, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ +small { + font-size: 80%; +} + +/** + * Prevent `sub` and `sup` affecting `line-height` in all browsers. + */ +/* line 238, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ +sub, +sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; +} + +/* line 246, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ +sup { + top: -0.5em; +} + +/* line 250, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ +sub { + bottom: -0.25em; +} + +/** + * Blockquotes + */ +/* line 259, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ +blockquote { + font-size: 1.1875em; + font-style: italic; + margin: 0 0 1.5625em; + padding-left: 0.84211em; + padding-right: 0.84211em; +} + +/* line 266, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ +blockquote cite { + color: #808080; + font-size: 0.84211em; + padding-top: 1em; +} + +/* line 273, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ +blockquote, +q { + quotes: none; +} + +/* line 278, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ +blockquote:before, +blockquote:after, +q:before, +q:after { + content: ''; +} + +/** + * @section Code + * Styling for code and preformatted text. + */ +/* line 6, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_code.scss */ +code, +kbd, +pre, +samp { + border-radius: 1px; + font-family: Menlo, Monaco, "Courier New", monospace; + font-size: 0.875em; +} + +/* line 15, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_code.scss */ +code { + background-color: #f7f7f7; + color: #dd1144; + padding: 0.25em; + word-wrap: break-word; +} + +/* line 22, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_code.scss */ +pre { + background-color: #f4f4f4; + display: block; + line-height: 1.5; + margin-bottom: 1.5625em; + overflow: auto; + padding: 0.8125em; + -moz-tab-size: 4; + -o-tab-size: 4; + tab-size: 4; + white-space: pre-wrap; + word-break: break-all; +} + +/* line 33, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_code.scss */ +pre code { + background-color: transparent; + border: 0; + color: inherit; + font-size: 1em; + padding: 0; +} + +/** + * @section Buttons + * Styling for CSS buttons. + */ +/** + * Primary buttons + */ +/* line 10, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_buttons.scss */ +.btn { + background-color: #0088cc; + border: 1px solid #0088cc; + border-radius: 1px; + color: #ffffff; + display: inline-block; + font-size: 0.9375em; + font-weight: normal; + line-height: 1.2; + margin-right: 0.3125em; + margin-bottom: 0.3125em; + padding: 0.5em 0.6875em; +} + +/* line 23, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_buttons.scss */ +.btn:hover, +a .btn:hover, .link-block-styled .btn:hover, .btn:focus, +a .btn:focus, .link-block-styled .btn:focus, .btn:active, +a .btn:active, .link-block-styled .btn:active, .btn.active { + background-color: #005580; + border-color: #005580; + color: #ffffff; + text-decoration: none; +} + +/** + * Secondary buttons + */ +/* line 41, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_buttons.scss */ +.btn-secondary { + background-color: #808080; + border-color: #808080; +} + +/* line 45, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_buttons.scss */ +.btn-secondary:hover, +a .btn-secondary:hover, .link-block-styled .btn-secondary:hover, .btn-secondary:focus, +a .btn-secondary:focus, .link-block-styled .btn-secondary:focus, .btn-secondary:active, +a .btn-secondary:active, .link-block-styled .btn-secondary:active, .btn-secondary.active { + background-color: #5a5a5a; + border-color: #5a5a5a; +} + +/** + * Active state + */ +/* line 61, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_buttons.scss */ +.btn:active, +.btn.active { + box-shadow: inset 0 0.15625em 0.25em rgba(0, 0, 0, 0.15), 0 1px 0.15625em rgba(0, 0, 0, 0.05); + outline: 0; +} + +/** + * Disabled state + */ +/* line 71, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_buttons.scss */ +.btn.disabled, +.btn[disabled] { + box-shadow: none; + cursor: not-allowed; + opacity: 0.5; + pointer-events: none; +} + +/** + * Button size + */ +/* line 83, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_buttons.scss */ +.btn-large { + font-size: 1em; + line-height: normal; + padding: 0.6875em 0.9375em; +} + +/** + * Block-level buttons + */ +/* line 93, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_buttons.scss */ +.btn-block, +input[type="submit"].btn-block, +input[type="reset"].btn-block, +input[type="button"].btn-block { + display: block; + margin-right: 0; + padding-right: 0; + padding-left: 0; + width: 100%; +} + +/** + * General styles + */ +/* line 108, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_buttons.scss */ +.btn, +button, +html input[type="button"], +input[type="reset"], +input[type="submit"] { + cursor: pointer; + text-align: center; + vertical-align: middle; + /** + * @workaround Override default button styling + * @affected Webkit/Firefox + */ + -webkit-appearance: none; +} + +/** + * Remove right margin on last element and inputs + */ +/* line 129, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_buttons.scss */ +.btn:last-child, +input.btn { + margin-right: 0; +} + +/** + * @section Forms + * Styling for form elements. + */ +/* line 6, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_forms.scss */ +form, +fieldset { + margin-bottom: 1.5625em; +} + +/* line 11, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_forms.scss */ +fieldset { + border: 0; + padding: 0; +} + +/* line 16, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_forms.scss */ +legend, +label { + display: block; + font-weight: normal; + margin: 0 0 0.3125em; + padding: 0; +} + +/** + * 1. Correct color not being inherited. + * Known issue: affects color of disabled elements. + * 2. Correct font properties not being inherited. + * 3. Address margins set differently in Firefox 4+, Safari, and Chrome. + */ +/* line 30, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_forms.scss */ +button, +input, +optgroup, +select, +textarea { + color: #555555; + /* 1 */ + font: inherit; + /* 2 */ + margin: 0; + /* 3 */ + padding: 0.3125em; +} + +/** + * Address `overflow` set to `hidden` in IE 8/9/10/11. + */ +/* line 44, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_forms.scss */ +button { + overflow: visible; +} + +/** + * Address inconsistent `text-transform` inheritance for `button` and `select`. + * All other form control elements do not inherit `text-transform` values. + * Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera. + * Correct `select` style inheritance in Firefox. + */ +/* line 54, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_forms.scss */ +button, +select { + text-transform: none; +} + +/* line 59, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_forms.scss */ +input, +textarea, +select { + border: 1px solid #b8b8b8; + border-radius: 1px; + display: block; + line-height: 1.5; + margin-bottom: 1.1875em; + width: 100%; +} + +@media (min-width: 40em) { + /* line 59, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_forms.scss */ + input, + textarea, + select { + line-height: 1.5625; + } +} + +/** + * Don't inherit the `font-weight` (applied by a rule above). + * NOTE: the default cannot safely be changed in Chrome and Safari on OS X. + */ +/* line 78, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_forms.scss */ +optgroup { + font-weight: bold; +} + +/* line 82, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_forms.scss */ +form button, +form .button { + margin-bottom: 1.1875em; +} + +/* line 87, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_forms.scss */ +textarea { + height: 12em; + overflow: auto; +} + +/* line 92, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_forms.scss */ +[type="image"], +[type="checkbox"], +[type="radio"] { + cursor: pointer; + display: inline-block; + height: auto; + margin-bottom: 0.3125em; + padding: 0; + width: auto; +} + +/** + * Fix the cursor style for Chrome's increment/decrement buttons. For certain + * `font-size` values of the `input`, it causes the cursor style of the + * decrement button to change from `default` to `text`. + */ +/* line 108, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_forms.scss */ +[type="number"]::-webkit-inner-spin-button, +[type="number"]::-webkit-outer-spin-button { + height: auto; +} + +/* line 113, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_forms.scss */ +input:focus, +textarea:focus { + border-color: rgba(82, 168, 236, 0.8); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 0.5em rgba(82, 168, 236, 0.6); + outline: 0; + outline: thin dotted \9; +} + +/* line 121, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_forms.scss */ +[type="file"]:focus, +[type="checkbox"]:focus, +select:focus { + outline: thin dotted; + outline: 0.3125em auto -webkit-focus-ring-color; + outline-offset: -0.125em; +} + +/** + * Remove the inner border and padding in Firefox. + */ +/* line 133, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_forms.scss */ +button::-moz-focus-inner, +[type="button"]::-moz-focus-inner, +[type="reset"]::-moz-focus-inner, +[type="submit"]::-moz-focus-inner { + border-style: none; + padding: 0; +} + +/** + * Restore the focus styles unset by the previous rule. + */ +/* line 145, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_forms.scss */ +button:-moz-focusring, +[type="button"]:-moz-focusring, +[type="reset"]:-moz-focusring, +[type="submit"]:-moz-focusring { + outline: 1px dotted ButtonText; +} + +/** + * 1. Correct the inability to style clickable types in iOS and Safari. + * 2. Change font properties to `inherit` in Safari. + */ +/* line 157, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_forms.scss */ +::-webkit-file-upload-button { + -webkit-appearance: button; + /* 1 */ + font: inherit; + /* 2 */ +} + +/** + * Inline inputs + */ +/* line 166, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_forms.scss */ +.input-inline { + display: inline-block; + vertical-align: middle; + width: auto; +} + +/** + * Condensed inputs + */ +/* line 176, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_forms.scss */ +.input-condensed { + padding: 1px 0.3125em; + font-size: 0.9375em; +} + +/** + * Search + */ +/** + * 1. Correct the odd appearance in Chrome and Safari. + * 2. Correct the outline style in Safari. + */ +/* line 191, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_forms.scss */ +[type="search"] { + -webkit-appearance: textfield; + /* 1 */ + outline-offset: -2px; + /* 2 */ +} + +/** + * Remove inner padding and search cancel button in Safari and Chrome on OS X. + * Safari (but not Chrome) clips the cancel button when the search input has + * padding (and `textfield` appearance). + */ +/* line 201, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_forms.scss */ +[type="search"]::-webkit-search-cancel-button, +[type="search"]::-webkit-search-decoration { + -webkit-appearance: none; +} + +/** + * Create rounded search bar + */ +/* line 210, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_forms.scss */ +.input-search { + width: 85%; + padding-left: 0.9375em; + padding-right: 2.5em; + border-radius: 1.3125em; + transition: width 300ms ease-in; +} + +@media (min-width: 40em) { + /* line 210, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_forms.scss */ + .input-search { + width: 65%; + } +} + +/** + * Special styling for search icon as button + */ +/* line 226, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_forms.scss */ +.btn-search { + display: inline; + color: #808080; + border: none; + background: none; + margin-left: -2.5em; + margin-bottom: 0; +} + +/* line 234, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_forms.scss */ +.btn-search .icon { + fill: #808080; +} + +/* line 238, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_forms.scss */ +.btn-search:hover { + color: #5a5a5a; +} + +/* line 241, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_forms.scss */ +.btn-search:hover .icon { + fill: #5a5a5a; +} + +/** + * @section SVGs + * SVG icon sprite styling. + * @link http://css-tricks.com/svg-sprites-use-better-icon-fonts/ + * @link http://css-tricks.com/svg-use-external-source/ + */ +/** + * Basic styles + * Only displayed when SVGs are supported to avoid large empty spaces + */ +/* line 12, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_svg.scss */ +.icon { + display: inline-block; + fill: currentColor; + height: 0; + width: 0; +} + +/* line 18, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_svg.scss */ +.svg .icon { + height: 1em; + width: 1em; +} + +/** + * Hide fallback text if browser supports SVG + */ +/** + * @section Tables + * Styling for tables + */ +/* line 6, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_tables.scss */ +table { + border-collapse: collapse; + border-spacing: 0; + margin-bottom: 1.5625em; + max-width: 100%; + width: 100%; +} + +/* line 14, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_tables.scss */ +th, +td { + text-align: left; + padding: 0.5em; +} + +/* line 20, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_tables.scss */ +th { + border-bottom: 0.125em solid #e5e5e5; + font-weight: bold; + vertical-align: bottom; +} + +/* line 27, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_tables.scss */ +td { + border-top: 1px solid #e5e5e5; + vertical-align: top; +} + +/** + * Adds zebra striping + */ +/* line 35, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_tables.scss */ +.table-striped tbody tr:nth-child(odd) { + background-color: #f7f7f7; +} + +/** + * Reduces padding on condensed tables + */ +/* line 43, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_tables.scss */ +.table-condensed th, +.table-condensed td { + padding: 0.25em; +} + +/** + * Pure CSS responsive tables + * Adds label to each cell using the [data-label] attribute + * @link https://techblog.livingsocial.com/blog/2015/04/06/responsive-tables-in-pure-css/ + */ +@media (max-width: 40em) { + /* line 57, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_tables.scss */ + .table-responsive thead { + display: none; + visibility: hidden; + } + /* line 62, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_tables.scss */ + .table-responsive tr { + border-top: 1px solid #ededed; + display: block; + padding: 0.5em; + } + /* line 68, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_tables.scss */ + .table-responsive td { + border: 0; + display: block; + padding: 0.25em; + } + /* line 73, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_tables.scss */ + .table-responsive td:before { + content: attr(data-label); + display: block; + font-weight: bold; + } +} + +/** + * @section Overrides + * Nudge and tweak alignment, spacing, and visibility. + */ +/** + * Text sizes + */ +/* line 11, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_overrides.scss */ +.text-small { + font-size: 0.9375em; +} + +/* line 15, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_overrides.scss */ +.text-large { + font-size: 1.1875em; + line-height: 1.4; +} + +@media (min-width: 40em) { + /* line 15, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_overrides.scss */ + .text-large { + font-size: 1.3125em; + } +} + +/** + * Text colors + */ +/* line 29, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_overrides.scss */ +.text-muted { + color: #808080; +} + +/** + * Text alignment + */ +/* line 38, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_overrides.scss */ +.text-center { + text-align: center; +} + +/* line 42, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_overrides.scss */ +.text-right { + text-align: right; +} + +/* line 46, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_overrides.scss */ +.text-left { + text-align: left; +} + +@media (min-width: 40em) { + /* line 51, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_overrides.scss */ + .text-right-medium { + text-align: right; + } +} + +/** + * Floats + */ +/* line 61, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_overrides.scss */ +.float-left { + float: left; +} + +/* line 65, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_overrides.scss */ +.float-center { + float: none; + margin-left: auto; + margin-right: auto; +} + +/* line 71, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_overrides.scss */ +.float-right { + float: right; +} + +/** + * Margins + */ +/* line 80, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_overrides.scss */ +.no-margin-top { + margin-top: 0; +} + +/* line 84, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_overrides.scss */ +.no-margin-bottom { + margin-bottom: 0; +} + +/* line 88, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_overrides.scss */ +.margin-top { + margin-top: 1.5625em; +} + +/* line 92, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_overrides.scss */ +.margin-bottom { + margin-bottom: 1.5625em; +} + +/* line 96, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_overrides.scss */ +.margin-bottom-small { + margin-bottom: 0.5em; +} + +/* line 100, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_overrides.scss */ +.margin-bottom-large { + margin-bottom: 2em; +} + +/** + * Padding + */ +/* line 109, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_overrides.scss */ +.no-padding-top { + padding-top: 0; +} + +/* line 113, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_overrides.scss */ +.no-padding-bottom { + padding-bottom: 0; +} + +/* line 117, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_overrides.scss */ +.padding-top { + padding-top: 1.5625em; +} + +/* line 121, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_overrides.scss */ +.padding-top-small { + padding-top: 0.5em; +} + +/* line 125, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_overrides.scss */ +.padding-top-large { + padding-top: 2em; +} + +/* line 129, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_overrides.scss */ +.padding-bottom { + padding-bottom: 1.5625em; +} + +/* line 133, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_overrides.scss */ +.padding-bottom-small { + padding-bottom: 0.5em; +} + +/* line 137, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_overrides.scss */ +.padding-bottom-large { + padding-bottom: 2em; +} + +/** + * Visibility + */ +/** + * Visually hide an element, but leave it available for screen readers + * @link https://github.com/h5bp/html5-boilerplate/blob/master/dist/css/main.css + * @link http://snook.ca/archives/html_and_css/hiding-content-for-accessibility + */ +/* line 151, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_overrides.scss */ +.screen-reader, .svg .icon-fallback-text { + border: 0; + clip: rect(0 0 0 0); + height: 1px; + margin: -1px; + overflow: hidden; + padding: 0; + position: absolute; + white-space: nowrap; + width: 1px; +} + +/** + * Extends the .screen-reader class to allow the element to be focusable when navigated to via the keyboard + * @link https://github.com/h5bp/html5-boilerplate/blob/master/dist/css/main.css + * @link https://www.drupal.org/node/897638 + */ +/* line 168, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_overrides.scss */ +.screen-reader-focusable:active, +.screen-reader-focusable:focus { + clip: auto; + height: auto; + margin: 0; + overflow: visible; + position: static; + white-space: normal; + width: auto; +} + +/** + * @workaround + * @affected IE 8/9/10 + * @link http://juicystudio.com/article/screen-readers-display-none.php + */ +/* line 184, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_overrides.scss */ +[hidden], template { + display: none; + visibility: hidden; +} + +/** + * Contain floats + * The space content is one way to avoid an Opera bug when the `contenteditable` attribute is included anywhere else in the document. + * @link https://github.com/h5bp/html5-boilerplate/blob/master/dist/css/main.css + */ +/* line 196, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_overrides.scss */ +.clearfix:before, .container:before, +.row:before, +.clearfix:after, +.container:after, +.row:after { + display: table; + content: " "; +} + +/* line 202, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_overrides.scss */ +.clearfix:after, .container:after, +.row:after { + clear: both; +} + +/** + * @section Print + * Styling for printed content. Adapted from HTML5BP. + * @link http://html5boilerplate.com + */ +@media print { + /** + * Universal selector. + * Reset all content to transparent background, black color, and remove box and text shadows. + */ + /* line 13, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_print.scss */ + * { + background: transparent !important; + color: #000 !important; + box-shadow: none !important; + text-shadow: none !important; + } + /** + * Specifies page margin + */ + @page { + margin: 0.5cm; + } + /** + * Underline all links + */ + /* line 30, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_print.scss */ + a, .link-block-styled, + a:visited, + .link-block-styled:visited { + text-decoration: underline; + } + /** + * Show URL after links + */ + /* line 38, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_print.scss */ + a[href]:after, [href].link-block-styled:after { + content: " (" attr(href) ")"; + } + /** + * Don't show URL for internal links + */ + /* line 45, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_print.scss */ + a[href^="#"]:after, [href^="#"].link-block-styled:after { + content: ""; + } + /** + * Specifies the minimum number of lines to print at the top and bottom of a page. + */ + /* line 52, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_print.scss */ + p, + h1, h2, h3 { + orphans: 3; + widows: 3; + } + /** + * Avoid inserting a page break after headers + */ + /* line 61, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_print.scss */ + h1, h2, h3 { + page-break-after: avoid; + } + /** + * Change border color on blockquotes and preformatted text. + * Avoid page breaks inside the content + */ + /* line 69, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_print.scss */ + pre, + blockquote { + border-color: #999; + page-break-inside: avoid; + } + /** + * Displayed as a table header row group + */ + /* line 78, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_print.scss */ + thead { + display: table-header-group; + } + /** + * Avoid inserting a page break inside table rows and images + */ + /* line 85, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_print.scss */ + tr, + img { + page-break-inside: avoid; + } +} diff --git a/docs/assets/js/gumshoe.min.js b/docs/assets/js/gumshoe.min.js new file mode 100755 index 0000000..266bcc3 --- /dev/null +++ b/docs/assets/js/gumshoe.min.js @@ -0,0 +1,2 @@ +/*! gumshoe v3.1.2 | (c) 2016 Chris Ferdinandi | MIT License | http://github.com/cferdinandi/gumshoe */ +!function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.gumshoe=t(e)}("undefined"!=typeof global?global:this.window||this.global,function(e){"use strict";var t,n,o,r,a,c,i={},s="querySelector"in document&&"addEventListener"in e&&"classList"in document.createElement("_"),l=[],u={selector:"[data-gumshoe] a",selectorHeader:"[data-gumshoe-header]",offset:0,activeClass:"active",callback:function(){}},f=function(e,t,n){if("[object Object]"===Object.prototype.toString.call(e))for(var o in e)Object.prototype.hasOwnProperty.call(e,o)&&t.call(n,e[o],o,e);else for(var r=0,a=e.length;a>r;r++)t.call(n,e[r],r,e)},d=function(){var e={},t=!1,n=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(t=arguments[0],n++);for(var r=function(n){for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(t&&"[object Object]"===Object.prototype.toString.call(n[o])?e[o]=d(!0,e[o],n[o]):e[o]=n[o])};o>n;n++){var a=arguments[n];r(a)}return e},v=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},m=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},g=function(e){var n=0;if(e.offsetParent){do n+=e.offsetTop,e=e.offsetParent;while(e)}else n=e.offsetTop;return n=n-a-t.offset,n>=0?n:0},h=function(e){var t=e.getBoundingClientRect();return t.top>=0&&t.left>=0&&t.bottom<=(window.innerHeight||document.documentElement.clientHeight)&&t.right<=(window.innerWidth||document.documentElement.clientWidth)},p=function(){l.sort(function(e,t){return e.distance>t.distance?-1:e.distance=o&&h(l[0].target))return H(l[0]),l[0];for(var r=0,a=l.length;a>r;r++){var c=l[r];if(c.distance<=n)return H(c),c}y(),t.callback()};var C=function(){f(l,function(e){e.nav.classList.contains(t.activeClass)&&(c={nav:e.nav,parent:e.parent})})};i.destroy=function(){t&&(e.removeEventListener("resize",L,!1),e.removeEventListener("scroll",L,!1),l=[],t=null,n=null,o=null,r=null,a=null,c=null)};var L=function(e){n||(n=setTimeout(function(){n=null,"scroll"===e.type&&i.getCurrentNav(),"resize"===e.type&&(i.setDistances(),i.getCurrentNav())},66))};return i.init=function(n){s&&(i.destroy(),t=d(u,n||{}),r=document.querySelector(t.selectorHeader),b(),0!==l.length&&(C(),i.setDistances(),i.getCurrentNav(),e.addEventListener("resize",L,!1),e.addEventListener("scroll",L,!1)))},i}); \ No newline at end of file diff --git a/docs/assets/js/highlight-active-nav.js b/docs/assets/js/highlight-active-nav.js new file mode 100755 index 0000000..4aa4981 --- /dev/null +++ b/docs/assets/js/highlight-active-nav.js @@ -0,0 +1,134 @@ +/** + * highlight-active-nav.js + * @description Highlight the active navigation element + * @version 1.0.0 + * @author Chris Ferdinandi + * @license MIT + */ + +(function (root, factory) { + if ( typeof define === 'function' && define.amd ) { + define([], factory(root)); + } else if ( typeof exports === 'object' ) { + module.exports = factory(root); + } else { + root.highlightActiveNav = factory(root); + } +})(typeof global !== 'undefined' ? global : this.window || this.global, function (root) { + + 'use strict'; + + // + // Variables + // + + var highlight = {}; // Object for public APIs + var supports = !!document.querySelector && !!root.addEventListener; // Feature test + var settings; + + // Default settings + var defaults = { + selector: '[data-nav-highlight]', + activeClass: 'nav-active', + urlPrefix: null, + callback: function () {} + }; + + + // + // Methods + // + + /** + * Merge defaults with user options + * @private + * @param {Object} defaults Default settings + * @param {Object} options User options + * @returns {Object} Merged values of defaults and options + */ + var extend = function () { + + // Variables + var extended = {}; + var deep = false; + var i = 0; + var length = arguments.length; + + // Check if a deep merge + if ( Object.prototype.toString.call( arguments[0] ) === '[object Boolean]' ) { + deep = arguments[0]; + i++; + } + + // Merge the object into the extended object + var merge = function (obj) { + for ( var prop in obj ) { + if ( Object.prototype.hasOwnProperty.call( obj, prop ) ) { + // If deep merge and property is an object, merge properties + if ( deep && Object.prototype.toString.call(obj[prop]) === '[object Object]' ) { + extended[prop] = extend( true, extended[prop], obj[prop] ); + } else { + extended[prop] = obj[prop]; + } + } + } + }; + + // Loop through each object and conduct a merge + for ( ; i < length; i++ ) { + var obj = arguments[i]; + merge(obj); + } + + return extended; + + }; + + /** + * Destroy the current initialization. + * @public + */ + highlight.destroy = function () { + if ( !settings ) return; + document.documentElement.classList.remove( settings.initClass ); + settings = null; + container = null; + }; + + /** + * Initialize highlightActiveNav + * @public + * @param {Object} options User settings + */ + highlight.init = function ( options ) { + + // feature test + if ( !supports ) return; + + // Destroy any existing initializations + highlight.destroy(); + + // Merge user options with defaults + settings = extend( defaults, options || {} ); + + // Get the container + var href = settings.urlPrefix ? location.pathname.split( settings.urlPrefix )[1] : location.pathname; + var nav = document.querySelector( settings.selector + ' a[href^="' + href + '"]' ); + if ( !nav ) return; + + // Add class to active nav + nav.className += ' ' + settings.activeClass; + + // Run callback + settings.callback(); + + }; + + + // + // Public APIs + // + + return highlight; + +}); \ No newline at end of file diff --git a/docs/assets/js/prism.js b/docs/assets/js/prism.js new file mode 100755 index 0000000..92b3663 --- /dev/null +++ b/docs/assets/js/prism.js @@ -0,0 +1,21 @@ +/* ============================================================= + + Prism v1.0 + Lightweight, robust, elegant syntax highlighting, by Lea Verou + http://lea.verou.me + + Licensed under MIT License. + http://www.opensource.org/licenses/mit-license.php/ + + * ============================================================= */ + + (function(){var e=/\blang(?:uage)?-(?!\*)(\w+)\b/i,t=self.Prism={util:{type:function(e){return Object.prototype.toString.call(e).match(/\[object (\w+)\]/)[1]},clone:function(e){var n=t.util.type(e);switch(n){case"Object":var r={};for(var i in e)e.hasOwnProperty(i)&&(r[i]=t.util.clone(e[i]));return r;case"Array":return e.slice()}return e}},languages:{extend:function(e,n){var r=t.util.clone(t.languages[e]);for(var i in n)r[i]=n[i];return r},insertBefore:function(e,n,r,i){i=i||t.languages;var s=i[e],o={};for(var u in s)if(s.hasOwnProperty(u)){if(u==n)for(var a in r)r.hasOwnProperty(a)&&(o[a]=r[a]);o[u]=s[u]}return i[e]=o},DFS:function(e,n){for(var r in e){n.call(e,r,e[r]);t.util.type(e)==="Object"&&t.languages.DFS(e[r],n)}}},highlightAll:function(e,n){var r=document.querySelectorAll('code[class*="language-"], [class*="language-"] code, code[class*="lang-"], [class*="lang-"] code');for(var i=0,s;s=r[i++];)t.highlightElement(s,e===!0,n)},highlightElement:function(r,i,s){var o,u,a=r;while(a&&!e.test(a.className))a=a.parentNode;if(a){o=(a.className.match(e)||[,""])[1];u=t.languages[o]}if(!u)return;r.className=r.className.replace(e,"").replace(/\s+/g," ")+" language-"+o;a=r.parentNode;/pre/i.test(a.nodeName)&&(a.className=a.className.replace(e,"").replace(/\s+/g," ")+" language-"+o);var f=r.textContent;if(!f)return;f=f.replace(/&/g,"&").replace(/e.length)break e;if(p instanceof i)continue;a.lastIndex=0;var d=a.exec(p);if(d){l&&(c=d[1].length);var v=d.index-1+c,d=d[0].slice(c),m=d.length,g=v+m,y=p.slice(0,v+1),b=p.slice(g+1),w=[h,1];y&&w.push(y);var E=new i(u,f?t.tokenize(d,f):d);w.push(E);b&&w.push(b);Array.prototype.splice.apply(s,w)}}}return s},hooks:{all:{},add:function(e,n){var r=t.hooks.all;r[e]=r[e]||[];r[e].push(n)},run:function(e,n){var r=t.hooks.all[e];if(!r||!r.length)return;for(var i=0,s;s=r[i++];)s(n)}}},n=t.Token=function(e,t){this.type=e;this.content=t};n.stringify=function(e,r,i){if(typeof e=="string")return e;if(Object.prototype.toString.call(e)=="[object Array]")return e.map(function(t){return n.stringify(t,r,e)}).join("");var s={type:e.type,content:n.stringify(e.content,r,i),tag:"span",classes:["token",e.type],attributes:{},language:r,parent:i};s.type=="comment"&&(s.attributes.spellcheck="true");t.hooks.run("wrap",s);var o="";for(var u in s.attributes)o+=u+'="'+(s.attributes[u]||"")+'"';return"<"+s.tag+' class="'+s.classes.join(" ")+'" '+o+">"+s.content+""};if(!self.document){self.addEventListener("message",function(e){var n=JSON.parse(e.data),r=n.language,i=n.code;self.postMessage(JSON.stringify(t.tokenize(i,t.languages[r])));self.close()},!1);return}var r=document.getElementsByTagName("script");r=r[r.length-1];if(r){t.filename=r.src;document.addEventListener&&!r.hasAttribute("data-manual")&&document.addEventListener("DOMContentLoaded",t.highlightAll)}})();; + Prism.languages.markup={comment:/<!--[\w\W]*?-->/g,prolog:/<\?.+?\?>/,doctype:/<!DOCTYPE.+?>/,cdata:/<!\[CDATA\[[\w\W]*?]]>/i,tag:{pattern:/<\/?[\w:-]+\s*(?:\s+[\w:-]+(?:=(?:("|')(\\?[\w\W])*?\1|\w+))?\s*)*\/?>/gi,inside:{tag:{pattern:/^<\/?[\w:-]+/i,inside:{punctuation:/^<\/?/,namespace:/^[\w-]+?:/}},"attr-value":{pattern:/=(?:('|")[\w\W]*?(\1)|[^\s>]+)/gi,inside:{punctuation:/=|>|"/g}},punctuation:/\/?>/g,"attr-name":{pattern:/[\w:-]+/g,inside:{namespace:/^[\w-]+?:/}}}},entity:/&#?[\da-z]{1,8};/gi};Prism.hooks.add("wrap",function(e){e.type==="entity"&&(e.attributes.title=e.content.replace(/&/,"&"))});; + Prism.languages.css={comment:/\/\*[\w\W]*?\*\//g,atrule:{pattern:/@[\w-]+?.*?(;|(?=\s*{))/gi,inside:{punctuation:/[;:]/g}},url:/url\((["']?).*?\1\)/gi,selector:/[^\{\}\s][^\{\};]*(?=\s*\{)/g,property:/(\b|\B)[\w-]+(?=\s*:)/ig,string:/("|')(\\?.)*?\1/g,important:/\B!important\b/gi,ignore:/&(lt|gt|amp);/gi,punctuation:/[\{\};:]/g};Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{style:{pattern:/(<|<)style[\w\W]*?(>|>)[\w\W]*?(<|<)\/style(>|>)/ig,inside:{tag:{pattern:/(<|<)style[\w\W]*?(>|>)|(<|<)\/style(>|>)/ig,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.css}}});; + Prism.languages.clike={comment:{pattern:/(^|[^\\])(\/\*[\w\W]*?\*\/|(^|[^:])\/\/.*?(\r?\n|$))/g,lookbehind:!0},string:/("|')(\\?.)*?\1/g,"class-name":{pattern:/((?:(?:class|interface|extends|implements|trait|instanceof|new)\s+)|(?:catch\s+\())[a-z0-9_\.\\]+/ig,lookbehind:!0,inside:{punctuation:/(\.|\\)/}},keyword:/\b(if|else|while|do|for|return|in|instanceof|function|new|try|throw|catch|finally|null|break|continue)\b/g,"boolean":/\b(true|false)\b/g,"function":{pattern:/[a-z0-9_]+\(/ig,inside:{punctuation:/\(/}}, number:/\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/g,operator:/[-+]{1,2}|!|<=?|>=?|={1,3}|(&){1,2}|\|?\||\?|\*|\/|\~|\^|\%/g,ignore:/&(lt|gt|amp);/gi,punctuation:/[{}[\];(),.:]/g}; + ; + Prism.languages.javascript=Prism.languages.extend("clike",{keyword:/\b(var|let|if|else|while|do|for|return|in|instanceof|function|new|with|typeof|try|throw|catch|finally|null|break|continue)\b/g,number:/\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?|NaN|-?Infinity)\b/g});Prism.languages.insertBefore("javascript","keyword",{regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gim]{0,3}(?=\s*($|[\r\n,.;})]))/g,lookbehind:!0}});Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{script:{pattern:/(<|<)script[\w\W]*?(>|>)[\w\W]*?(<|<)\/script(>|>)/ig,inside:{tag:{pattern:/(<|<)script[\w\W]*?(>|>)|(<|<)\/script(>|>)/ig,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.javascript}}}); + ; + Prism.languages.php=Prism.languages.extend("clike",{keyword:/\b(and|or|xor|array|as|break|case|cfunction|class|const|continue|declare|default|die|do|else|elseif|enddeclare|endfor|endforeach|endif|endswitch|endwhile|extends|for|foreach|function|include|include_once|global|if|new|return|static|switch|use|require|require_once|var|while|abstract|interface|public|implements|extends|private|protected|parent|static|throw|null|echo|print|trait|namespace|use|final|yield|goto|instanceof|finally|try|catch)\b/ig, constant:/\b[A-Z0-9_]{2,}\b/g});Prism.languages.insertBefore("php","keyword",{delimiter:/(\?>|<\?php|<\?)/ig,variable:/(\$\w+)\b/ig,"package":{pattern:/(\\|namespace\s+|use\s+)[\w\\]+/g,lookbehind:!0,inside:{punctuation:/\\/}}});Prism.languages.insertBefore("php","operator",{property:{pattern:/(->)[\w]+/g,lookbehind:!0}}); Prism.languages.markup&&(Prism.hooks.add("before-highlight",function(a){"php"===a.language&&(a.tokenStack=[],a.code=a.code.replace(/(?:<\?php|<\?|<\?php|<\?)[\w\W]*?(?:\?>|\?>)/ig,function(b){a.tokenStack.push(b);return"{{{PHP"+a.tokenStack.length+"}}}"}))}),Prism.hooks.add("after-highlight",function(a){if("php"===a.language){for(var b=0,c;c=a.tokenStack[b];b++)a.highlightedCode=a.highlightedCode.replace("{{{PHP"+(b+1)+"}}}",Prism.highlight(c,a.grammar,"php"));a.element.innerHTML=a.highlightedCode}}), Prism.hooks.add("wrap",function(a){"php"===a.language&&"markup"===a.type&&(a.content=a.content.replace(/(\{\{\{PHP[0-9]+\}\}\})/g,'$1'))}),Prism.languages.insertBefore("php","comment",{markup:{pattern:/(<|<)[^?]\/?(.*?)(>|>)/g,inside:Prism.languages.markup},php:/\{\{\{PHP[0-9]+\}\}\}/g}));; + Prism.languages.scss=Prism.languages.extend("css",{comment:{pattern:/(^|[^\\])(\/\*[\w\W]*?\*\/|\/\/.*?(\r?\n|$))/g,lookbehind:!0},atrule:/@[\w-]+(?=\s+(\(|\{|;))/gi,url:/([-a-z]+-)*url(http://github.com/?=\()/gi,selector:/([^@;\{\}\(\)]?([^@;\{\}\(\)]|&|\#\{\$[-_\w]+\})+)(?=\s*\{(\}|\s|[^\}]+(:|\{)[^\}]+))/gm});Prism.languages.insertBefore("scss","atrule",{keyword:/@(if|else if|else|for|each|while|import|extend|debug|warn|mixin|include|function|return)|(?=@for\s+\$[-_\w]+\s)+from/i});Prism.languages.insertBefore("scss","property",{variable:/((\$[-_\w]+)|(#\{\$[-_\w]+\}))/i});Prism.languages.insertBefore("scss","ignore",{placeholder:/%[-_\w]+/i,statement:/\B!(default|optional)\b/gi,"boolean":/\b(true|false)\b/g,"null":/\b(null)\b/g,operator:/\s+([-+]{1,2}|={1,2}|!=|\|?\||\?|\*|\/|\%)\s+/g}); + ; \ No newline at end of file diff --git a/docs/assets/js/toc.js b/docs/assets/js/toc.js new file mode 100755 index 0000000..6b03942 --- /dev/null +++ b/docs/assets/js/toc.js @@ -0,0 +1,191 @@ +/** + * tableOfContents.js + * @description Dynamically create a table of contents + * @version 1.0.0 + * @author Chris Ferdinandi + * @license MIT + */ + +(function (root, factory) { + if ( typeof define === 'function' && define.amd ) { + define([], factory(root)); + } else if ( typeof exports === 'object' ) { + module.exports = factory(root); + } else { + root.tableOfContents = factory(root); + } +})(typeof global !== 'undefined' ? global : this.window || this.global, function (root) { + + 'use strict'; + + // + // Variables + // + + var toc = {}; // Object for public APIs + var supports = !!document.querySelector && !!root.addEventListener; // Feature test + var settings, container; + + // Default settings + var defaults = { + container: '[data-toc]', + selectors: '[data-toc-content] h2', + heading: 'Contents', + headingType: 'h2', + headingClass: '', + navClass: '', + linkClass: '', + initClass: 'js-table-of-contents', + callback: function () {} + }; + + + // + // Methods + // + + /** + * A simple forEach() implementation for Arrays, Objects and NodeLists + * @private + * @param {Array|Object|NodeList} collection Collection of items to iterate + * @param {Function} callback Callback function for each iteration + * @param {Array|Object|NodeList} scope Object/NodeList/Array that forEach is iterating over (aka `this`) + */ + var forEach = function (collection, callback, scope) { + if (Object.prototype.toString.call(collection) === '[object Object]') { + for (var prop in collection) { + if (Object.prototype.hasOwnProperty.call(collection, prop)) { + callback.call(scope, collection[prop], prop, collection); + } + } + } else { + for (var i = 0, len = collection.length; i < len; i++) { + callback.call(scope, collection[i], i, collection); + } + } + }; + + /** + * Merge defaults with user options + * @private + * @param {Object} defaults Default settings + * @param {Object} options User options + * @returns {Object} Merged values of defaults and options + */ + var extend = function () { + + // Variables + var extended = {}; + var deep = false; + var i = 0; + var length = arguments.length; + + // Check if a deep merge + if ( Object.prototype.toString.call( arguments[0] ) === '[object Boolean]' ) { + deep = arguments[0]; + i++; + } + + // Merge the object into the extended object + var merge = function (obj) { + for ( var prop in obj ) { + if ( Object.prototype.hasOwnProperty.call( obj, prop ) ) { + // If deep merge and property is an object, merge properties + if ( deep && Object.prototype.toString.call(obj[prop]) === '[object Object]' ) { + extended[prop] = extend( true, extended[prop], obj[prop] ); + } else { + extended[prop] = obj[prop]; + } + } + } + }; + + // Loop through each object and conduct a merge + for ( ; i < length; i++ ) { + var obj = arguments[i]; + merge(obj); + } + + return extended; + + }; + + /** + * Render the Table of Contents + */ + toc.render = function () { + + // Variables + var sections = document.querySelectorAll( settings.selectors ); + var toc = ''; + + if ( sections.length === 0 ) return; + + // Loop through each section and create a link to it + forEach(sections, function (section) { + + // Ignore sections without an id + var id = section.id; + if ( !id ) return; + + // Create section navigation + toc += '
  • ' + section.innerHTML + '
    • '; + + }); + + // Inject table of contents into the DOM + container.innerHTML = '<' + settings.headingType + '>' + settings.heading + '
      ' + toc + '
    '; + + // Run callback + settings.callback(); + + }; + + /** + * Destroy the current initialization. + * @public + */ + toc.destroy = function () { + if ( !settings ) return; + document.documentElement.classList.remove( settings.initClass ); + container.innerHTML = ''; + settings = null; + container = null; + }; + + /** + * Initialize tableOfContents + * @public + * @param {Object} options User settings + */ + toc.init = function ( options ) { + + // feature test + if ( !supports ) return; + + // Destroy any existing initializations + toc.destroy(); + + // Merge user options with defaults + settings = extend( defaults, options || {} ); + + // Get the container + container = document.querySelector( settings.container ); + if ( !container ) return; + + // Add class to HTML element to activate conditional CSS + document.documentElement.classList.add( settings.initClass ); + + // Render the table of contents + toc.render(); + + }; + + + // + // Public APIs + // + + return toc; + +}); \ No newline at end of file diff --git a/docs/browsers.html b/docs/browsers.html new file mode 100755 index 0000000..cbcf76e --- /dev/null +++ b/docs/browsers.html @@ -0,0 +1,104 @@ + + + + + + Smooth Scroll + + + + + + + + + + + + + +
    +
    + +
    + + + +

    + + + Smooth Scroll + +
    + Version 11 +

    + +
    + +

    Browser Compatibility

    +

    Smooth Scroll works in all modern browsers, and IE 9 and above.

    +

    Smooth Scroll is built with modern JavaScript APIs, and uses progressive enhancement. If the JavaScript file fails to load, or if your site is viewed on older and less capable browsers, anchor links will jump the way they normally would.

    +
    + + +

    Known Issues

    +

    <body> styling

    +

    If the <body> element has been assigned a height of 100% or overflow: hidden, Smooth Scroll is unable to properly calculate page distances and will not scroll to the right location. The <body> element can have a fixed, non-percentage based height (ex. 500px), or a height of auto, and an overflow of visible.

    +

    Animating from the bottom

    +

    Animated scrolling links at the very bottom of the page (example: a "scroll to top" link) will stop animated almost immediately after they start when using certain easing patterns. This is an issue that's been around for a while and I've yet to find a good fix for it. I've found that easeOut* easing patterns work as expected, but other patterns can cause issues. See this discussion for more details.

    + + + +
    +
    +
    + + + + + + + + + + + \ No newline at end of file diff --git a/docs/dist/js/smooth-scroll.js b/docs/dist/js/smooth-scroll.js index 3439579..bf4e1a8 100755 --- a/docs/dist/js/smooth-scroll.js +++ b/docs/dist/js/smooth-scroll.js @@ -1,7 +1,7 @@ /*! - * smooth-scroll v10.3.1: Animate scrolling to anchor links + * smooth-scroll v11.0.0: Animate scrolling to anchor links * (c) 2017 Chris Ferdinandi - * MIT License + * GPL-3.0 License * http://github.com/cferdinandi/smooth-scroll */ @@ -27,12 +27,19 @@ // Default settings var defaults = { + // Selectors selector: '[data-scroll]', selectorHeader: null, + + // Speed & Easing speed: 500, - easing: 'easeInOutCubic', offset: 0, - callback: function () {} + easing: 'easeInOutCubic', + easingPatterns: {}, + + // Callback API + before: function () {}, + after: function () {} }; @@ -219,6 +226,8 @@ */ var easingPattern = function ( type, time ) { var pattern; + + // Default Easing Patterns if ( type === 'easeInQuad' ) pattern = time * time; // accelerating from zero velocity if ( type === 'easeOutQuad' ) pattern = time * (2 - time); // decelerating to zero velocity if ( type === 'easeInOutQuad' ) pattern = time < 0.5 ? 2 * time * time : -1 + (4 - 2 * time) * time; // acceleration until halfway, then deceleration @@ -231,6 +240,14 @@ if ( type === 'easeInQuint' ) pattern = time * time * time * time * time; // accelerating from zero velocity if ( type === 'easeOutQuint' ) pattern = 1 + (--time) * time * time * time * time; // decelerating to zero velocity if ( type === 'easeInOutQuint' ) pattern = time < 0.5 ? 16 * time * time * time * time * time : 1 + 16 * (--time) * time * time * time * time; // acceleration until halfway, then deceleration + + // Custom Easing Patterns + if ( settings.easingPatterns[type] ) { + pattern = settings.easingPatterns[type]( time ); + } + + console.log(pattern || time); + return pattern || time; // no easing, no acceleration }; @@ -366,7 +383,7 @@ adjustFocus( anchor, endLocation, isNum ); // Run callback after animation complete - animateSettings.callback( anchor, toggle ); + animateSettings.after( anchor, toggle ); } }; @@ -401,6 +418,9 @@ root.scrollTo( 0, 0 ); } + // Run callback before animation starts + animateSettings.before( anchor, toggle ); + // Start scrolling animation startAnimateScroll(); diff --git a/docs/dist/js/smooth-scroll.min.js b/docs/dist/js/smooth-scroll.min.js index a01d8a3..5161d16 100755 --- a/docs/dist/js/smooth-scroll.min.js +++ b/docs/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ -/*! smooth-scroll v10.3.1 | (c) 2017 Chris Ferdinandi | MIT License | http://github.com/cferdinandi/smooth-scroll */ -!(function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)})("undefined"!=typeof global?global:this.window||this.global,(function(e){"use strict";var t,n,o,r,a,c,l,i={},u="querySelector"in document&&"addEventListener"in e,s={selector:"[data-scroll]",selectorHeader:null,speed:500,easing:"easeInOutCubic",offset:0,callback:function(){}},f=function(){var e={},t=!1,n=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(t=arguments[0],n++);for(;n=0&&t.item(n)!==this;);return n>-1});e&&e!==document;e=e.parentNode)if(e.matches(t))return e;return null},m=function(e){"#"===e.charAt(0)&&(e=e.substr(1));for(var t,n=String(e),o=n.length,r=-1,a="",c=n.charCodeAt(0);++r=1&&t<=31||127==t||0===r&&t>=48&&t<=57||1===r&&t>=48&&t<=57&&45===c?"\\"+t.toString(16)+" ":t>=128||45===t||95===t||t>=48&&t<=57||t>=65&&t<=90||t>=97&&t<=122?n.charAt(r):"\\"+n.charAt(r)}return"#"+a},p=function(e,t){var n;return"easeInQuad"===e&&(n=t*t),"easeOutQuad"===e&&(n=t*(2-t)),"easeInOutQuad"===e&&(n=t<.5?2*t*t:(4-2*t)*t-1),"easeInCubic"===e&&(n=t*t*t),"easeOutCubic"===e&&(n=--t*t*t+1),"easeInOutCubic"===e&&(n=t<.5?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e&&(n=t*t*t*t),"easeOutQuart"===e&&(n=1- --t*t*t*t),"easeInOutQuart"===e&&(n=t<.5?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e&&(n=t*t*t*t*t),"easeOutQuint"===e&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e&&(n=t<.5?16*t*t*t*t*t:1+16*--t*t*t*t*t),n||t},g=function(e,t,n){var o=0;if(e.offsetParent)do{o+=e.offsetTop,e=e.offsetParent}while(e);return o=Math.max(o-t-n,0),Math.min(o,y()-b())},b=function(){return Math.max(document.documentElement.clientHeight,e.innerHeight||0)},y=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},v=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},O=function(e){return e?d(e)+e.offsetTop:0},S=function(t,n,o){o||(t.focus(),document.activeElement.id!==t.id&&(t.setAttribute("tabindex","-1"),t.focus(),t.style.outline="none"),e.scrollTo(0,n))};i.animateScroll=function(n,o,c){var i=v(o?o.getAttribute("data-options"):null),u=f(t||s,c||{},i),d="[object Number]"===Object.prototype.toString.call(n),h=d||!n.tagName?null:n;if(d||h){var m=e.pageYOffset;u.selectorHeader&&!r&&(r=document.querySelector(u.selectorHeader)),a||(a=O(r));var b,E,I=d?n:g(h,a,parseInt("function"==typeof u.offset?u.offset():u.offset,10)),H=I-m,A=y(),j=0,C=function(t,r,a){var c=e.pageYOffset;(t==r||c==r||e.innerHeight+c>=A)&&(clearInterval(a),S(n,r,d),u.callback(n,o))},M=function(){j+=16,b=j/parseInt(u.speed,10),b=b>1?1:b,E=m+H*p(u.easing,b),e.scrollTo(0,Math.floor(E)),C(E,I,l)};0===e.pageYOffset&&e.scrollTo(0,0),(function(){clearInterval(l),l=setInterval(M,16)})()}};var E=function(t){try{m(decodeURIComponent(e.location.hash))}catch(t){m(e.location.hash)}n&&(n.id=n.getAttribute("data-scroll-id"),i.animateScroll(n,o),n=null,o=null)},I=function(r){if(0===r.button&&!r.metaKey&&!r.ctrlKey&&(o=h(r.target,t.selector))&&"a"===o.tagName.toLowerCase()&&o.hostname===e.location.hostname&&o.pathname===e.location.pathname&&/#/.test(o.href)){var a;try{a=m(decodeURIComponent(o.hash))}catch(e){a=m(o.hash)}if("#"===a){r.preventDefault(),n=document.body;var c=n.id?n.id:"smooth-scroll-top";return n.setAttribute("data-scroll-id",c),n.id="",void(e.location.hash.substring(1)===c?E():e.location.hash=c)}n=document.querySelector(a),n&&(n.setAttribute("data-scroll-id",n.id),n.id="",o.hash===e.location.hash&&(r.preventDefault(),E()))}},H=function(e){c||(c=setTimeout((function(){c=null,a=O(r)}),66))};return i.destroy=function(){t&&(document.removeEventListener("click",I,!1),e.removeEventListener("resize",H,!1),t=null,n=null,o=null,r=null,a=null,c=null,l=null)},i.init=function(n){u&&(i.destroy(),t=f(s,n||{}),r=t.selectorHeader?document.querySelector(t.selectorHeader):null,a=O(r),document.addEventListener("click",I,!1),e.addEventListener("hashchange",E,!1),r&&e.addEventListener("resize",H,!1))},i})); \ No newline at end of file +/*! smooth-scroll v11.0.0 | (c) 2017 Chris Ferdinandi | GPL-3.0 License | http://github.com/cferdinandi/smooth-scroll */ +!(function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)})("undefined"!=typeof global?global:this.window||this.global,(function(e){"use strict";var t,n,o,r,a,c,i,l={},u="querySelector"in document&&"addEventListener"in e,s={selector:"[data-scroll]",selectorHeader:null,speed:500,offset:0,easing:"easeInOutCubic",easingPatterns:{},before:function(){},after:function(){}},f=function(){var e={},t=!1,n=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(t=arguments[0],n++);for(;n=0&&t.item(n)!==this;);return n>-1});e&&e!==document;e=e.parentNode)if(e.matches(t))return e;return null},m=function(e){"#"===e.charAt(0)&&(e=e.substr(1));for(var t,n=String(e),o=n.length,r=-1,a="",c=n.charCodeAt(0);++r=1&&t<=31||127==t||0===r&&t>=48&&t<=57||1===r&&t>=48&&t<=57&&45===c?a+="\\"+t.toString(16)+" ":a+=t>=128||45===t||95===t||t>=48&&t<=57||t>=65&&t<=90||t>=97&&t<=122?n.charAt(r):"\\"+n.charAt(r)}return"#"+a},p=function(e,n){var o;return"easeInQuad"===e&&(o=n*n),"easeOutQuad"===e&&(o=n*(2-n)),"easeInOutQuad"===e&&(o=n<.5?2*n*n:(4-2*n)*n-1),"easeInCubic"===e&&(o=n*n*n),"easeOutCubic"===e&&(o=--n*n*n+1),"easeInOutCubic"===e&&(o=n<.5?4*n*n*n:(n-1)*(2*n-2)*(2*n-2)+1),"easeInQuart"===e&&(o=n*n*n*n),"easeOutQuart"===e&&(o=1- --n*n*n*n),"easeInOutQuart"===e&&(o=n<.5?8*n*n*n*n:1-8*--n*n*n*n),"easeInQuint"===e&&(o=n*n*n*n*n),"easeOutQuint"===e&&(o=1+--n*n*n*n*n),"easeInOutQuint"===e&&(o=n<.5?16*n*n*n*n*n:1+16*--n*n*n*n*n),t.easingPatterns[e]&&(o=t.easingPatterns[e](n)),console.log(o||n),o||n},g=function(e,t,n){var o=0;if(e.offsetParent)do{o+=e.offsetTop,e=e.offsetParent}while(e);return o=Math.max(o-t-n,0),Math.min(o,y()-b())},b=function(){return Math.max(document.documentElement.clientHeight,e.innerHeight||0)},y=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},v=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},O=function(e){return e?d(e)+e.offsetTop:0},S=function(t,n,o){o||(t.focus(),document.activeElement.id!==t.id&&(t.setAttribute("tabindex","-1"),t.focus(),t.style.outline="none"),e.scrollTo(0,n))};l.animateScroll=function(n,o,c){var l=v(o?o.getAttribute("data-options"):null),u=f(t||s,c||{},l),d="[object Number]"===Object.prototype.toString.call(n),h=d||!n.tagName?null:n;if(d||h){var m=e.pageYOffset;u.selectorHeader&&!r&&(r=document.querySelector(u.selectorHeader)),a||(a=O(r));var b,E,I=d?n:g(h,a,parseInt("function"==typeof u.offset?u.offset():u.offset,10)),H=I-m,A=y(),j=0,C=function(t,r,a){var c=e.pageYOffset;(t==r||c==r||e.innerHeight+c>=A)&&(clearInterval(a),S(n,r,d),u.after(n,o))},M=function(){j+=16,b=j/parseInt(u.speed,10),b=b>1?1:b,E=m+H*p(u.easing,b),e.scrollTo(0,Math.floor(E)),C(E,I,i)};0===e.pageYOffset&&e.scrollTo(0,0),u.before(n,o),(function(){clearInterval(i),i=setInterval(M,16)})()}};var E=function(t){try{m(decodeURIComponent(e.location.hash))}catch(t){m(e.location.hash)}n&&(n.id=n.getAttribute("data-scroll-id"),l.animateScroll(n,o),n=null,o=null)},I=function(r){if(0===r.button&&!r.metaKey&&!r.ctrlKey&&(o=h(r.target,t.selector))&&"a"===o.tagName.toLowerCase()&&o.hostname===e.location.hostname&&o.pathname===e.location.pathname&&/#/.test(o.href)){var a;try{a=m(decodeURIComponent(o.hash))}catch(e){a=m(o.hash)}if("#"===a){r.preventDefault(),n=document.body;var c=n.id?n.id:"smooth-scroll-top";return n.setAttribute("data-scroll-id",c),n.id="",void(e.location.hash.substring(1)===c?E():e.location.hash=c)}n=document.querySelector(a),n&&(n.setAttribute("data-scroll-id",n.id),n.id="",o.hash===e.location.hash&&(r.preventDefault(),E()))}},H=function(e){c||(c=setTimeout((function(){c=null,a=O(r)}),66))};return l.destroy=function(){t&&(document.removeEventListener("click",I,!1),e.removeEventListener("resize",H,!1),t=null,n=null,o=null,r=null,a=null,c=null,i=null)},l.init=function(n){u&&(l.destroy(),t=f(s,n||{}),r=t.selectorHeader?document.querySelector(t.selectorHeader):null,a=O(r),document.addEventListener("click",I,!1),e.addEventListener("hashchange",E,!1),r&&e.addEventListener("resize",H,!1))},l})); \ No newline at end of file diff --git a/docs/index.html b/docs/index.html old mode 100644 new mode 100755 index e61cf7c..ad16d5f --- a/docs/index.html +++ b/docs/index.html @@ -5,29 +5,59 @@ Smooth Scroll + - + + -
    - - - -
    + + + +
    +
    + +
    + + + +

    + + + Smooth Scroll + +
    + Version 11 +

    + +
    + +

    Smooth Scroll

    +

    Smooth Scroll is a lightweight script to animate scrolling to anchor links. It works great with Gumshoe.

    +
    + +

    Demo

    Linear
    Linear (no other options)
    @@ -84,16 +114,41 @@

    Smooth Scroll

    .
    .
    .
    .
    .
    .
    .
    .
    .
    .
    .
    .
    .

    -

    Back to the top

    -
    -
    +

    Back to the top

    + + +
    + + + + + + - \ No newline at end of file diff --git a/docs/license.html b/docs/license.html new file mode 100755 index 0000000..6fb2b00 --- /dev/null +++ b/docs/license.html @@ -0,0 +1,212 @@ + + + + + + Smooth Scroll + + + + + + + + + + + + + +
    +
    + +
    + + + +

    + + + Smooth Scroll + +
    + Version 11 +

    + +
    + +

    License

    +

    Smooth Scroll has three types of licenses:

    +
      +
    1. Open Source, for personal and open source projects.
      2. +
    2. Commercial, for commercial projects and applications.
      3. +
    3. OEM, for when this Smooth Scroll will be bundled with a commercial interface builder, SDK, or toolkit.
      4. +
    +
    + + +

    Open Source License

    +

    If you're looking to use Smooth Scroll on an open source or personal project, the code is available under the GPLv3 License. GPLv3 has many terms, but the most important one is that it requires you to license you entire project under the terms of GPLv3 as well:

    +
    +

    You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged.

    +
    +

    You can absolutely use the open source license for commercial projects, but those projects must also be open sourced in their entirety with a GPLv3 license.

    +
    + + +

    Commercial License

    +

    The Commercial License let's you use Smooth Scroll in commercial projects and applications without the provisions of GPLv3. With this license, your code is kept proprietary.

    +
      +
    • You can use Smooth Scroll on as many websites or applications as you'd like.
      • +
    • You can include it in your own commercial products and applications, such as premium CMS themes, plugins, or templates.
      • +
    • Customers and users of your products do not need to purchase their own license, as long as they're not developing their own commercial products with Smooth Scroll.
      • +
    +

    Buy a Commercial License

    +

    Commercial Licenses are priced based on the number of developers working on a project that uses Smooth Scroll. Pay by credit card and instantly receive a PDF of your Commercial License.

    + + + + + + + + + + + + + + + + + + + + + +
    DescriptionPrice
    A Single Developer License can be used by 1 developer. Each individual developer needs to purchase a separate license.Buy a Single Developer License now for $99
    A Team License can be used by up to 8 developers.Buy a Team License now for $399
    An Organization License can be used by an unlimited number of developers.Buy an Organization License now for $999
    + +

    You can read the full text of the Commercial License below. Email me at chris@gomakethings.com with any questions you have about licensing.

    +

    The Commercial License Agreement

    +

    This Software License Agreement (the “Agreement”) is between Go Make Things, LLC (“Go Make Things”) and You (including your agents and affiliates), a commercial licensee of Go Make Things's software. If you have not purchased a Smooth Scroll Commercial License from Go Make Things, these terms do not apply to you, and your use of the Go Make Things software is instead governed by the GNU General Public License, version 3.

    +

    1. Definitions

    +
      +
    • “Application” means any software, application, or elements that Your Licensed Developers develop using the Software or Modifications in accordance with this Agreement.
      • +
    • “End User” means an end user of Your Application who acquires a license to such solely for their own use and not for distribution, resale, user interface design, or software development purposes.
      • +
    • “Licensed Developer” shall mean an individual person permitted to use the Software and make Modifications for your Applications, whether such person is Your employee or a consultant or contractor providing services to You.
      • +
    • “Modification” means any revision, adaptation, or derivative of the Software produced by You.
      • +
    • The “Software” means Smooth Scroll version 11.
      • +
    +

    2. Commercial license grant

    +

    Subject to the terms of this Agreement, Go Make Things grants to You a revocable, non-exclusive, non-transferable license:

    +
      +
    • for [n licensed developers—varies based on the license your purchase] to use the Software to create Modifications and Applications;
      • +
    • for You to distribute the Software and/or Modifications to an unlimited number of End Users solely as integrated into the Applications;
      • +
    • and for End Users to use the Software as incorporated into Your Applications in accordance with the terms of this Agreement.
      • +
    +

    You are entitled to receive all updates to the major version of the Software licensed by you, as well as any later version of the Software that Go Make Things, in writing, explicitly authorizes you to use. (For illustration purposes only, if you purchased a license for version 2.0, this licenses authorizes you to use version 2.9, but not 3.0.) Go Make Things makes no representation that any update will be compatible with your Application.

    +

    3. Ownership

    +

    This is a license agreement and not an agreement for sale. Go Make Things reserves ownership of all intellectual property rights inherent in or relating to the Software and corresponding source code, which include all copyright, patent rights, all rights in relation to registered and unregistered trademarks (including service marks), confidential information (including trade secrets and know-how) and all rights other than those expressly granted by this Agreement.

    +

    You must not remove, obscure or interfere with any copyright, acknowledgment, attribution, trademark, warning or disclaimer statement affixed to, incorporated in or otherwise applied in connection with the Software. Notwithstanding the above, you are permitted to produce, use, and distribute compressed or “minified” copies of the Software that do not bear the notices contained in the Software’s source code, so long as you otherwise comply with the terms of this license.

    +

    4. Prohibited Uses

    +

    Your Application must have substantially different functionality than, and must not compete directly with, the Software.

    +

    You may not distribute the Software or Modifications except as included within Your Application.

    +

    If You produce an Application for a customer, You are responsible for ensuring that your customer does not make use of the Software except with Applications licensed herein.

    +

    Your Application must not enable End Users to produce separate applications that incorporate the Software or Modifications. For example, if Your Application is a development toolkit or library, an application builder, a website builder that can be used to incorporate the Software into a new Application, You must obtain a separate OEM license from Go Make Things.

    +

    5. Termination

    +

    This Agreement and the license granted hereunder shall continue until terminated in accordance with this Section. Unless otherwise specified in this Agreement, the license shall last as long as Your use of the Software is in compliance with the terms herein.

    +

    Go Make Things shall have the right to terminate this Agreement and the license granted hereunder immediately if You breach any of the material terms of this Agreement. Upon termination of this Agreement, all licenses granted to You in this Agreement shall terminate automatically and You shall immediately cease use and distribution of the Software.

    +

    Upon termination of this Agreement, You must cease all use of the Software. If, prior to your breach of this Agreement, you delivered Applications incorporating the Software to Your End Users, those End Users’ licenses shall survive termination.

    +

    6. Disclaimer of Warranties

    +

    TO THE EXTENT PERMITTED BY LAW, GO MAKE THINGS DISCLAIMS ALL WARRANTIES AND CONDITIONS, EITHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT, WITH REGARD TO THE SOFTWARE. WE DO NOT GUARANTEE THAT THE OPERATION OF THE SOFTWARE OR YOUR APPLICATION WILL BE UNINTERRUPTED OR ERROR-FREE, AND YOU ACKNOWLEDGE THAT IT IS NOT TECHNICALLY PRACTICABLE FOR US TO DO SO.

    +

    7. Limitation of Liabilities

    +

    TO THE EXTENT PERMITTED BY LAW, IN NO EVENT SHALL GO MAKE THINGS BE LIABLE UNDER ANY LEGAL OR EQUITABLE THEORY FOR ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES WHATSOEVER (INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF BUSINESS PROFITS, BUSINESS INTERRUPTION, LOSS OF BUSINESS INFORMATION, OR ANY OTHER PECUNIARY LAW) ARISING OUT OF THE USE OF OR INABILITY TO USE THE SOFTWARE OR THE CODE IT PRODUCES OR ANY OTHER SUBJECT MATTER RELATING TO THIS AGREEMENT, EVEN IF GO MAKE THINGS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. IN ANY CASE, GO MAKE THINGS’S ENTIRE LIABILITY WITH RESPECT TO ANY SUBJECT MATTER RELATING TO THIS AGREEMENT SHALL BE LIMITED TO THE GREATER OF: (I) THE AMOUNT ACTUALLY PAID BY YOU FOR THE LICENSE, OR (II) FIVE HUNDRED DOLLARS ($500).

    +

    8. Indemnification

    +

    While redistributing the Software or Modifications thereof as part of Your Application, You may choose to offer acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this Agreement. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, and not on Go Make Things’s behalf.

    +

    You agree to indemnify, hold harmless, and defend Go Make Things and its owners, officers, agents, and affiliates from and against any and all claims, lawsuits and proceedings (collectively “Claims”), and all expenses, costs (including attorney's fees), judgments, damages and other liabilities resulting from such Claims, that arise or result from:

    +
      +
    • your use of the Software in violation of this Agreement;
      • +
    • the use or distribution of Your Application, except to the extent such claim is based solely on the inclusion of the Software therein;
      • +
    • your Modification of the Software’s source code; or
      • +
    • your accepting support, warranty, indemnity, or additional liability as described in the preceding paragraph.
      • +
    +

    9. Payment and Taxes

    +

    All payments under this Agreement are due to Go Make Things upon Your purchase of a license to the Software.

    +

    Each party shall be responsible for all taxes (including, but not limited to, taxes based upon its income) or levies imposed on it under applicable laws, regulations and tax treaties as a result of this Agreement and any payments made hereunder (including those required to be withheld or deducted from payments); provided that You shall be responsible for any value added tax, use tax, sales tax, or similar tax, and shall pay or reimburse Go Make Things for the same upon invoice. Each party shall furnish evidence of such paid taxes as is sufficient to enable the other party to obtain any credits available to it, including original tax withholding certificates.

    +

    10. Miscellaneous

    +

    Software Updates and Upgrades. The license granted herein applies only to the version of the Software available when purchased in connection with the terms of this Agreement, and to any updates and/or upgrades to which You may be entitled. Any previous or subsequent license granted to You for use of the Software shall be governed by the terms and conditions of the agreement entered in connection with purchase or download of that version of the Software.

    +

    Survival. The provisions of sections 4 through 10 will survive termination of this Agreement.

    +

    Compliance with Applicable Laws. You agree that You will comply with all applicable laws and regulations with respect to the Software, including without limitation all export control laws and regulations.

    +

    Marketing. You agree to Go Make Things’s use of Your name, trade name, and trademark, for use in Go Make Things’s marketing materials and its website, solely to identify you as a customer of Go Make Things.

    +

    Assignment. This Agreement may be assigned by Go Make Things in whole or in part and will inure to the benefit of Go Make Things’s successors and assigns. You may not assign or transfer this Agreement without Go Make Things’s prior written consent. Notwithstanding the foregoing, however, if You transfer ownership of an Application to a customer for which it was developed, You may assign this Agreement to that customer (the “Assignee”) provided:

    +
      +
    1. You provide written notice to Go Make Things prior to the effective date of such assignment; and
      2. +
    2. there is a written agreement, wherein the Assignee accepts the terms of this Agreement.
      3. +
    +

    Entire Agreement. The terms and conditions stated herein set forth the entire agreement of the parties and replace and supersede all other contracts, agreements, and understandings, written or oral, relating to the subject matter hereof.

    +

    Severability. In the event that any portion of this Agreement is held to be unenforceable, such portions shall not limit or otherwise modify or affect any other portion of this Agreement.

    +

    Modification; Waiver. This Agreement cannot be amended except by a written instrument executed by Go Make Things.

Go Make Things reserves the right, at any time and from time to time, to update, revise, supplement, and otherwise modify this Agreement and to impose new or additional rules, policies, terms, or conditions on your use of the Software. Such updates, revisions, supplements, modifications, and additional rules, policies, terms, and conditions (collectively referred to in this Agreement as “Additional Terms”) will be effective immediately and incorporated into this Agreement. You will be notified of any Additional Terms in writing. Your continued use of the Software following will be deemed to constitute your acceptance of any and all such Additional Terms. All Additional Terms are hereby incorporated into this Agreement by this reference.

 The failure of Go Make Things to enforce any provision of this Agreement may not be deemed a waiver of that or any other provision of this Agreement.

    +

    Governing Law. This Agreement is subject to, and shall be interpreted and enforced in accordance with, the laws of the Commonwealth of Massachusetts in all respects without regard to conflict of law principles. The Courts of Bristol County, Massachusetts and Norfolk County, Massachusetts shall be the sole and exclusive Courts in which either party may attempt to enforce or establish the existence or scope of any rights, benefits or obligations under this Agreement. The UN Convention on Contracts for the International Sale of Goods is expressly excluded.

    +

    Government Use. If the Software or any related documentation is licensed to the U.S. Government or any agency thereof, it will be considered to be “commercial computer software” or “commercial computer software documentation,” as those terms are used in 48 CFR § 12.212 or 48 CFR § 227.7202, and is being licensed with only those rights as are granted to all other licensees as set forth in this Agreement.

    +
    + + +

    OEM License

    +

    If you'll be including Smooth Scroll in a project that can be used to build new products, websites, or applications—such as a commercial interface builder, SDK, or toolkit—you need to purchase an OEM License.

    +

    The OEM License is customized for you. Please content me chris@gomakethings.com to discuss your project.

    + + + +
    +
    +
    + + + + + + + + + + + \ No newline at end of file diff --git a/docs/options.html b/docs/options.html new file mode 100755 index 0000000..bebdc72 --- /dev/null +++ b/docs/options.html @@ -0,0 +1,241 @@ + + + + + + Smooth Scroll + + + + + + + + + + + + + +
    +
    + +
    + + + +

    + + + Smooth Scroll + +
    + Version 11 +

    + +
    + +

    Options and Settings

    +

    Smooth Scroll includes smart defaults and works right out of the box. But if you want to customize things, it also has a robust API that provides multiple ways for you to adjust the default options and settings.

    +
    + +

    Global Settings

    +

    You can pass options and callbacks into Smooth Scroll through the init() function:

    +
    smoothScroll.init({
+    // Selectors
+    selector: '[data-scroll]', // Selector for links (must be a valid CSS selector)
+    selectorHeader: null, // Selector for fixed headers (must be a valid CSS selector) [optional]
+
+    // Speed & Easing
+    speed: 500, // Integer. How fast to complete the scroll in milliseconds
+    offset: 0, // Integer or Function returning an integer. How far to offset the scrolling anchor location in pixels
+    easing: 'easeInOutCubic', // Easing pattern to use
+
+    // Custom easing patterns.
+    // Must be an object with the easing name as the key
+    // Each pattern must be a function, with `time` as the argument, that returns the pattern
+    easingPatterns: {
+        myCustomEasingPattern: function (time) {
+            return time * (2 - time);
+        }
+    }
+
+    // Callback API
+    before: function (anchor, toggle) {}, // Function to run before scrolling starts
+    after: function (anchor, toggle) {} // Function to run after scrolling completes
+});
+
    +

    Note: To programatically add Smooth Scroll to all anchor links on a page, pass selector: 'a[href*="#"]' into init.

    +

    Easing Options

    +

    Linear +Moves at the same speed from start to finish.

    +
      +
    • Linear
      • +
    +

    Ease-In +Gradually increases in speed.

    +
      +
    • easeInQuad
      • +
    • easeInCubic
      • +
    • easeInQuart
      • +
    • easeInQuint
      • +
    +

    Ease-In-Out +Gradually increases in speed, peaks, and then gradually slows down.

    +
      +
    • easeInOutQuad
      • +
    • easeInOutCubic
      • +
    • easeInOutQuart
      • +
    • easeInOutQuint
      • +
    +

    Ease-Out +Gradually decreases in speed.

    +
      +
    • easeOutQuad
      • +
    • easeOutCubic
      • +
    • easeOutQuart
      • +
    • easeOutQuint
      • +
    +

    Learn more about the different easing patterns and what they do at easings.net.

    +
    + + +

    Override settings with data attributes

    +

    Smooth Scroll also lets you override global settings on a link-by-link basis using the [data-options] data attribute.

    +
    <a data-scroll
+   data-options='{
+                    "speed": 500,
+                    "easing": "easeInOutCubic",
+                    "offset": 0
+                }'
+>
+    Anchor Link
+</a>
+
    +

    Note: You must use valid JSON in order for the data-options feature to work. Does not support the callback method.

    +
    + + +

    Use Smooth Scroll events in your own scripts

    +

    You can also call Smooth Scroll's scroll animation events in your own scripts.

    +

    animateScroll()

    +

    Animate scrolling to an anchor.

    +
    smoothScroll.animateScroll(
+    anchor, // Node to scroll to. ex. document.querySelector( '#bazinga' )
+    toggle, // Node that toggles the animation, OR an integer. ex. document.querySelector( '#toggle' )
+    options // Classes and callbacks. Same options as those passed into the init() function.
+);
+
    +

    Example 1

    +
    var anchor = document.querySelector( '#bazinga' );
+smoothScroll.animateScroll( anchor );
+
    +

    Example 2

    +
    var anchor = document.querySelector( '#bazinga' );
+var toggle = document.querySelector('#toggle');
+var options = { speed: 1000, easing: 'easeOutCubic' };
+smoothScroll.animateScroll( anchor, toggle, options );
+
    +

    Example 3

    +
    // You can optionally pass in a y-position to scroll to as an integer
+smoothScroll.animateScroll( 750 );
+
    +

    destroy()

    +

    Destroy the current smoothScroll.init(). This is called automatically during the init function to remove any existing initializations.

    +
    smoothScroll.destroy();
+
    +
    + + +

    Fixed Headers

    +

    If you're using a fixed header, Smooth Scroll will automatically offset scroll distances by the header height. Pass in a valid CSS selector for your fixed header as an option to the init.

    +

    If you have multiple fixed headers, pass in the last one in the markup.

    +
    <nav data-scroll-header>
+    ...
+</nav>
+...
+<script>
+    smoothScroll.init({
+        selectorHeader: '[data-scroll-header]'
+    });
+</script>
+
    +
    + + + +

    This is an often requested feature, but Smooth Scroll does not include an option to animate scrolling to links on other pages.

    +

    You can attempt to implement it using the API, but it's very difficult to prevent the automatic browser jump when the page loads, and anything I've done to work around it results in weird, janky issues, so I've decided to leave this out of the core. Here's a potential workaround...

    +
      +

    1. Do not add the data-scroll attribute to links to other pages. Treat them like normal links, and include your anchor link hash as normal.

      +
       <a href="some-page.html#example">
+
      +
      2. +

    2. Add the following script to the footer of your page, after the smoothScroll.init() function.

      +
       <script>
+     if ( window.location.hash ) {
+         var anchor = document.querySelector( window.location.hash ); // Get the anchor
+         var toggle = document.querySelector( 'a[href*="' + window.location.hash + '"]' ); // Get the toggle (if one exists)
+         var options = {}; // Any custom options you want to use would go here
+         smoothScroll.animateScroll( anchor, toggle, options );
+     }
+ </script>
+
      +
      3. +
    + + + +
    +
    +
    + + + + + + + + + + + \ No newline at end of file diff --git a/docs/setup.html b/docs/setup.html new file mode 100755 index 0000000..52a7217 --- /dev/null +++ b/docs/setup.html @@ -0,0 +1,110 @@ + + + + + + Smooth Scroll + + + + + + + + + + + + + +
    +
    + +
    + + + +

    + + + Smooth Scroll + +
    + Version 11 +

    + +
    + +

    Getting Started

    +

    Compiled and production-ready code can be found in the dist directory. The src directory contains development code.

    +

    1. Include Smooth Scroll on your site.

    +
    <script src="dist/js/smooth-scroll.js"></script>
+
    +

    2. Add the markup to your HTML.

    +

    Turn anchor links into Smooth Scroll links by adding the [data-scroll] data attribute. Give the anchor location an ID just like you normally would.

    +
    <a data-scroll href="#bazinga">Anchor Link</a>
+...
+<span id="bazinga">Bazinga!</span>
+
    +

    3. Initialize Smooth Scroll.

    +

    In the footer of your page, after the content, initialize Smooth Scroll. And that's it, you're done. Nice work!

    +
    <script>
+    smoothScroll.init();
+</script>
+
    + + + +
    +
    +
    + + + + + + + + + + + \ No newline at end of file diff --git a/docs/source.html b/docs/source.html new file mode 100644 index 0000000..16ce46f --- /dev/null +++ b/docs/source.html @@ -0,0 +1,112 @@ + + + + + + Smooth Scroll + + + + + + + + + + + + + +
    +
    + +
    + + + +

    + + + Smooth Scroll + +
    + Version 11 +

    + +
    + +

    Working with the Source Files

    +

    If you would prefer, you can work with the development code in the src directory using the included Gulp build system. This compiles, lints, and minifies code.

    +

    Dependencies

    +

    Make sure these are installed first.

    + +

    Quick Start

    +
      +
    1. In bash/terminal/command line, cd into your project directory.
      2. +
    2. Run npm install to install required files.
      3. +
    3. When it's done installing, run one of the task runners to get going:
        +
      • gulp manually compiles files.
        • +
      • gulp watch automatically compiles files when changes are made and applies changes using LiveReload.
        • +
      +
      4. +
    +

    Compiled and production-ready code can be found in the dist directory. The src directory contains development code.

    + + + +
    +
    +
    + + + + + + + + + + + \ No newline at end of file diff --git a/gulpfile.js b/gulpfile.js index 63be8c9..ffadced 100755 --- a/gulpfile.js +++ b/gulpfile.js @@ -58,14 +58,14 @@ var banner = { '/*!\n' + ' * <%= package.name %> v<%= package.version %>: <%= package.description %>\n' + ' * (c) ' + new Date().getFullYear() + ' <%= package.author.name %>\n' + - ' * MIT License\n' + + ' * <%= package.license %> License\n' + ' * <%= package.repository.url %>\n' + ' */\n\n', min : '/*!' + ' <%= package.name %> v<%= package.version %>' + ' | (c) ' + new Date().getFullYear() + ' <%= package.author.name %>' + - ' | MIT License' + + ' | <%= package.license %> License' + ' | <%= package.repository.url %>' + ' */\n' }; diff --git a/package.json b/package.json index eca9e45..2671b64 100755 --- a/package.json +++ b/package.json @@ -1,13 +1,13 @@ { "name": "smooth-scroll", - "version": "10.3.1", + "version": "11.0.0", "description": "Animate scrolling to anchor links", "main": "./dist/js/smooth-scroll.min.js", "author": { "name": "Chris Ferdinandi", "url": "http://gomakethings.com/" }, - "license": "MIT", + "license": "GPL-3.0", "repository": { "type": "git", "url": "http://github.com/cferdinandi/smooth-scroll" diff --git a/src/docs/_templates/_footer.html b/src/docs/_templates/_footer.html old mode 100644 new mode 100755 index 81c0ea3..13e8518 --- a/src/docs/_templates/_footer.html +++ b/src/docs/_templates/_footer.html @@ -1,13 +1,38 @@ + - -
    + +
    + + + + + + - \ No newline at end of file diff --git a/src/docs/_templates/_header.html b/src/docs/_templates/_header.html old mode 100644 new mode 100755 index 2bd0e5c..2eb02ef --- a/src/docs/_templates/_header.html +++ b/src/docs/_templates/_header.html @@ -5,26 +5,52 @@ Smooth Scroll + - + + -
    + + - +
    +
    -
    +
    + + + +

    + + + Smooth Scroll + +
    + Version 11 +

    + +
    + +
    \ No newline at end of file diff --git a/src/docs/assets/css/custom.css b/src/docs/assets/css/custom.css new file mode 100755 index 0000000..dbe16cd --- /dev/null +++ b/src/docs/assets/css/custom.css @@ -0,0 +1,176 @@ +/** + * Typography + */ + +body { + font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif; +} + +h1, h2, h3, h4, h5, h6 { + font-weight: bold; +} + + +/** + * Background color + */ + +@media (min-width: 40em) { + body { + background-image: -webkit-linear-gradient(left, #f7f7f7 0%, #f7f7f7 25%, transparent 25%, transparent 100%); + background-image: linear-gradient(to right, #f7f7f7 0, #f7f7f7 25%, transparent 25%, transparent 100%); + } +} + + +/** + * Navigation + */ + +@media (max-width: 40em) { + .list-nav { + margin-left: -0.25em; + margin-right: -0.25em; + padding: 0; + } + + .list-nav > li { + display: inline-block; + margin-left: 0.25em; + margin-right: 0.25em; + } + + .list-nav > li:before { + content: "\00b7"; + margin-right: 0.5em; + } + + .list-nav > li:first-child:before { + content: ""; + margin-right: 0; + } +} + +@media (max-width: 40em) { + .nav { + border-bottom: 1px solid #e5e5e5; + } +} + +.nav-section a.active { + color: #808080; +} + +/* Disable current page nav */ +a.nav-active { + pointer-events: none; + color: #808080; + cursor: not-allowed; +} + +/* Sticky nav */ +@media (min-width: 40em) { + .sticky-header { + background-color: #f7f7f7; + bottom: 0; + overflow-y: auto; + position: fixed; + top: 0; + width: 22.2%; + } + + .sticky-body { + margin-left: 27.8%; + } +} + +@media (min-width: 80em) { + .sticky-header { + width: 17.75em; + } +} + + +/** + * Buttons + */ + +.btn { + background-color: #f7272f; + border-color: #f7272f; +} + +a.btn:active, +a.btn:focus, +a.btn:hover { + background-color: #cb070e; + border-color: #cb070e; +} + + + +/** + * Prism + * Code syntax highlighting by Lea Verou. + * http://prismjs.com/ + */ + +@media screen { + + .token.comment, + .token.prolog, + .token.doctype, + .token.cdata { + color: slategray; + } + + .token.punctuation { + color: #999; + } + + .token.property, + .token.tag, + .token.boolean, + .token.number, + .token.constant, + .token.symbol { + color: #905; + } + + .token.selector, + .token.attr-name, + .token.string, + .token.builtin { + color: #690; + } + + .token.operator, + .token.entity, + .token.url, + .language-css .token.string, + .style .token.string, + .token.variable { + color: #a67f59; + } + + .token.atrule, + .token.attr-value, + .token.keyword { + color: #07a; + } + + + .token.regex, + .token.important { + color: #e90; + } + + .token.important { + font-weight: bold; + } + + .token.entity { + cursor: help; + } + +} \ No newline at end of file diff --git a/src/docs/assets/css/main.css b/src/docs/assets/css/main.css new file mode 100755 index 0000000..7e5a18f --- /dev/null +++ b/src/docs/assets/css/main.css @@ -0,0 +1,1559 @@ +/*! + * Kraken v7.5.2: A lightweight front-end boilerplate + * (c) 2017 Chris Ferdinandi + * MIT License + * http://github.com/cferdinandi/kraken + */ + +/** + * @section Normalize.css + * Normalize.css base with custom code. + * Additional normalize styles incorporated throughout components. + * @link http://necolas.github.io/normalize.css/ + */ +/** + * Mobile screen resizing + * @link http://dev.w3.org/csswg/css-device-adapt/ + */ +@-webkit-viewport { + width: device-width; + zoom: 1.0; +} + +@-moz-viewport { + width: device-width; + zoom: 1.0; +} + +@-ms-viewport { + width: device-width; + zoom: 1.0; +} + +@-o-viewport { + width: device-width; + zoom: 1.0; +} + +@viewport { + width: device-width; + zoom: 1.0; +} + +/** + * Remove the tap delay in webkit + * @link https://medium.com/@adactio/delay-a9df9edceef3#.7dmbl3xow + */ +/* line 23, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_normalize.scss */ +a, .link-block-styled, +button, +input, +select, +textarea, +label, +summary { + -ms-touch-action: manipulation; + touch-action: manipulation; +} + +/** + * Add box sizing to everything + * @link http://www.paulirish.com/2012/box-sizing-border-box-ftw/ + */ +/* line 38, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_normalize.scss */ +*, +*:before, +*:after { + box-sizing: border-box; +} + +/** + * 1. Set default font family to default. + * 2. Force scrollbar display to prevent jumping on pages. + * 3. Prevent iOS text size adjust after orientation change, without disabling + * user zoom. + */ +/* line 51, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_normalize.scss */ +html { + font-family: "Helvetica Neue", Arial, sans-serif; + /* 1 */ + overflow-y: scroll; + /* 2 */ + -webkit-text-size-adjust: 100%; + -ms-text-size-adjust: 100%; + text-size-adjust: 100%; + /* 3 */ +} + +/** + * Remove default margin. + */ +/* line 60, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_normalize.scss */ +body { + margin: 0; +} + +/** + * Correct `block` display not defined for any HTML5 element in IE 8/9. + * Correct `block` display not defined for `details` in IE 10/11 + * and Firefox. + * Correct `block` display not defined for `main` in IE 11. + */ +/* line 70, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_normalize.scss */ +article, +aside, +cite, +details, +figcaption, +figure, +footer, +header, +hgroup, +main, +menu, +nav, +section { + display: block; +} + +/* + * Add the correct display in all browsers. + */ +/* line 89, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_normalize.scss */ +summary { + display: list-item; +} + +/** + * Correct `inline-block` display not defined in IE 8/9. + */ +/* line 96, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_normalize.scss */ +audio, +canvas, +progress, +video { + display: inline-block; + /* 1 */ +} + +/** + * Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera. + */ +/* line 106, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_normalize.scss */ +progress { + vertical-align: baseline; +} + +/** + * Prevent modern browsers from displaying `audio` without controls. + * Remove excess height in iOS 5 devices. + */ +/* line 114, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_normalize.scss */ +audio:not([controls]) { + display: none; + height: 0; +} + +/** + * Prevent img and video elements from spilling outside of the page on smaller screens. + */ +/* line 122, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_normalize.scss */ +img, +video { + max-width: 100%; + height: auto; +} + +/** + * Prevent iframe, object, and embed elements from spilling outside of the page on smaller screens. + * height: auto causes iframes to smush, so it's omitted here. + */ +/* line 132, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_normalize.scss */ +iframe, +object, +embed { + max-width: 100%; +} + +/** + * Hide the template element in IE, Safari, and Firefox < 22. + */ +/** + * 1. Remove border when inside `a` element in IE 8/9/10. + * 2. Prevents IE from making scaled images look like crap + */ +/* line 149, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_normalize.scss */ +img { + border: 0; + /* 1 */ + -ms-interpolation-mode: bicubic; + /* 2 */ +} + +/** + * Correct overflow not hidden in IE 9/10/11. + */ +/* line 157, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_normalize.scss */ +svg:not(:root) { + overflow: hidden; +} + +/** + * Address inconsistent margin. + */ +/* line 164, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_normalize.scss */ +figure { + margin: 0; +} + +/** + * @workaround Remove focus from
    element when using tabindex="-1" hack for skipnav link + * @link https://code.google.com/p/chromium/issues/detail?id=37721 + */ +/* line 172, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_normalize.scss */ +.tabindex:focus { + outline: none; +} + +/** + * @section Grid + * Structure and layout + */ +/** + * Base grid styles: single column + */ +/* line 9, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_grid.scss */ +.container { + margin-left: auto; + margin-right: auto; + max-width: 80em; + width: 88%; +} + +/* line 16, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_grid.scss */ +.row { + margin-left: -1.4%; + margin-right: -1.4%; +} + +/* line 21, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_grid.scss */ +.grid-fourth, .grid-third, .grid-half, .grid-two-thirds, .grid-three-fourths, .grid-full, .grid-dynamic { + float: left; + padding-left: 1.4%; + padding-right: 1.4%; + width: 100%; +} + +/** + * Reverses order of grid for content choreography + */ +/* line 38, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_grid.scss */ +.grid-flip { + float: right; +} + +/** + * Add columns to grid on bigger screens + */ +@media (min-width: 20em) { + /* line 49, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_grid.scss */ + .row-start-xsmall .grid-fourth { + width: 25%; + } + /* line 49, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_grid.scss */ + .row-start-xsmall .grid-third { + width: 33.33333%; + } + /* line 49, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_grid.scss */ + .row-start-xsmall .grid-half { + width: 50%; + } + /* line 49, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_grid.scss */ + .row-start-xsmall .grid-two-thirds { + width: 66.66667%; + } + /* line 49, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_grid.scss */ + .row-start-xsmall .grid-three-fourths { + width: 75%; + } + /* line 49, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_grid.scss */ + .row-start-xsmall .grid-full { + width: 100%; + } +} + +@media (min-width: 30em) { + /* line 49, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_grid.scss */ + .row-start-small .grid-fourth { + width: 25%; + } + /* line 49, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_grid.scss */ + .row-start-small .grid-third { + width: 33.33333%; + } + /* line 49, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_grid.scss */ + .row-start-small .grid-half { + width: 50%; + } + /* line 49, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_grid.scss */ + .row-start-small .grid-two-thirds { + width: 66.66667%; + } + /* line 49, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_grid.scss */ + .row-start-small .grid-three-fourths { + width: 75%; + } + /* line 49, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_grid.scss */ + .row-start-small .grid-full { + width: 100%; + } +} + +@media (min-width: 40em) { + /* line 49, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_grid.scss */ + .grid-fourth { + width: 25%; + } + /* line 49, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_grid.scss */ + .grid-third { + width: 33.33333%; + } + /* line 49, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_grid.scss */ + .grid-half { + width: 50%; + } + /* line 49, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_grid.scss */ + .grid-two-thirds { + width: 66.66667%; + } + /* line 49, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_grid.scss */ + .grid-three-fourths { + width: 75%; + } + /* line 49, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_grid.scss */ + .grid-full { + width: 100%; + } + /* line 55, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_grid.scss */ + .offset-fourth { + margin-left: 25%; + } + /* line 55, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_grid.scss */ + .offset-third { + margin-left: 33.33333%; + } + /* line 55, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_grid.scss */ + .offset-half { + margin-left: 50%; + } + /* line 55, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_grid.scss */ + .offset-two-thirds { + margin-left: 66.66667%; + } + /* line 55, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_grid.scss */ + .offset-three-fourths { + margin-left: 75%; + } + /* line 55, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_grid.scss */ + .offset-full { + margin-left: 100%; + } +} + +/** + * Dynamic grid + */ +@media (min-width: 20em) { + /* line 71, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_grid.scss */ + .grid-dynamic { + width: 50%; + } +} + +@media (min-width: 30em) { + /* line 71, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_grid.scss */ + .grid-dynamic { + width: 33.33333%; + } +} + +@media (min-width: 40em) { + /* line 71, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_grid.scss */ + .grid-dynamic { + width: 25%; + } +} + +/** + * @section Typography + * Sets font styles for entire site + */ +/* line 6, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ +body { + background: #ffffff; + color: #272727; + font-family: "Helvetica Neue", Arial, sans-serif; + font-size: 100%; + line-height: 1.5; +} + +@media (min-width: 40em) { + /* line 6, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ + body { + line-height: 1.5625; + } +} + +/* line 18, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ +p { + margin: 0 0 1.5625em; +} + +/** + * Hyperlink styling + * 1. Remove the gray background on active links in IE 10. + * 2. Remove gaps in links underline in iOS 8+ and Safari 8+. + */ +/* line 29, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ +a, .link-block-styled { + background-color: transparent; + /* 1 */ + color: #0088cc; + text-decoration: none; + word-wrap: break-word; + -webkit-text-decoration-skip: objects; + /* 2 */ + /** + * Improve readability when focused and also mouse hovered in all browsers. + */ +} + +/* line 39, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ +a:active, .link-block-styled:active, a:hover, .link-block-styled:hover, .link-block:hover .link-block-styled { + outline: 0; +} + +/* line 44, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ +a:active, .link-block-styled:active, a:focus, .link-block-styled:focus, a:hover, .link-block-styled:hover, .link-block:hover .link-block-styled { + color: #005580; + text-decoration: underline; +} + +/** + * Creates block-level links + */ +/* line 57, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ +a.link-block, .link-block.link-block-styled { + color: #272727; + display: block; + text-decoration: none; +} + +/** + * List styling + */ +/* line 76, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ +ul, +ol { + margin: 0 0 1.5625em 2em; + padding: 0; +} + +/* line 82, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ +ul ul, +ul ol, +ol ol, +ol ul { + margin-bottom: 0; +} + +/* line 89, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ +dl, +dd { + margin: 0; + padding: 0; +} + +/* line 95, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ +dd { + margin-bottom: 1.5625em; +} + +/* line 99, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ +dt { + font-weight: bold; +} + +/** + * Removes list styling. + * For semantic reasons, should only be used on unordered lists. + */ +/* line 107, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ +.list-unstyled { + margin-left: 0; + list-style: none; +} + +/** + * Display lists on a single line. + */ +/* line 116, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ +.list-inline { + list-style: none; + margin-left: -0.5em; + margin-right: -0.5em; + padding: 0; +} + +/* line 123, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ +.list-inline > li { + display: inline; + margin-left: 0.5em; + margin-right: 0.5em; +} + +/** + * Heading styling for h1 through h6 elements. + * Heading class lets you use one heading type for semantics, but style it as another heading type. + */ +/* line 135, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ +h1, h2, h3, h4, h5, h6 { + font-weight: normal; + line-height: 1.2; + margin: 0 0 1em; + padding: 1em 0 0; + word-wrap: break-word; +} + +/* line 143, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ +h1, +.h1 { + font-size: 1.5em; + padding-top: .5em; +} + +@media (min-width: 40em) { + /* line 143, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ + h1, + .h1 { + font-size: 1.75em; + } +} + +/* line 153, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ +h2, +.h2 { + font-size: 1.3125em; +} + +/* line 158, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ +h3, +.h3 { + font-size: 1.1875em; +} + +/* line 163, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ +h4, h5, h6, +.h4, .h5, .h6 { + font-size: 1em; +} + +/* line 168, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ +h4, +.h4 { + text-transform: uppercase; +} + +/** + * Lines, Quotes and Emphasis + */ +/* line 178, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ +hr { + border: 0; + border-top: 1px solid #e5e5e5; + border-bottom: 0 solid #ffffff; + box-sizing: content-box; + margin: 2em auto; + overflow: visible; +} + +/** + * Prevent the duplicate application of `bolder` by the next rule in Safari 6. + */ +/* line 190, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ +b, +strong { + font-weight: inherit; +} + +/** + * Add the correct font weight in Chrome, Edge, and Safari. + */ +/* line 198, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ +b, +strong { + font-weight: bolder; +} + +/** + * 1. Remove the bottom border in Firefox 39-. + * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari. + */ +/* line 207, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ +abbr[title] { + border-bottom: none; + /* 1 */ + text-decoration: underline; + /* 2 */ + text-decoration: underline dotted; + /* 2 */ +} + +/** + * Address styling not present in Safari and Chrome. + */ +/* line 216, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ +dfn { + font-style: italic; +} + +/** + * Address styling not present in IE 8/9. + */ +/* line 223, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ +mark { + background: #ff0; + color: #000000; +} + +/** + * Address inconsistent and variable font size in all browsers. + */ +/* line 231, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ +small { + font-size: 80%; +} + +/** + * Prevent `sub` and `sup` affecting `line-height` in all browsers. + */ +/* line 238, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ +sub, +sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; +} + +/* line 246, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ +sup { + top: -0.5em; +} + +/* line 250, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ +sub { + bottom: -0.25em; +} + +/** + * Blockquotes + */ +/* line 259, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ +blockquote { + font-size: 1.1875em; + font-style: italic; + margin: 0 0 1.5625em; + padding-left: 0.84211em; + padding-right: 0.84211em; +} + +/* line 266, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ +blockquote cite { + color: #808080; + font-size: 0.84211em; + padding-top: 1em; +} + +/* line 273, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ +blockquote, +q { + quotes: none; +} + +/* line 278, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_typography.scss */ +blockquote:before, +blockquote:after, +q:before, +q:after { + content: ''; +} + +/** + * @section Code + * Styling for code and preformatted text. + */ +/* line 6, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_code.scss */ +code, +kbd, +pre, +samp { + border-radius: 1px; + font-family: Menlo, Monaco, "Courier New", monospace; + font-size: 0.875em; +} + +/* line 15, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_code.scss */ +code { + background-color: #f7f7f7; + color: #dd1144; + padding: 0.25em; + word-wrap: break-word; +} + +/* line 22, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_code.scss */ +pre { + background-color: #f4f4f4; + display: block; + line-height: 1.5; + margin-bottom: 1.5625em; + overflow: auto; + padding: 0.8125em; + -moz-tab-size: 4; + -o-tab-size: 4; + tab-size: 4; + white-space: pre-wrap; + word-break: break-all; +} + +/* line 33, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_code.scss */ +pre code { + background-color: transparent; + border: 0; + color: inherit; + font-size: 1em; + padding: 0; +} + +/** + * @section Buttons + * Styling for CSS buttons. + */ +/** + * Primary buttons + */ +/* line 10, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_buttons.scss */ +.btn { + background-color: #0088cc; + border: 1px solid #0088cc; + border-radius: 1px; + color: #ffffff; + display: inline-block; + font-size: 0.9375em; + font-weight: normal; + line-height: 1.2; + margin-right: 0.3125em; + margin-bottom: 0.3125em; + padding: 0.5em 0.6875em; +} + +/* line 23, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_buttons.scss */ +.btn:hover, +a .btn:hover, .link-block-styled .btn:hover, .btn:focus, +a .btn:focus, .link-block-styled .btn:focus, .btn:active, +a .btn:active, .link-block-styled .btn:active, .btn.active { + background-color: #005580; + border-color: #005580; + color: #ffffff; + text-decoration: none; +} + +/** + * Secondary buttons + */ +/* line 41, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_buttons.scss */ +.btn-secondary { + background-color: #808080; + border-color: #808080; +} + +/* line 45, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_buttons.scss */ +.btn-secondary:hover, +a .btn-secondary:hover, .link-block-styled .btn-secondary:hover, .btn-secondary:focus, +a .btn-secondary:focus, .link-block-styled .btn-secondary:focus, .btn-secondary:active, +a .btn-secondary:active, .link-block-styled .btn-secondary:active, .btn-secondary.active { + background-color: #5a5a5a; + border-color: #5a5a5a; +} + +/** + * Active state + */ +/* line 61, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_buttons.scss */ +.btn:active, +.btn.active { + box-shadow: inset 0 0.15625em 0.25em rgba(0, 0, 0, 0.15), 0 1px 0.15625em rgba(0, 0, 0, 0.05); + outline: 0; +} + +/** + * Disabled state + */ +/* line 71, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_buttons.scss */ +.btn.disabled, +.btn[disabled] { + box-shadow: none; + cursor: not-allowed; + opacity: 0.5; + pointer-events: none; +} + +/** + * Button size + */ +/* line 83, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_buttons.scss */ +.btn-large { + font-size: 1em; + line-height: normal; + padding: 0.6875em 0.9375em; +} + +/** + * Block-level buttons + */ +/* line 93, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_buttons.scss */ +.btn-block, +input[type="submit"].btn-block, +input[type="reset"].btn-block, +input[type="button"].btn-block { + display: block; + margin-right: 0; + padding-right: 0; + padding-left: 0; + width: 100%; +} + +/** + * General styles + */ +/* line 108, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_buttons.scss */ +.btn, +button, +html input[type="button"], +input[type="reset"], +input[type="submit"] { + cursor: pointer; + text-align: center; + vertical-align: middle; + /** + * @workaround Override default button styling + * @affected Webkit/Firefox + */ + -webkit-appearance: none; +} + +/** + * Remove right margin on last element and inputs + */ +/* line 129, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_buttons.scss */ +.btn:last-child, +input.btn { + margin-right: 0; +} + +/** + * @section Forms + * Styling for form elements. + */ +/* line 6, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_forms.scss */ +form, +fieldset { + margin-bottom: 1.5625em; +} + +/* line 11, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_forms.scss */ +fieldset { + border: 0; + padding: 0; +} + +/* line 16, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_forms.scss */ +legend, +label { + display: block; + font-weight: normal; + margin: 0 0 0.3125em; + padding: 0; +} + +/** + * 1. Correct color not being inherited. + * Known issue: affects color of disabled elements. + * 2. Correct font properties not being inherited. + * 3. Address margins set differently in Firefox 4+, Safari, and Chrome. + */ +/* line 30, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_forms.scss */ +button, +input, +optgroup, +select, +textarea { + color: #555555; + /* 1 */ + font: inherit; + /* 2 */ + margin: 0; + /* 3 */ + padding: 0.3125em; +} + +/** + * Address `overflow` set to `hidden` in IE 8/9/10/11. + */ +/* line 44, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_forms.scss */ +button { + overflow: visible; +} + +/** + * Address inconsistent `text-transform` inheritance for `button` and `select`. + * All other form control elements do not inherit `text-transform` values. + * Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera. + * Correct `select` style inheritance in Firefox. + */ +/* line 54, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_forms.scss */ +button, +select { + text-transform: none; +} + +/* line 59, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_forms.scss */ +input, +textarea, +select { + border: 1px solid #b8b8b8; + border-radius: 1px; + display: block; + line-height: 1.5; + margin-bottom: 1.1875em; + width: 100%; +} + +@media (min-width: 40em) { + /* line 59, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_forms.scss */ + input, + textarea, + select { + line-height: 1.5625; + } +} + +/** + * Don't inherit the `font-weight` (applied by a rule above). + * NOTE: the default cannot safely be changed in Chrome and Safari on OS X. + */ +/* line 78, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_forms.scss */ +optgroup { + font-weight: bold; +} + +/* line 82, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_forms.scss */ +form button, +form .button { + margin-bottom: 1.1875em; +} + +/* line 87, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_forms.scss */ +textarea { + height: 12em; + overflow: auto; +} + +/* line 92, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_forms.scss */ +[type="image"], +[type="checkbox"], +[type="radio"] { + cursor: pointer; + display: inline-block; + height: auto; + margin-bottom: 0.3125em; + padding: 0; + width: auto; +} + +/** + * Fix the cursor style for Chrome's increment/decrement buttons. For certain + * `font-size` values of the `input`, it causes the cursor style of the + * decrement button to change from `default` to `text`. + */ +/* line 108, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_forms.scss */ +[type="number"]::-webkit-inner-spin-button, +[type="number"]::-webkit-outer-spin-button { + height: auto; +} + +/* line 113, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_forms.scss */ +input:focus, +textarea:focus { + border-color: rgba(82, 168, 236, 0.8); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 0.5em rgba(82, 168, 236, 0.6); + outline: 0; + outline: thin dotted \9; +} + +/* line 121, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_forms.scss */ +[type="file"]:focus, +[type="checkbox"]:focus, +select:focus { + outline: thin dotted; + outline: 0.3125em auto -webkit-focus-ring-color; + outline-offset: -0.125em; +} + +/** + * Remove the inner border and padding in Firefox. + */ +/* line 133, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_forms.scss */ +button::-moz-focus-inner, +[type="button"]::-moz-focus-inner, +[type="reset"]::-moz-focus-inner, +[type="submit"]::-moz-focus-inner { + border-style: none; + padding: 0; +} + +/** + * Restore the focus styles unset by the previous rule. + */ +/* line 145, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_forms.scss */ +button:-moz-focusring, +[type="button"]:-moz-focusring, +[type="reset"]:-moz-focusring, +[type="submit"]:-moz-focusring { + outline: 1px dotted ButtonText; +} + +/** + * 1. Correct the inability to style clickable types in iOS and Safari. + * 2. Change font properties to `inherit` in Safari. + */ +/* line 157, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_forms.scss */ +::-webkit-file-upload-button { + -webkit-appearance: button; + /* 1 */ + font: inherit; + /* 2 */ +} + +/** + * Inline inputs + */ +/* line 166, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_forms.scss */ +.input-inline { + display: inline-block; + vertical-align: middle; + width: auto; +} + +/** + * Condensed inputs + */ +/* line 176, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_forms.scss */ +.input-condensed { + padding: 1px 0.3125em; + font-size: 0.9375em; +} + +/** + * Search + */ +/** + * 1. Correct the odd appearance in Chrome and Safari. + * 2. Correct the outline style in Safari. + */ +/* line 191, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_forms.scss */ +[type="search"] { + -webkit-appearance: textfield; + /* 1 */ + outline-offset: -2px; + /* 2 */ +} + +/** + * Remove inner padding and search cancel button in Safari and Chrome on OS X. + * Safari (but not Chrome) clips the cancel button when the search input has + * padding (and `textfield` appearance). + */ +/* line 201, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_forms.scss */ +[type="search"]::-webkit-search-cancel-button, +[type="search"]::-webkit-search-decoration { + -webkit-appearance: none; +} + +/** + * Create rounded search bar + */ +/* line 210, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_forms.scss */ +.input-search { + width: 85%; + padding-left: 0.9375em; + padding-right: 2.5em; + border-radius: 1.3125em; + transition: width 300ms ease-in; +} + +@media (min-width: 40em) { + /* line 210, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_forms.scss */ + .input-search { + width: 65%; + } +} + +/** + * Special styling for search icon as button + */ +/* line 226, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_forms.scss */ +.btn-search { + display: inline; + color: #808080; + border: none; + background: none; + margin-left: -2.5em; + margin-bottom: 0; +} + +/* line 234, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_forms.scss */ +.btn-search .icon { + fill: #808080; +} + +/* line 238, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_forms.scss */ +.btn-search:hover { + color: #5a5a5a; +} + +/* line 241, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_forms.scss */ +.btn-search:hover .icon { + fill: #5a5a5a; +} + +/** + * @section SVGs + * SVG icon sprite styling. + * @link http://css-tricks.com/svg-sprites-use-better-icon-fonts/ + * @link http://css-tricks.com/svg-use-external-source/ + */ +/** + * Basic styles + * Only displayed when SVGs are supported to avoid large empty spaces + */ +/* line 12, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_svg.scss */ +.icon { + display: inline-block; + fill: currentColor; + height: 0; + width: 0; +} + +/* line 18, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_svg.scss */ +.svg .icon { + height: 1em; + width: 1em; +} + +/** + * Hide fallback text if browser supports SVG + */ +/** + * @section Tables + * Styling for tables + */ +/* line 6, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_tables.scss */ +table { + border-collapse: collapse; + border-spacing: 0; + margin-bottom: 1.5625em; + max-width: 100%; + width: 100%; +} + +/* line 14, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_tables.scss */ +th, +td { + text-align: left; + padding: 0.5em; +} + +/* line 20, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_tables.scss */ +th { + border-bottom: 0.125em solid #e5e5e5; + font-weight: bold; + vertical-align: bottom; +} + +/* line 27, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_tables.scss */ +td { + border-top: 1px solid #e5e5e5; + vertical-align: top; +} + +/** + * Adds zebra striping + */ +/* line 35, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_tables.scss */ +.table-striped tbody tr:nth-child(odd) { + background-color: #f7f7f7; +} + +/** + * Reduces padding on condensed tables + */ +/* line 43, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_tables.scss */ +.table-condensed th, +.table-condensed td { + padding: 0.25em; +} + +/** + * Pure CSS responsive tables + * Adds label to each cell using the [data-label] attribute + * @link https://techblog.livingsocial.com/blog/2015/04/06/responsive-tables-in-pure-css/ + */ +@media (max-width: 40em) { + /* line 57, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_tables.scss */ + .table-responsive thead { + display: none; + visibility: hidden; + } + /* line 62, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_tables.scss */ + .table-responsive tr { + border-top: 1px solid #ededed; + display: block; + padding: 0.5em; + } + /* line 68, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_tables.scss */ + .table-responsive td { + border: 0; + display: block; + padding: 0.25em; + } + /* line 73, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_tables.scss */ + .table-responsive td:before { + content: attr(data-label); + display: block; + font-weight: bold; + } +} + +/** + * @section Overrides + * Nudge and tweak alignment, spacing, and visibility. + */ +/** + * Text sizes + */ +/* line 11, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_overrides.scss */ +.text-small { + font-size: 0.9375em; +} + +/* line 15, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_overrides.scss */ +.text-large { + font-size: 1.1875em; + line-height: 1.4; +} + +@media (min-width: 40em) { + /* line 15, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_overrides.scss */ + .text-large { + font-size: 1.3125em; + } +} + +/** + * Text colors + */ +/* line 29, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_overrides.scss */ +.text-muted { + color: #808080; +} + +/** + * Text alignment + */ +/* line 38, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_overrides.scss */ +.text-center { + text-align: center; +} + +/* line 42, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_overrides.scss */ +.text-right { + text-align: right; +} + +/* line 46, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_overrides.scss */ +.text-left { + text-align: left; +} + +@media (min-width: 40em) { + /* line 51, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_overrides.scss */ + .text-right-medium { + text-align: right; + } +} + +/** + * Floats + */ +/* line 61, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_overrides.scss */ +.float-left { + float: left; +} + +/* line 65, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_overrides.scss */ +.float-center { + float: none; + margin-left: auto; + margin-right: auto; +} + +/* line 71, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_overrides.scss */ +.float-right { + float: right; +} + +/** + * Margins + */ +/* line 80, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_overrides.scss */ +.no-margin-top { + margin-top: 0; +} + +/* line 84, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_overrides.scss */ +.no-margin-bottom { + margin-bottom: 0; +} + +/* line 88, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_overrides.scss */ +.margin-top { + margin-top: 1.5625em; +} + +/* line 92, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_overrides.scss */ +.margin-bottom { + margin-bottom: 1.5625em; +} + +/* line 96, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_overrides.scss */ +.margin-bottom-small { + margin-bottom: 0.5em; +} + +/* line 100, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_overrides.scss */ +.margin-bottom-large { + margin-bottom: 2em; +} + +/** + * Padding + */ +/* line 109, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_overrides.scss */ +.no-padding-top { + padding-top: 0; +} + +/* line 113, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_overrides.scss */ +.no-padding-bottom { + padding-bottom: 0; +} + +/* line 117, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_overrides.scss */ +.padding-top { + padding-top: 1.5625em; +} + +/* line 121, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_overrides.scss */ +.padding-top-small { + padding-top: 0.5em; +} + +/* line 125, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_overrides.scss */ +.padding-top-large { + padding-top: 2em; +} + +/* line 129, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_overrides.scss */ +.padding-bottom { + padding-bottom: 1.5625em; +} + +/* line 133, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_overrides.scss */ +.padding-bottom-small { + padding-bottom: 0.5em; +} + +/* line 137, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_overrides.scss */ +.padding-bottom-large { + padding-bottom: 2em; +} + +/** + * Visibility + */ +/** + * Visually hide an element, but leave it available for screen readers + * @link https://github.com/h5bp/html5-boilerplate/blob/master/dist/css/main.css + * @link http://snook.ca/archives/html_and_css/hiding-content-for-accessibility + */ +/* line 151, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_overrides.scss */ +.screen-reader, .svg .icon-fallback-text { + border: 0; + clip: rect(0 0 0 0); + height: 1px; + margin: -1px; + overflow: hidden; + padding: 0; + position: absolute; + white-space: nowrap; + width: 1px; +} + +/** + * Extends the .screen-reader class to allow the element to be focusable when navigated to via the keyboard + * @link https://github.com/h5bp/html5-boilerplate/blob/master/dist/css/main.css + * @link https://www.drupal.org/node/897638 + */ +/* line 168, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_overrides.scss */ +.screen-reader-focusable:active, +.screen-reader-focusable:focus { + clip: auto; + height: auto; + margin: 0; + overflow: visible; + position: static; + white-space: normal; + width: auto; +} + +/** + * @workaround + * @affected IE 8/9/10 + * @link http://juicystudio.com/article/screen-readers-display-none.php + */ +/* line 184, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_overrides.scss */ +[hidden], template { + display: none; + visibility: hidden; +} + +/** + * Contain floats + * The space content is one way to avoid an Opera bug when the `contenteditable` attribute is included anywhere else in the document. + * @link https://github.com/h5bp/html5-boilerplate/blob/master/dist/css/main.css + */ +/* line 196, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_overrides.scss */ +.clearfix:before, .container:before, +.row:before, +.clearfix:after, +.container:after, +.row:after { + display: table; + content: " "; +} + +/* line 202, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_overrides.scss */ +.clearfix:after, .container:after, +.row:after { + clear: both; +} + +/** + * @section Print + * Styling for printed content. Adapted from HTML5BP. + * @link http://html5boilerplate.com + */ +@media print { + /** + * Universal selector. + * Reset all content to transparent background, black color, and remove box and text shadows. + */ + /* line 13, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_print.scss */ + * { + background: transparent !important; + color: #000 !important; + box-shadow: none !important; + text-shadow: none !important; + } + /** + * Specifies page margin + */ + @page { + margin: 0.5cm; + } + /** + * Underline all links + */ + /* line 30, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_print.scss */ + a, .link-block-styled, + a:visited, + .link-block-styled:visited { + text-decoration: underline; + } + /** + * Show URL after links + */ + /* line 38, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_print.scss */ + a[href]:after, [href].link-block-styled:after { + content: " (" attr(href) ")"; + } + /** + * Don't show URL for internal links + */ + /* line 45, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_print.scss */ + a[href^="#"]:after, [href^="#"].link-block-styled:after { + content: ""; + } + /** + * Specifies the minimum number of lines to print at the top and bottom of a page. + */ + /* line 52, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_print.scss */ + p, + h1, h2, h3 { + orphans: 3; + widows: 3; + } + /** + * Avoid inserting a page break after headers + */ + /* line 61, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_print.scss */ + h1, h2, h3 { + page-break-after: avoid; + } + /** + * Change border color on blockquotes and preformatted text. + * Avoid page breaks inside the content + */ + /* line 69, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_print.scss */ + pre, + blockquote { + border-color: #999; + page-break-inside: avoid; + } + /** + * Displayed as a table header row group + */ + /* line 78, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_print.scss */ + thead { + display: table-header-group; + } + /** + * Avoid inserting a page break inside table rows and images + */ + /* line 85, /Users/cferdinandi/Documents/Go Make Things LLC/plugins/_template/src/sass/components/_print.scss */ + tr, + img { + page-break-inside: avoid; + } +} diff --git a/src/docs/assets/js/gumshoe.min.js b/src/docs/assets/js/gumshoe.min.js new file mode 100755 index 0000000..266bcc3 --- /dev/null +++ b/src/docs/assets/js/gumshoe.min.js @@ -0,0 +1,2 @@ +/*! gumshoe v3.1.2 | (c) 2016 Chris Ferdinandi | MIT License | http://github.com/cferdinandi/gumshoe */ +!function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.gumshoe=t(e)}("undefined"!=typeof global?global:this.window||this.global,function(e){"use strict";var t,n,o,r,a,c,i={},s="querySelector"in document&&"addEventListener"in e&&"classList"in document.createElement("_"),l=[],u={selector:"[data-gumshoe] a",selectorHeader:"[data-gumshoe-header]",offset:0,activeClass:"active",callback:function(){}},f=function(e,t,n){if("[object Object]"===Object.prototype.toString.call(e))for(var o in e)Object.prototype.hasOwnProperty.call(e,o)&&t.call(n,e[o],o,e);else for(var r=0,a=e.length;a>r;r++)t.call(n,e[r],r,e)},d=function(){var e={},t=!1,n=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(t=arguments[0],n++);for(var r=function(n){for(var o in n)Object.prototype.hasOwnProperty.call(n,o)&&(t&&"[object Object]"===Object.prototype.toString.call(n[o])?e[o]=d(!0,e[o],n[o]):e[o]=n[o])};o>n;n++){var a=arguments[n];r(a)}return e},v=function(e){return Math.max(e.scrollHeight,e.offsetHeight,e.clientHeight)},m=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},g=function(e){var n=0;if(e.offsetParent){do n+=e.offsetTop,e=e.offsetParent;while(e)}else n=e.offsetTop;return n=n-a-t.offset,n>=0?n:0},h=function(e){var t=e.getBoundingClientRect();return t.top>=0&&t.left>=0&&t.bottom<=(window.innerHeight||document.documentElement.clientHeight)&&t.right<=(window.innerWidth||document.documentElement.clientWidth)},p=function(){l.sort(function(e,t){return e.distance>t.distance?-1:e.distance=o&&h(l[0].target))return H(l[0]),l[0];for(var r=0,a=l.length;a>r;r++){var c=l[r];if(c.distance<=n)return H(c),c}y(),t.callback()};var C=function(){f(l,function(e){e.nav.classList.contains(t.activeClass)&&(c={nav:e.nav,parent:e.parent})})};i.destroy=function(){t&&(e.removeEventListener("resize",L,!1),e.removeEventListener("scroll",L,!1),l=[],t=null,n=null,o=null,r=null,a=null,c=null)};var L=function(e){n||(n=setTimeout(function(){n=null,"scroll"===e.type&&i.getCurrentNav(),"resize"===e.type&&(i.setDistances(),i.getCurrentNav())},66))};return i.init=function(n){s&&(i.destroy(),t=d(u,n||{}),r=document.querySelector(t.selectorHeader),b(),0!==l.length&&(C(),i.setDistances(),i.getCurrentNav(),e.addEventListener("resize",L,!1),e.addEventListener("scroll",L,!1)))},i}); \ No newline at end of file diff --git a/src/docs/assets/js/highlight-active-nav.js b/src/docs/assets/js/highlight-active-nav.js new file mode 100755 index 0000000..4aa4981 --- /dev/null +++ b/src/docs/assets/js/highlight-active-nav.js @@ -0,0 +1,134 @@ +/** + * highlight-active-nav.js + * @description Highlight the active navigation element + * @version 1.0.0 + * @author Chris Ferdinandi + * @license MIT + */ + +(function (root, factory) { + if ( typeof define === 'function' && define.amd ) { + define([], factory(root)); + } else if ( typeof exports === 'object' ) { + module.exports = factory(root); + } else { + root.highlightActiveNav = factory(root); + } +})(typeof global !== 'undefined' ? global : this.window || this.global, function (root) { + + 'use strict'; + + // + // Variables + // + + var highlight = {}; // Object for public APIs + var supports = !!document.querySelector && !!root.addEventListener; // Feature test + var settings; + + // Default settings + var defaults = { + selector: '[data-nav-highlight]', + activeClass: 'nav-active', + urlPrefix: null, + callback: function () {} + }; + + + // + // Methods + // + + /** + * Merge defaults with user options + * @private + * @param {Object} defaults Default settings + * @param {Object} options User options + * @returns {Object} Merged values of defaults and options + */ + var extend = function () { + + // Variables + var extended = {}; + var deep = false; + var i = 0; + var length = arguments.length; + + // Check if a deep merge + if ( Object.prototype.toString.call( arguments[0] ) === '[object Boolean]' ) { + deep = arguments[0]; + i++; + } + + // Merge the object into the extended object + var merge = function (obj) { + for ( var prop in obj ) { + if ( Object.prototype.hasOwnProperty.call( obj, prop ) ) { + // If deep merge and property is an object, merge properties + if ( deep && Object.prototype.toString.call(obj[prop]) === '[object Object]' ) { + extended[prop] = extend( true, extended[prop], obj[prop] ); + } else { + extended[prop] = obj[prop]; + } + } + } + }; + + // Loop through each object and conduct a merge + for ( ; i < length; i++ ) { + var obj = arguments[i]; + merge(obj); + } + + return extended; + + }; + + /** + * Destroy the current initialization. + * @public + */ + highlight.destroy = function () { + if ( !settings ) return; + document.documentElement.classList.remove( settings.initClass ); + settings = null; + container = null; + }; + + /** + * Initialize highlightActiveNav + * @public + * @param {Object} options User settings + */ + highlight.init = function ( options ) { + + // feature test + if ( !supports ) return; + + // Destroy any existing initializations + highlight.destroy(); + + // Merge user options with defaults + settings = extend( defaults, options || {} ); + + // Get the container + var href = settings.urlPrefix ? location.pathname.split( settings.urlPrefix )[1] : location.pathname; + var nav = document.querySelector( settings.selector + ' a[href^="' + href + '"]' ); + if ( !nav ) return; + + // Add class to active nav + nav.className += ' ' + settings.activeClass; + + // Run callback + settings.callback(); + + }; + + + // + // Public APIs + // + + return highlight; + +}); \ No newline at end of file diff --git a/src/docs/assets/js/prism.js b/src/docs/assets/js/prism.js new file mode 100755 index 0000000..92b3663 --- /dev/null +++ b/src/docs/assets/js/prism.js @@ -0,0 +1,21 @@ +/* ============================================================= + + Prism v1.0 + Lightweight, robust, elegant syntax highlighting, by Lea Verou + http://lea.verou.me + + Licensed under MIT License. + http://www.opensource.org/licenses/mit-license.php/ + + * ============================================================= */ + + (function(){var e=/\blang(?:uage)?-(?!\*)(\w+)\b/i,t=self.Prism={util:{type:function(e){return Object.prototype.toString.call(e).match(/\[object (\w+)\]/)[1]},clone:function(e){var n=t.util.type(e);switch(n){case"Object":var r={};for(var i in e)e.hasOwnProperty(i)&&(r[i]=t.util.clone(e[i]));return r;case"Array":return e.slice()}return e}},languages:{extend:function(e,n){var r=t.util.clone(t.languages[e]);for(var i in n)r[i]=n[i];return r},insertBefore:function(e,n,r,i){i=i||t.languages;var s=i[e],o={};for(var u in s)if(s.hasOwnProperty(u)){if(u==n)for(var a in r)r.hasOwnProperty(a)&&(o[a]=r[a]);o[u]=s[u]}return i[e]=o},DFS:function(e,n){for(var r in e){n.call(e,r,e[r]);t.util.type(e)==="Object"&&t.languages.DFS(e[r],n)}}},highlightAll:function(e,n){var r=document.querySelectorAll('code[class*="language-"], [class*="language-"] code, code[class*="lang-"], [class*="lang-"] code');for(var i=0,s;s=r[i++];)t.highlightElement(s,e===!0,n)},highlightElement:function(r,i,s){var o,u,a=r;while(a&&!e.test(a.className))a=a.parentNode;if(a){o=(a.className.match(e)||[,""])[1];u=t.languages[o]}if(!u)return;r.className=r.className.replace(e,"").replace(/\s+/g," ")+" language-"+o;a=r.parentNode;/pre/i.test(a.nodeName)&&(a.className=a.className.replace(e,"").replace(/\s+/g," ")+" language-"+o);var f=r.textContent;if(!f)return;f=f.replace(/&/g,"&").replace(/e.length)break e;if(p instanceof i)continue;a.lastIndex=0;var d=a.exec(p);if(d){l&&(c=d[1].length);var v=d.index-1+c,d=d[0].slice(c),m=d.length,g=v+m,y=p.slice(0,v+1),b=p.slice(g+1),w=[h,1];y&&w.push(y);var E=new i(u,f?t.tokenize(d,f):d);w.push(E);b&&w.push(b);Array.prototype.splice.apply(s,w)}}}return s},hooks:{all:{},add:function(e,n){var r=t.hooks.all;r[e]=r[e]||[];r[e].push(n)},run:function(e,n){var r=t.hooks.all[e];if(!r||!r.length)return;for(var i=0,s;s=r[i++];)s(n)}}},n=t.Token=function(e,t){this.type=e;this.content=t};n.stringify=function(e,r,i){if(typeof e=="string")return e;if(Object.prototype.toString.call(e)=="[object Array]")return e.map(function(t){return n.stringify(t,r,e)}).join("");var s={type:e.type,content:n.stringify(e.content,r,i),tag:"span",classes:["token",e.type],attributes:{},language:r,parent:i};s.type=="comment"&&(s.attributes.spellcheck="true");t.hooks.run("wrap",s);var o="";for(var u in s.attributes)o+=u+'="'+(s.attributes[u]||"")+'"';return"<"+s.tag+' class="'+s.classes.join(" ")+'" '+o+">"+s.content+""};if(!self.document){self.addEventListener("message",function(e){var n=JSON.parse(e.data),r=n.language,i=n.code;self.postMessage(JSON.stringify(t.tokenize(i,t.languages[r])));self.close()},!1);return}var r=document.getElementsByTagName("script");r=r[r.length-1];if(r){t.filename=r.src;document.addEventListener&&!r.hasAttribute("data-manual")&&document.addEventListener("DOMContentLoaded",t.highlightAll)}})();; + Prism.languages.markup={comment:/<!--[\w\W]*?-->/g,prolog:/<\?.+?\?>/,doctype:/<!DOCTYPE.+?>/,cdata:/<!\[CDATA\[[\w\W]*?]]>/i,tag:{pattern:/<\/?[\w:-]+\s*(?:\s+[\w:-]+(?:=(?:("|')(\\?[\w\W])*?\1|\w+))?\s*)*\/?>/gi,inside:{tag:{pattern:/^<\/?[\w:-]+/i,inside:{punctuation:/^<\/?/,namespace:/^[\w-]+?:/}},"attr-value":{pattern:/=(?:('|")[\w\W]*?(\1)|[^\s>]+)/gi,inside:{punctuation:/=|>|"/g}},punctuation:/\/?>/g,"attr-name":{pattern:/[\w:-]+/g,inside:{namespace:/^[\w-]+?:/}}}},entity:/&#?[\da-z]{1,8};/gi};Prism.hooks.add("wrap",function(e){e.type==="entity"&&(e.attributes.title=e.content.replace(/&/,"&"))});; + Prism.languages.css={comment:/\/\*[\w\W]*?\*\//g,atrule:{pattern:/@[\w-]+?.*?(;|(?=\s*{))/gi,inside:{punctuation:/[;:]/g}},url:/url\((["']?).*?\1\)/gi,selector:/[^\{\}\s][^\{\};]*(?=\s*\{)/g,property:/(\b|\B)[\w-]+(?=\s*:)/ig,string:/("|')(\\?.)*?\1/g,important:/\B!important\b/gi,ignore:/&(lt|gt|amp);/gi,punctuation:/[\{\};:]/g};Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{style:{pattern:/(<|<)style[\w\W]*?(>|>)[\w\W]*?(<|<)\/style(>|>)/ig,inside:{tag:{pattern:/(<|<)style[\w\W]*?(>|>)|(<|<)\/style(>|>)/ig,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.css}}});; + Prism.languages.clike={comment:{pattern:/(^|[^\\])(\/\*[\w\W]*?\*\/|(^|[^:])\/\/.*?(\r?\n|$))/g,lookbehind:!0},string:/("|')(\\?.)*?\1/g,"class-name":{pattern:/((?:(?:class|interface|extends|implements|trait|instanceof|new)\s+)|(?:catch\s+\())[a-z0-9_\.\\]+/ig,lookbehind:!0,inside:{punctuation:/(\.|\\)/}},keyword:/\b(if|else|while|do|for|return|in|instanceof|function|new|try|throw|catch|finally|null|break|continue)\b/g,"boolean":/\b(true|false)\b/g,"function":{pattern:/[a-z0-9_]+\(/ig,inside:{punctuation:/\(/}}, number:/\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/g,operator:/[-+]{1,2}|!|<=?|>=?|={1,3}|(&){1,2}|\|?\||\?|\*|\/|\~|\^|\%/g,ignore:/&(lt|gt|amp);/gi,punctuation:/[{}[\];(),.:]/g}; + ; + Prism.languages.javascript=Prism.languages.extend("clike",{keyword:/\b(var|let|if|else|while|do|for|return|in|instanceof|function|new|with|typeof|try|throw|catch|finally|null|break|continue)\b/g,number:/\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?|NaN|-?Infinity)\b/g});Prism.languages.insertBefore("javascript","keyword",{regex:{pattern:/(^|[^/])\/(?!\/)(\[.+?]|\\.|[^/\r\n])+\/[gim]{0,3}(?=\s*($|[\r\n,.;})]))/g,lookbehind:!0}});Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{script:{pattern:/(<|<)script[\w\W]*?(>|>)[\w\W]*?(<|<)\/script(>|>)/ig,inside:{tag:{pattern:/(<|<)script[\w\W]*?(>|>)|(<|<)\/script(>|>)/ig,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.javascript}}}); + ; + Prism.languages.php=Prism.languages.extend("clike",{keyword:/\b(and|or|xor|array|as|break|case|cfunction|class|const|continue|declare|default|die|do|else|elseif|enddeclare|endfor|endforeach|endif|endswitch|endwhile|extends|for|foreach|function|include|include_once|global|if|new|return|static|switch|use|require|require_once|var|while|abstract|interface|public|implements|extends|private|protected|parent|static|throw|null|echo|print|trait|namespace|use|final|yield|goto|instanceof|finally|try|catch)\b/ig, constant:/\b[A-Z0-9_]{2,}\b/g});Prism.languages.insertBefore("php","keyword",{delimiter:/(\?>|<\?php|<\?)/ig,variable:/(\$\w+)\b/ig,"package":{pattern:/(\\|namespace\s+|use\s+)[\w\\]+/g,lookbehind:!0,inside:{punctuation:/\\/}}});Prism.languages.insertBefore("php","operator",{property:{pattern:/(->)[\w]+/g,lookbehind:!0}}); Prism.languages.markup&&(Prism.hooks.add("before-highlight",function(a){"php"===a.language&&(a.tokenStack=[],a.code=a.code.replace(/(?:<\?php|<\?|<\?php|<\?)[\w\W]*?(?:\?>|\?>)/ig,function(b){a.tokenStack.push(b);return"{{{PHP"+a.tokenStack.length+"}}}"}))}),Prism.hooks.add("after-highlight",function(a){if("php"===a.language){for(var b=0,c;c=a.tokenStack[b];b++)a.highlightedCode=a.highlightedCode.replace("{{{PHP"+(b+1)+"}}}",Prism.highlight(c,a.grammar,"php"));a.element.innerHTML=a.highlightedCode}}), Prism.hooks.add("wrap",function(a){"php"===a.language&&"markup"===a.type&&(a.content=a.content.replace(/(\{\{\{PHP[0-9]+\}\}\})/g,'$1'))}),Prism.languages.insertBefore("php","comment",{markup:{pattern:/(<|<)[^?]\/?(.*?)(>|>)/g,inside:Prism.languages.markup},php:/\{\{\{PHP[0-9]+\}\}\}/g}));; + Prism.languages.scss=Prism.languages.extend("css",{comment:{pattern:/(^|[^\\])(\/\*[\w\W]*?\*\/|\/\/.*?(\r?\n|$))/g,lookbehind:!0},atrule:/@[\w-]+(?=\s+(\(|\{|;))/gi,url:/([-a-z]+-)*url(http://github.com/?=\()/gi,selector:/([^@;\{\}\(\)]?([^@;\{\}\(\)]|&|\#\{\$[-_\w]+\})+)(?=\s*\{(\}|\s|[^\}]+(:|\{)[^\}]+))/gm});Prism.languages.insertBefore("scss","atrule",{keyword:/@(if|else if|else|for|each|while|import|extend|debug|warn|mixin|include|function|return)|(?=@for\s+\$[-_\w]+\s)+from/i});Prism.languages.insertBefore("scss","property",{variable:/((\$[-_\w]+)|(#\{\$[-_\w]+\}))/i});Prism.languages.insertBefore("scss","ignore",{placeholder:/%[-_\w]+/i,statement:/\B!(default|optional)\b/gi,"boolean":/\b(true|false)\b/g,"null":/\b(null)\b/g,operator:/\s+([-+]{1,2}|={1,2}|!=|\|?\||\?|\*|\/|\%)\s+/g}); + ; \ No newline at end of file diff --git a/src/docs/assets/js/toc.js b/src/docs/assets/js/toc.js new file mode 100755 index 0000000..6b03942 --- /dev/null +++ b/src/docs/assets/js/toc.js @@ -0,0 +1,191 @@ +/** + * tableOfContents.js + * @description Dynamically create a table of contents + * @version 1.0.0 + * @author Chris Ferdinandi + * @license MIT + */ + +(function (root, factory) { + if ( typeof define === 'function' && define.amd ) { + define([], factory(root)); + } else if ( typeof exports === 'object' ) { + module.exports = factory(root); + } else { + root.tableOfContents = factory(root); + } +})(typeof global !== 'undefined' ? global : this.window || this.global, function (root) { + + 'use strict'; + + // + // Variables + // + + var toc = {}; // Object for public APIs + var supports = !!document.querySelector && !!root.addEventListener; // Feature test + var settings, container; + + // Default settings + var defaults = { + container: '[data-toc]', + selectors: '[data-toc-content] h2', + heading: 'Contents', + headingType: 'h2', + headingClass: '', + navClass: '', + linkClass: '', + initClass: 'js-table-of-contents', + callback: function () {} + }; + + + // + // Methods + // + + /** + * A simple forEach() implementation for Arrays, Objects and NodeLists + * @private + * @param {Array|Object|NodeList} collection Collection of items to iterate + * @param {Function} callback Callback function for each iteration + * @param {Array|Object|NodeList} scope Object/NodeList/Array that forEach is iterating over (aka `this`) + */ + var forEach = function (collection, callback, scope) { + if (Object.prototype.toString.call(collection) === '[object Object]') { + for (var prop in collection) { + if (Object.prototype.hasOwnProperty.call(collection, prop)) { + callback.call(scope, collection[prop], prop, collection); + } + } + } else { + for (var i = 0, len = collection.length; i < len; i++) { + callback.call(scope, collection[i], i, collection); + } + } + }; + + /** + * Merge defaults with user options + * @private + * @param {Object} defaults Default settings + * @param {Object} options User options + * @returns {Object} Merged values of defaults and options + */ + var extend = function () { + + // Variables + var extended = {}; + var deep = false; + var i = 0; + var length = arguments.length; + + // Check if a deep merge + if ( Object.prototype.toString.call( arguments[0] ) === '[object Boolean]' ) { + deep = arguments[0]; + i++; + } + + // Merge the object into the extended object + var merge = function (obj) { + for ( var prop in obj ) { + if ( Object.prototype.hasOwnProperty.call( obj, prop ) ) { + // If deep merge and property is an object, merge properties + if ( deep && Object.prototype.toString.call(obj[prop]) === '[object Object]' ) { + extended[prop] = extend( true, extended[prop], obj[prop] ); + } else { + extended[prop] = obj[prop]; + } + } + } + }; + + // Loop through each object and conduct a merge + for ( ; i < length; i++ ) { + var obj = arguments[i]; + merge(obj); + } + + return extended; + + }; + + /** + * Render the Table of Contents + */ + toc.render = function () { + + // Variables + var sections = document.querySelectorAll( settings.selectors ); + var toc = ''; + + if ( sections.length === 0 ) return; + + // Loop through each section and create a link to it + forEach(sections, function (section) { + + // Ignore sections without an id + var id = section.id; + if ( !id ) return; + + // Create section navigation + toc += '
  • ' + section.innerHTML + '
    • '; + + }); + + // Inject table of contents into the DOM + container.innerHTML = '<' + settings.headingType + '>' + settings.heading + '
      ' + toc + '
    '; + + // Run callback + settings.callback(); + + }; + + /** + * Destroy the current initialization. + * @public + */ + toc.destroy = function () { + if ( !settings ) return; + document.documentElement.classList.remove( settings.initClass ); + container.innerHTML = ''; + settings = null; + container = null; + }; + + /** + * Initialize tableOfContents + * @public + * @param {Object} options User settings + */ + toc.init = function ( options ) { + + // feature test + if ( !supports ) return; + + // Destroy any existing initializations + toc.destroy(); + + // Merge user options with defaults + settings = extend( defaults, options || {} ); + + // Get the container + container = document.querySelector( settings.container ); + if ( !container ) return; + + // Add class to HTML element to activate conditional CSS + document.documentElement.classList.add( settings.initClass ); + + // Render the table of contents + toc.render(); + + }; + + + // + // Public APIs + // + + return toc; + +}); \ No newline at end of file diff --git a/src/docs/browsers.md b/src/docs/browsers.md new file mode 100755 index 0000000..8bc0464 --- /dev/null +++ b/src/docs/browsers.md @@ -0,0 +1,18 @@ +# Browser Compatibility + +Smooth Scroll works in all modern browsers, and IE 9 and above. + +Smooth Scroll is built with modern JavaScript APIs, and uses progressive enhancement. If the JavaScript file fails to load, or if your site is viewed on older and less capable browsers, anchor links will jump the way they normally would. + +
    + + +## Known Issues + +### `` styling + +If the `` element has been assigned a height of `100%` or `overflow: hidden`, Smooth Scroll is unable to properly calculate page distances and will not scroll to the right location. The `` element can have a fixed, non-percentage based height (ex. `500px`), or a height of `auto`, and an `overflow` of `visible`. + +### Animating from the bottom + +Animated scrolling links at the very bottom of the page (example: a "scroll to top" link) will stop animated almost immediately after they start when using certain easing patterns. This is an issue that's been around for a while and I've yet to find a good fix for it. I've found that `easeOut*` easing patterns work as expected, but other patterns can cause issues. [See this discussion for more details.](https://github.com/cferdinandi/smooth-scroll/issues/49) \ No newline at end of file diff --git a/src/docs/index.md b/src/docs/index.md old mode 100644 new mode 100755 index e55a541..a850be6 --- a/src/docs/index.md +++ b/src/docs/index.md @@ -1,3 +1,11 @@ +# Smooth Scroll + +Smooth Scroll is a lightweight script to animate scrolling to anchor links. It works great with [Gumshoe](https://github.com/cferdinandi/gumshoe). + +
    + +## Demo +

    Linear
    Linear (no other options)
    diff --git a/src/docs/license.md b/src/docs/license.md new file mode 100755 index 0000000..d796177 --- /dev/null +++ b/src/docs/license.md @@ -0,0 +1,161 @@ +# License + +Smooth Scroll has three types of licenses: + +1. **[Open Source](#open-source-license)**, for personal and open source projects. +2. **[Commercial](#commercial-license)**, for commercial projects and applications. +3. **[OEM](#oem-license)**, for when this Smooth Scroll will be bundled with a commercial interface builder, SDK, or toolkit. + +

    + + +## Open Source License + +If you're looking to use Smooth Scroll on an open source or personal project, the code is available under the [GPLv3 License](https://gomakethings.com/gpl/). GPLv3 has many terms, but the most important one is that it [requires you to license you entire project under the terms of GPLv3 as well](https://gomakethings.com/gpl/#5-conveying-modified-source-versions): + +> You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged. + +You can absolutely use the open source license for commercial projects, but those projects must also be open sourced in their entirety with a GPLv3 license. + +
    + + +## Commercial License + +The Commercial License let's you use Smooth Scroll in commercial projects and applications without the provisions of GPLv3. With this license, your code is kept proprietary. + +- You can use Smooth Scroll on as many websites or applications as you'd like. +- You can include it in your own commercial products and applications, such as premium CMS themes, plugins, or templates. +- Customers and users of your products do not need to purchase their own license, as long as they're not developing their own commercial products with Smooth Scroll. + +### Buy a Commercial License + +Commercial Licenses are priced based on the number of developers working on a project that uses Smooth Scroll. Pay by credit card and instantly receive a PDF of your Commercial License. + + + + + + + + + + + + + + + + + + + + + + +
    DescriptionPrice
    A **Single Developer License** can be used by 1 developer. Each individual developer needs to purchase a separate license.Buy a Single Developer License now for $99
    A **Team License** can be used by up to 8 developers.Buy a Team License now for $399
    An **Organization License** can be used by an unlimited number of developers.Buy an Organization License now for $999
    + +You can read the full text of the Commercial License below. Email me at chris@gomakethings.com with any questions you have about licensing. + + +### The Commercial License Agreement + +This Software License Agreement (the **“Agreement”**) is between Go Make Things, LLC (**“Go Make Things”**) and You (including your agents and affiliates), a commercial licensee of Go Make Things's software. If you have not purchased a Smooth Scroll Commercial License from Go Make Things, these terms do not apply to you, and your use of the Go Make Things software is instead governed by the [GNU General Public License, version 3](https://gomakethings.com/gpl/). + +#### 1. Definitions + +- **“Application”** means any software, application, or elements that Your Licensed Developers develop using the Software or Modifications in accordance with this Agreement. +- **“End User”** means an end user of Your Application who acquires a license to such solely for their own use and not for distribution, resale, user interface design, or software development purposes. +- **“Licensed Developer”** shall mean an individual person permitted to use the Software and make Modifications for your Applications, whether such person is Your employee or a consultant or contractor providing services to You. +- **“Modification”** means any revision, adaptation, or derivative of the Software produced by You. +- The **“Software”** means Smooth Scroll version 11. + +#### 2. Commercial license grant + +Subject to the terms of this Agreement, Go Make Things grants to You a revocable, non-exclusive, non-transferable license: +- for [n licensed developers—varies based on the license your purchase] to use the Software to create Modifications and Applications; +- for You to distribute the Software and/or Modifications to an unlimited number of End Users solely as integrated into the Applications; +- and for End Users to use the Software as incorporated into Your Applications in accordance with the terms of this Agreement. + +You are entitled to receive all updates to the major version of the Software licensed by you, as well as any later version of the Software that Go Make Things, in writing, explicitly authorizes you to use. (For illustration purposes only, if you purchased a license for version 2.0, this licenses authorizes you to use version 2.9, but not 3.0.) Go Make Things makes no representation that any update will be compatible with your Application. + +#### 3. Ownership + +This is a license agreement and not an agreement for sale. Go Make Things reserves ownership of all intellectual property rights inherent in or relating to the Software and corresponding source code, which include all copyright, patent rights, all rights in relation to registered and unregistered trademarks (including service marks), confidential information (including trade secrets and know-how) and all rights other than those expressly granted by this Agreement. + +You must not remove, obscure or interfere with any copyright, acknowledgment, attribution, trademark, warning or disclaimer statement affixed to, incorporated in or otherwise applied in connection with the Software. Notwithstanding the above, you are permitted to produce, use, and distribute compressed or “minified” copies of the Software that do not bear the notices contained in the Software’s source code, so long as you otherwise comply with the terms of this license. + +#### 4. Prohibited Uses + +Your Application must have substantially different functionality than, and must not compete directly with, the Software. + +You may not distribute the Software or Modifications except as included within Your Application. + +If You produce an Application for a customer, You are responsible for ensuring that your customer does not make use of the Software except with Applications licensed herein. + +Your Application must not enable End Users to produce separate applications that incorporate the Software or Modifications. For example, if Your Application is a development toolkit or library, an application builder, a website builder that can be used to incorporate the Software into a new Application, You must obtain a separate OEM license from Go Make Things. + +#### 5. Termination + +This Agreement and the license granted hereunder shall continue until terminated in accordance with this Section. Unless otherwise specified in this Agreement, the license shall last as long as Your use of the Software is in compliance with the terms herein. + +Go Make Things shall have the right to terminate this Agreement and the license granted hereunder immediately if You breach any of the material terms of this Agreement. Upon termination of this Agreement, all licenses granted to You in this Agreement shall terminate automatically and You shall immediately cease use and distribution of the Software. + +Upon termination of this Agreement, You must cease all use of the Software. If, prior to your breach of this Agreement, you delivered Applications incorporating the Software to Your End Users, those End Users’ licenses shall survive termination. + +#### 6. Disclaimer of Warranties + +TO THE EXTENT PERMITTED BY LAW, GO MAKE THINGS DISCLAIMS ALL WARRANTIES AND CONDITIONS, EITHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT, WITH REGARD TO THE SOFTWARE. WE DO NOT GUARANTEE THAT THE OPERATION OF THE SOFTWARE OR YOUR APPLICATION WILL BE UNINTERRUPTED OR ERROR-FREE, AND YOU ACKNOWLEDGE THAT IT IS NOT TECHNICALLY PRACTICABLE FOR US TO DO SO. + +#### 7. Limitation of Liabilities + +TO THE EXTENT PERMITTED BY LAW, IN NO EVENT SHALL GO MAKE THINGS BE LIABLE UNDER ANY LEGAL OR EQUITABLE THEORY FOR ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES WHATSOEVER (INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF BUSINESS PROFITS, BUSINESS INTERRUPTION, LOSS OF BUSINESS INFORMATION, OR ANY OTHER PECUNIARY LAW) ARISING OUT OF THE USE OF OR INABILITY TO USE THE SOFTWARE OR THE CODE IT PRODUCES OR ANY OTHER SUBJECT MATTER RELATING TO THIS AGREEMENT, EVEN IF GO MAKE THINGS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. IN ANY CASE, GO MAKE THINGS’S ENTIRE LIABILITY WITH RESPECT TO ANY SUBJECT MATTER RELATING TO THIS AGREEMENT SHALL BE LIMITED TO THE GREATER OF: (I) THE AMOUNT ACTUALLY PAID BY YOU FOR THE LICENSE, OR (II) FIVE HUNDRED DOLLARS ($500). + +#### 8. Indemnification + +While redistributing the Software or Modifications thereof as part of Your Application, You may choose to offer acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this Agreement. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, and not on Go Make Things’s behalf. + +You agree to indemnify, hold harmless, and defend Go Make Things and its owners, officers, agents, and affiliates from and against any and all claims, lawsuits and proceedings (collectively “Claims”), and all expenses, costs (including attorney's fees), judgments, damages and other liabilities resulting from such Claims, that arise or result from: +- your use of the Software in violation of this Agreement; +- the use or distribution of Your Application, except to the extent such claim is based solely on the inclusion of the Software therein; +- your Modification of the Software’s source code; or +- your accepting support, warranty, indemnity, or additional liability as described in the preceding paragraph. + +#### 9. Payment and Taxes + +All payments under this Agreement are due to Go Make Things upon Your purchase of a license to the Software. + +Each party shall be responsible for all taxes (including, but not limited to, taxes based upon its income) or levies imposed on it under applicable laws, regulations and tax treaties as a result of this Agreement and any payments made hereunder (including those required to be withheld or deducted from payments); provided that You shall be responsible for any value added tax, use tax, sales tax, or similar tax, and shall pay or reimburse Go Make Things for the same upon invoice. Each party shall furnish evidence of such paid taxes as is sufficient to enable the other party to obtain any credits available to it, including original tax withholding certificates. + +#### 10. Miscellaneous + +Software Updates and Upgrades. The license granted herein applies only to the version of the Software available when purchased in connection with the terms of this Agreement, and to any updates and/or upgrades to which You may be entitled. Any previous or subsequent license granted to You for use of the Software shall be governed by the terms and conditions of the agreement entered in connection with purchase or download of that version of the Software. + +**Survival.** The provisions of sections 4 through 10 will survive termination of this Agreement. + +**Compliance with Applicable Laws.** You agree that You will comply with all applicable laws and regulations with respect to the Software, including without limitation all export control laws and regulations. + +**Marketing.** You agree to Go Make Things’s use of Your name, trade name, and trademark, for use in Go Make Things’s marketing materials and its website, solely to identify you as a customer of Go Make Things. + +**Assignment.** This Agreement may be assigned by Go Make Things in whole or in part and will inure to the benefit of Go Make Things’s successors and assigns. You may not assign or transfer this Agreement without Go Make Things’s prior written consent. Notwithstanding the foregoing, however, if You transfer ownership of an Application to a customer for which it was developed, You may assign this Agreement to that customer (the “Assignee”) provided: +1. You provide written notice to Go Make Things prior to the effective date of such assignment; and +2. there is a written agreement, wherein the Assignee accepts the terms of this Agreement. + +**Entire Agreement.** The terms and conditions stated herein set forth the entire agreement of the parties and replace and supersede all other contracts, agreements, and understandings, written or oral, relating to the subject matter hereof. + +**Severability.** In the event that any portion of this Agreement is held to be unenforceable, such portions shall not limit or otherwise modify or affect any other portion of this Agreement. + +**Modification; Waiver.** This Agreement cannot be amended except by a written instrument executed by Go Make Things.

Go Make Things reserves the right, at any time and from time to time, to update, revise, supplement, and otherwise modify this Agreement and to impose new or additional rules, policies, terms, or conditions on your use of the Software. Such updates, revisions, supplements, modifications, and additional rules, policies, terms, and conditions (collectively referred to in this Agreement as “Additional Terms”) will be effective immediately and incorporated into this Agreement. You will be notified of any Additional Terms in writing. Your continued use of the Software following will be deemed to constitute your acceptance of any and all such Additional Terms. All Additional Terms are hereby incorporated into this Agreement by this reference.

 The failure of Go Make Things to enforce any provision of this Agreement may not be deemed a waiver of that or any other provision of this Agreement. + +**Governing Law.** This Agreement is subject to, and shall be interpreted and enforced in accordance with, the laws of the Commonwealth of Massachusetts in all respects without regard to conflict of law principles. The Courts of Bristol County, Massachusetts and Norfolk County, Massachusetts shall be the sole and exclusive Courts in which either party may attempt to enforce or establish the existence or scope of any rights, benefits or obligations under this Agreement. The UN Convention on Contracts for the International Sale of Goods is expressly excluded. + +**Government Use.** If the Software or any related documentation is licensed to the U.S. Government or any agency thereof, it will be considered to be “commercial computer software” or “commercial computer software documentation,” as those terms are used in 48 CFR § 12.212 or 48 CFR § 227.7202, and is being licensed with only those rights as are granted to all other licensees as set forth in this Agreement. + +
    + + +## OEM License + +If you'll be including Smooth Scroll in a project that can be used to build new products, websites, or applications—such as a commercial interface builder, SDK, or toolkit—you need to purchase an OEM License. + +The OEM License is customized for you. Please content me chris@gomakethings.com to discuss your project. \ No newline at end of file diff --git a/src/docs/options.md b/src/docs/options.md new file mode 100755 index 0000000..063cc32 --- /dev/null +++ b/src/docs/options.md @@ -0,0 +1,191 @@ +# Options and Settings + +Smooth Scroll includes smart defaults and works right out of the box. But if you want to customize things, it also has a robust API that provides multiple ways for you to adjust the default options and settings. + +
    + +## Global Settings + +You can pass options and callbacks into Smooth Scroll through the `init()` function: + +```javascript +smoothScroll.init({ + // Selectors + selector: '[data-scroll]', // Selector for links (must be a valid CSS selector) + selectorHeader: null, // Selector for fixed headers (must be a valid CSS selector) [optional] + + // Speed & Easing + speed: 500, // Integer. How fast to complete the scroll in milliseconds + offset: 0, // Integer or Function returning an integer. How far to offset the scrolling anchor location in pixels + easing: 'easeInOutCubic', // Easing pattern to use + + // Custom easing patterns. + // Must be an object with the easing name as the key + // Each pattern must be a function, with `time` as the argument, that returns the pattern + easingPatterns: { + myCustomEasingPattern: function (time) { + return time * (2 - time); + } + } + + // Callback API + before: function (anchor, toggle) {}, // Function to run before scrolling starts + after: function (anchor, toggle) {} // Function to run after scrolling completes +}); +``` + +**Note:** To programatically add Smooth Scroll to all anchor links on a page, pass `selector: 'a[href*="#"]'` into `init`. + +### Easing Options + +**Linear** +*Moves at the same speed from start to finish.* + +* `Linear` + + +**Ease-In** +*Gradually increases in speed.* + +* `easeInQuad` +* `easeInCubic` +* `easeInQuart` +* `easeInQuint` + + +**Ease-In-Out** +*Gradually increases in speed, peaks, and then gradually slows down.* + +* `easeInOutQuad` +* `easeInOutCubic` +* `easeInOutQuart` +* `easeInOutQuint` + + +**Ease-Out** +*Gradually decreases in speed.* + +* `easeOutQuad` +* `easeOutCubic` +* `easeOutQuart` +* `easeOutQuint` + + +Learn more about the different easing patterns and what they do at [easings.net](http://easings.net/). + +
    + + +## Override settings with data attributes + +Smooth Scroll also lets you override global settings on a link-by-link basis using the `[data-options]` data attribute. + +```markup + + Anchor Link + +``` + +***Note:*** *You must use [valid JSON](http://jsonlint.com/) in order for the `data-options` feature to work. Does not support the `callback` method.* + +
    + + +## Use Smooth Scroll events in your own scripts + +You can also call Smooth Scroll's scroll animation events in your own scripts. + +### animateScroll() +Animate scrolling to an anchor. + +```javascript +smoothScroll.animateScroll( + anchor, // Node to scroll to. ex. document.querySelector( '#bazinga' ) + toggle, // Node that toggles the animation, OR an integer. ex. document.querySelector( '#toggle' ) + options // Classes and callbacks. Same options as those passed into the init() function. +); +``` + +**Example 1** + +```javascript +var anchor = document.querySelector( '#bazinga' ); +smoothScroll.animateScroll( anchor ); +``` + +**Example 2** + +```javascript +var anchor = document.querySelector( '#bazinga' ); +var toggle = document.querySelector('#toggle'); +var options = { speed: 1000, easing: 'easeOutCubic' }; +smoothScroll.animateScroll( anchor, toggle, options ); +``` + +**Example 3** + +```javascript +// You can optionally pass in a y-position to scroll to as an integer +smoothScroll.animateScroll( 750 ); +``` + +### destroy() +Destroy the current `smoothScroll.init()`. This is called automatically during the `init` function to remove any existing initializations. + +```javascript +smoothScroll.destroy(); +``` + +
    + + +## Fixed Headers + +If you're using a fixed header, Smooth Scroll will automatically offset scroll distances by the header height. Pass in a valid CSS selector for your fixed header as an option to the `init`. + +If you have multiple fixed headers, pass in the last one in the markup. + +```markup + +... + +``` + +
    + + +## Animating links to other pages + +This is an often requested feature, but Smooth Scroll does not include an option to animate scrolling to links on other pages. + +You can attempt to implement it using the API, but it's very difficult to prevent the automatic browser jump when the page loads, and anything I've done to work around it results in weird, janky issues, so I've decided to leave this out of the core. Here's a potential workaround... + +1. Do *not* add the `data-scroll` attribute to links to other pages. Treat them like normal links, and include your anchor link hash as normal. + + ```markup + + ``` +2. Add the following script to the footer of your page, after the `smoothScroll.init()` function. + + ```markup + + ``` \ No newline at end of file diff --git a/src/docs/setup.md b/src/docs/setup.md new file mode 100755 index 0000000..622bf3b --- /dev/null +++ b/src/docs/setup.md @@ -0,0 +1,30 @@ +# Getting Started + +Compiled and production-ready code can be found in the `dist` directory. The `src` directory contains development code. + + +## 1. Include Smooth Scroll on your site. + +```markup + +``` + +## 2. Add the markup to your HTML. + +Turn anchor links into Smooth Scroll links by adding the `[data-scroll]` data attribute. Give the anchor location an ID just like you normally would. + +```markup +Anchor Link +... +Bazinga! +``` + +## 3. Initialize Smooth Scroll. + +In the footer of your page, after the content, initialize Smooth Scroll. And that's it, you're done. Nice work! + +```markup + +``` \ No newline at end of file diff --git a/src/docs/source.md b/src/docs/source.md new file mode 100644 index 0000000..36f1707 --- /dev/null +++ b/src/docs/source.md @@ -0,0 +1,19 @@ +# Working with the Source Files + +If you would prefer, you can work with the development code in the `src` directory using the included [Gulp build system](http://gulpjs.com/). This compiles, lints, and minifies code. + +## Dependencies +Make sure these are installed first. + +* [Node.js](http://nodejs.org) +* [Gulp](http://gulpjs.com) `sudo npm install -g gulp` + +## Quick Start + +1. In bash/terminal/command line, `cd` into your project directory. +2. Run `npm install` to install required files. +3. When it's done installing, run one of the task runners to get going: + * `gulp` manually compiles files. + * `gulp watch` automatically compiles files when changes are made and applies changes using [LiveReload](http://livereload.com/). + +Compiled and production-ready code can be found in the `dist` directory. The `src` directory contains development code. \ No newline at end of file diff --git a/src/js/smooth-scroll.js b/src/js/smooth-scroll.js index 2dae938..ef29536 100755 --- a/src/js/smooth-scroll.js +++ b/src/js/smooth-scroll.js @@ -20,12 +20,19 @@ // Default settings var defaults = { + // Selectors selector: '[data-scroll]', selectorHeader: null, + + // Speed & Easing speed: 500, - easing: 'easeInOutCubic', offset: 0, - callback: function () {} + easing: 'easeInOutCubic', + easingPatterns: {}, + + // Callback API + before: function () {}, + after: function () {} }; @@ -212,6 +219,8 @@ */ var easingPattern = function ( type, time ) { var pattern; + + // Default Easing Patterns if ( type === 'easeInQuad' ) pattern = time * time; // accelerating from zero velocity if ( type === 'easeOutQuad' ) pattern = time * (2 - time); // decelerating to zero velocity if ( type === 'easeInOutQuad' ) pattern = time < 0.5 ? 2 * time * time : -1 + (4 - 2 * time) * time; // acceleration until halfway, then deceleration @@ -224,6 +233,14 @@ if ( type === 'easeInQuint' ) pattern = time * time * time * time * time; // accelerating from zero velocity if ( type === 'easeOutQuint' ) pattern = 1 + (--time) * time * time * time * time; // decelerating to zero velocity if ( type === 'easeInOutQuint' ) pattern = time < 0.5 ? 16 * time * time * time * time * time : 1 + 16 * (--time) * time * time * time * time; // acceleration until halfway, then deceleration + + // Custom Easing Patterns + if ( settings.easingPatterns[type] ) { + pattern = settings.easingPatterns[type]( time ); + } + + console.log(pattern || time); + return pattern || time; // no easing, no acceleration }; @@ -359,7 +376,7 @@ adjustFocus( anchor, endLocation, isNum ); // Run callback after animation complete - animateSettings.callback( anchor, toggle ); + animateSettings.after( anchor, toggle ); } }; @@ -394,6 +411,9 @@ root.scrollTo( 0, 0 ); } + // Run callback before animation starts + animateSettings.before( anchor, toggle ); + // Start scrolling animation startAnimateScroll(); From 105c2ac1f858878551f4c1dac5867ef304fa47f4 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Mon, 1 May 2017 17:19:42 -0400 Subject: [PATCH 187/285] Updated docs (#325) --- docs/browsers.html | 2 +- docs/index.html | 2 +- docs/license.html | 4 ++-- docs/options.html | 2 +- docs/setup.html | 2 +- docs/source.html | 2 +- src/docs/_templates/_footer.html | 2 +- src/docs/license.md | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/browsers.html b/docs/browsers.html index cbcf76e..74a456e 100755 --- a/docs/browsers.html +++ b/docs/browsers.html @@ -96,7 +96,7 @@

    Animating from the bottom

    offset: 5 }); highlightActiveNav.init({ - urlPrefix: '/kraken/' + urlPrefix: '/smooth-scroll/' }); diff --git a/docs/index.html b/docs/index.html index ad16d5f..56c4214 100755 --- a/docs/index.html +++ b/docs/index.html @@ -146,7 +146,7 @@

    Demo

    offset: 5 }); highlightActiveNav.init({ - urlPrefix: '/kraken/' + urlPrefix: '/smooth-scroll/' }); diff --git a/docs/license.html b/docs/license.html index 6fb2b00..dfa2845 100755 --- a/docs/license.html +++ b/docs/license.html @@ -118,7 +118,7 @@

    1. Definitions

    2. Commercial license grant

    Subject to the terms of this Agreement, Go Make Things grants to You a revocable, non-exclusive, non-transferable license:

      -
    • for [n licensed developers—varies based on the license your purchase] to use the Software to create Modifications and Applications;
      • +
    • for [n Licensed Developers—varies based on the license your purchase] to use the Software to create Modifications and Applications;
    • for You to distribute the Software and/or Modifications to an unlimited number of End Users solely as integrated into the Applications;
    • and for End Users to use the Software as incorporated into Your Applications in accordance with the terms of this Agreement.
    @@ -204,7 +204,7 @@

    OEM License

    offset: 5 }); highlightActiveNav.init({ - urlPrefix: '/kraken/' + urlPrefix: '/smooth-scroll/' }); diff --git a/docs/options.html b/docs/options.html index bebdc72..ebc6deb 100755 --- a/docs/options.html +++ b/docs/options.html @@ -233,7 +233,7 @@ offset: 5 }); highlightActiveNav.init({ - urlPrefix: '/kraken/' + urlPrefix: '/smooth-scroll/' }); diff --git a/docs/setup.html b/docs/setup.html index 52a7217..ef4aa0a 100755 --- a/docs/setup.html +++ b/docs/setup.html @@ -102,7 +102,7 @@

    3. Initialize Smooth Scroll.

    offset: 5 }); highlightActiveNav.init({ - urlPrefix: '/kraken/' + urlPrefix: '/smooth-scroll/' }); diff --git a/docs/source.html b/docs/source.html index 16ce46f..959d49c 100644 --- a/docs/source.html +++ b/docs/source.html @@ -104,7 +104,7 @@

    Quick Start

    offset: 5 }); highlightActiveNav.init({ - urlPrefix: '/kraken/' + urlPrefix: '/smooth-scroll/' }); diff --git a/src/docs/_templates/_footer.html b/src/docs/_templates/_footer.html index 13e8518..56e51ed 100755 --- a/src/docs/_templates/_footer.html +++ b/src/docs/_templates/_footer.html @@ -30,7 +30,7 @@ offset: 5 }); highlightActiveNav.init({ - urlPrefix: '/kraken/' + urlPrefix: '/smooth-scroll/' }); diff --git a/src/docs/license.md b/src/docs/license.md index d796177..7ece076 100755 --- a/src/docs/license.md +++ b/src/docs/license.md @@ -73,7 +73,7 @@ This Software License Agreement (the **“Agreement”**) is between Go Make Thi #### 2. Commercial license grant Subject to the terms of this Agreement, Go Make Things grants to You a revocable, non-exclusive, non-transferable license: -- for [n licensed developers—varies based on the license your purchase] to use the Software to create Modifications and Applications; +- for [n Licensed Developers—varies based on the license your purchase] to use the Software to create Modifications and Applications; - for You to distribute the Software and/or Modifications to an unlimited number of End Users solely as integrated into the Applications; - and for End Users to use the Software as incorporated into Your Applications in accordance with the terms of this Agreement. From f40cf094140cb1166b1968e22e53cd2e84658f61 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Mon, 1 May 2017 17:22:37 -0400 Subject: [PATCH 188/285] Development (#326) * Updated docs * fixed typo --- docs/license.html | 2 +- src/docs/license.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/license.html b/docs/license.html index dfa2845..5e13706 100755 --- a/docs/license.html +++ b/docs/license.html @@ -99,7 +99,7 @@

    Buy a Commercial License

    An Organization License can be used by an unlimited number of developers. - Buy an Organization License now for $999 + Buy an Organization License now for $999 diff --git a/src/docs/license.md b/src/docs/license.md index 7ece076..3096ae4 100755 --- a/src/docs/license.md +++ b/src/docs/license.md @@ -50,7 +50,7 @@ Commercial Licenses are priced based on the number of developers working on a pr An **Organization License** can be used by an unlimited number of developers. - Buy an Organization License now for $999 + Buy an Organization License now for $999 From f586e2624c291169f8869cf92ac6f060d3f679c3 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Mon, 1 May 2017 17:25:47 -0400 Subject: [PATCH 189/285] Create CNAME --- docs/CNAME | 1 + 1 file changed, 1 insertion(+) create mode 100644 docs/CNAME diff --git a/docs/CNAME b/docs/CNAME new file mode 100644 index 0000000..2a2cd4d --- /dev/null +++ b/docs/CNAME @@ -0,0 +1 @@ +smooth-scroll.gomakethings.com \ No newline at end of file From a6c945abdebc0945702dd846fd2f5bc7d11d303f Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Mon, 1 May 2017 17:30:34 -0400 Subject: [PATCH 190/285] Delete CNAME --- docs/CNAME | 1 - 1 file changed, 1 deletion(-) delete mode 100644 docs/CNAME diff --git a/docs/CNAME b/docs/CNAME deleted file mode 100644 index 2a2cd4d..0000000 --- a/docs/CNAME +++ /dev/null @@ -1 +0,0 @@ -smooth-scroll.gomakethings.com \ No newline at end of file From d2680cab69c778e9b8d54016b82bb42fa6680f4b Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Mon, 1 May 2017 17:42:12 -0400 Subject: [PATCH 191/285] Create CNAME --- docs/CNAME | 1 + 1 file changed, 1 insertion(+) create mode 100644 docs/CNAME diff --git a/docs/CNAME b/docs/CNAME new file mode 100644 index 0000000..2a2cd4d --- /dev/null +++ b/docs/CNAME @@ -0,0 +1 @@ +smooth-scroll.gomakethings.com \ No newline at end of file From b7f88a5eb65ffc8d8fefb59ac340742034e689fe Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Mon, 1 May 2017 17:49:43 -0400 Subject: [PATCH 192/285] Development (#327) * Updated docs * fixed typo * Added CNAME config * Updated * Added CNAME --- CNAME | 1 + 1 file changed, 1 insertion(+) create mode 100755 CNAME diff --git a/CNAME b/CNAME new file mode 100755 index 0000000..3610aa3 --- /dev/null +++ b/CNAME @@ -0,0 +1 @@ +https://smooth-scroll.gomakethings.com \ No newline at end of file From 7fef8029068cdad5b2d3579bb4615d9c93c33504 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Mon, 1 May 2017 17:59:27 -0400 Subject: [PATCH 193/285] Delete CNAME --- docs/CNAME | 1 - 1 file changed, 1 deletion(-) delete mode 100644 docs/CNAME diff --git a/docs/CNAME b/docs/CNAME deleted file mode 100644 index 2a2cd4d..0000000 --- a/docs/CNAME +++ /dev/null @@ -1 +0,0 @@ -smooth-scroll.gomakethings.com \ No newline at end of file From 9728da76cf98d2fcacaca62b55f94c65eb74d6ff Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Mon, 1 May 2017 18:00:21 -0400 Subject: [PATCH 194/285] Updated CNAME (#328) * Updated CNAME * Removed CNAME --- gulpfile.js | 1 + 1 file changed, 1 insertion(+) diff --git a/gulpfile.js b/gulpfile.js index ffadced..7af77fe 100755 --- a/gulpfile.js +++ b/gulpfile.js @@ -147,6 +147,7 @@ gulp.task('copy:assets', ['clean:docs'], function() { .pipe(gulp.dest(paths.docs.output + '/assets')); }); + // Remove prexisting content from docs folder gulp.task('clean:docs', function () { return del.sync(paths.docs.output); From e5c48d475cca647ec9ba32521942577ef5a194dd Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Mon, 1 May 2017 18:02:32 -0400 Subject: [PATCH 195/285] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ee4711b..5832886 100755 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ A lightweight script to animate scrolling to anchor links. Smooth Scroll works great with [Gumshoe](https://github.com/cferdinandi/gumshoe). -[View the demo and documentation to get started](http://cferdinandi.github.com/smooth-scroll/). +[View the demo and documentation to get started](https://cferdinandi.github.io/smooth-scroll/). ## How to Contribute @@ -11,4 +11,4 @@ Please review the [contributing guidelines](CONTRIBUTING.md). ## License -The code is available under the [GPLv3 License](LICENSE.md) or a [Commercial License](https://cferdinandi.github.io/smooth-scroll/license#commercial-license). \ No newline at end of file +The code is available under the [GPLv3 License](LICENSE.md) or a [Commercial License](https://cferdinandi.github.io/smooth-scroll/license#commercial-license). From 49d7020373e3f7056de30a61743540fc7f722658 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Mon, 1 May 2017 19:23:57 -0400 Subject: [PATCH 196/285] Development (#329) * Updated CNAME * Removed CNAME * v11.0.1 Removed console.log() --- dist/js/smooth-scroll.js | 4 +--- dist/js/smooth-scroll.min.js | 4 ++-- docs/dist/js/smooth-scroll.js | 4 +--- docs/dist/js/smooth-scroll.min.js | 4 ++-- package.json | 2 +- src/js/smooth-scroll.js | 2 -- 6 files changed, 7 insertions(+), 13 deletions(-) diff --git a/dist/js/smooth-scroll.js b/dist/js/smooth-scroll.js index bf4e1a8..d763bc6 100755 --- a/dist/js/smooth-scroll.js +++ b/dist/js/smooth-scroll.js @@ -1,5 +1,5 @@ /*! - * smooth-scroll v11.0.0: Animate scrolling to anchor links + * smooth-scroll v11.0.1: Animate scrolling to anchor links * (c) 2017 Chris Ferdinandi * GPL-3.0 License * http://github.com/cferdinandi/smooth-scroll @@ -246,8 +246,6 @@ pattern = settings.easingPatterns[type]( time ); } - console.log(pattern || time); - return pattern || time; // no easing, no acceleration }; diff --git a/dist/js/smooth-scroll.min.js b/dist/js/smooth-scroll.min.js index 5161d16..184687a 100755 --- a/dist/js/smooth-scroll.min.js +++ b/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ -/*! smooth-scroll v11.0.0 | (c) 2017 Chris Ferdinandi | GPL-3.0 License | http://github.com/cferdinandi/smooth-scroll */ -!(function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)})("undefined"!=typeof global?global:this.window||this.global,(function(e){"use strict";var t,n,o,r,a,c,i,l={},u="querySelector"in document&&"addEventListener"in e,s={selector:"[data-scroll]",selectorHeader:null,speed:500,offset:0,easing:"easeInOutCubic",easingPatterns:{},before:function(){},after:function(){}},f=function(){var e={},t=!1,n=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(t=arguments[0],n++);for(;n=0&&t.item(n)!==this;);return n>-1});e&&e!==document;e=e.parentNode)if(e.matches(t))return e;return null},m=function(e){"#"===e.charAt(0)&&(e=e.substr(1));for(var t,n=String(e),o=n.length,r=-1,a="",c=n.charCodeAt(0);++r=1&&t<=31||127==t||0===r&&t>=48&&t<=57||1===r&&t>=48&&t<=57&&45===c?a+="\\"+t.toString(16)+" ":a+=t>=128||45===t||95===t||t>=48&&t<=57||t>=65&&t<=90||t>=97&&t<=122?n.charAt(r):"\\"+n.charAt(r)}return"#"+a},p=function(e,n){var o;return"easeInQuad"===e&&(o=n*n),"easeOutQuad"===e&&(o=n*(2-n)),"easeInOutQuad"===e&&(o=n<.5?2*n*n:(4-2*n)*n-1),"easeInCubic"===e&&(o=n*n*n),"easeOutCubic"===e&&(o=--n*n*n+1),"easeInOutCubic"===e&&(o=n<.5?4*n*n*n:(n-1)*(2*n-2)*(2*n-2)+1),"easeInQuart"===e&&(o=n*n*n*n),"easeOutQuart"===e&&(o=1- --n*n*n*n),"easeInOutQuart"===e&&(o=n<.5?8*n*n*n*n:1-8*--n*n*n*n),"easeInQuint"===e&&(o=n*n*n*n*n),"easeOutQuint"===e&&(o=1+--n*n*n*n*n),"easeInOutQuint"===e&&(o=n<.5?16*n*n*n*n*n:1+16*--n*n*n*n*n),t.easingPatterns[e]&&(o=t.easingPatterns[e](n)),console.log(o||n),o||n},g=function(e,t,n){var o=0;if(e.offsetParent)do{o+=e.offsetTop,e=e.offsetParent}while(e);return o=Math.max(o-t-n,0),Math.min(o,y()-b())},b=function(){return Math.max(document.documentElement.clientHeight,e.innerHeight||0)},y=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},v=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},O=function(e){return e?d(e)+e.offsetTop:0},S=function(t,n,o){o||(t.focus(),document.activeElement.id!==t.id&&(t.setAttribute("tabindex","-1"),t.focus(),t.style.outline="none"),e.scrollTo(0,n))};l.animateScroll=function(n,o,c){var l=v(o?o.getAttribute("data-options"):null),u=f(t||s,c||{},l),d="[object Number]"===Object.prototype.toString.call(n),h=d||!n.tagName?null:n;if(d||h){var m=e.pageYOffset;u.selectorHeader&&!r&&(r=document.querySelector(u.selectorHeader)),a||(a=O(r));var b,E,I=d?n:g(h,a,parseInt("function"==typeof u.offset?u.offset():u.offset,10)),H=I-m,A=y(),j=0,C=function(t,r,a){var c=e.pageYOffset;(t==r||c==r||e.innerHeight+c>=A)&&(clearInterval(a),S(n,r,d),u.after(n,o))},M=function(){j+=16,b=j/parseInt(u.speed,10),b=b>1?1:b,E=m+H*p(u.easing,b),e.scrollTo(0,Math.floor(E)),C(E,I,i)};0===e.pageYOffset&&e.scrollTo(0,0),u.before(n,o),(function(){clearInterval(i),i=setInterval(M,16)})()}};var E=function(t){try{m(decodeURIComponent(e.location.hash))}catch(t){m(e.location.hash)}n&&(n.id=n.getAttribute("data-scroll-id"),l.animateScroll(n,o),n=null,o=null)},I=function(r){if(0===r.button&&!r.metaKey&&!r.ctrlKey&&(o=h(r.target,t.selector))&&"a"===o.tagName.toLowerCase()&&o.hostname===e.location.hostname&&o.pathname===e.location.pathname&&/#/.test(o.href)){var a;try{a=m(decodeURIComponent(o.hash))}catch(e){a=m(o.hash)}if("#"===a){r.preventDefault(),n=document.body;var c=n.id?n.id:"smooth-scroll-top";return n.setAttribute("data-scroll-id",c),n.id="",void(e.location.hash.substring(1)===c?E():e.location.hash=c)}n=document.querySelector(a),n&&(n.setAttribute("data-scroll-id",n.id),n.id="",o.hash===e.location.hash&&(r.preventDefault(),E()))}},H=function(e){c||(c=setTimeout((function(){c=null,a=O(r)}),66))};return l.destroy=function(){t&&(document.removeEventListener("click",I,!1),e.removeEventListener("resize",H,!1),t=null,n=null,o=null,r=null,a=null,c=null,i=null)},l.init=function(n){u&&(l.destroy(),t=f(s,n||{}),r=t.selectorHeader?document.querySelector(t.selectorHeader):null,a=O(r),document.addEventListener("click",I,!1),e.addEventListener("hashchange",E,!1),r&&e.addEventListener("resize",H,!1))},l})); \ No newline at end of file +/*! smooth-scroll v11.0.1 | (c) 2017 Chris Ferdinandi | GPL-3.0 License | http://github.com/cferdinandi/smooth-scroll */ +!(function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)})("undefined"!=typeof global?global:this.window||this.global,(function(e){"use strict";var t,n,o,r,a,c,i,l={},u="querySelector"in document&&"addEventListener"in e,s={selector:"[data-scroll]",selectorHeader:null,speed:500,offset:0,easing:"easeInOutCubic",easingPatterns:{},before:function(){},after:function(){}},f=function(){var e={},t=!1,n=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(t=arguments[0],n++);for(;n=0&&t.item(n)!==this;);return n>-1});e&&e!==document;e=e.parentNode)if(e.matches(t))return e;return null},m=function(e){"#"===e.charAt(0)&&(e=e.substr(1));for(var t,n=String(e),o=n.length,r=-1,a="",c=n.charCodeAt(0);++r=1&&t<=31||127==t||0===r&&t>=48&&t<=57||1===r&&t>=48&&t<=57&&45===c?a+="\\"+t.toString(16)+" ":a+=t>=128||45===t||95===t||t>=48&&t<=57||t>=65&&t<=90||t>=97&&t<=122?n.charAt(r):"\\"+n.charAt(r)}return"#"+a},p=function(e,n){var o;return"easeInQuad"===e&&(o=n*n),"easeOutQuad"===e&&(o=n*(2-n)),"easeInOutQuad"===e&&(o=n<.5?2*n*n:(4-2*n)*n-1),"easeInCubic"===e&&(o=n*n*n),"easeOutCubic"===e&&(o=--n*n*n+1),"easeInOutCubic"===e&&(o=n<.5?4*n*n*n:(n-1)*(2*n-2)*(2*n-2)+1),"easeInQuart"===e&&(o=n*n*n*n),"easeOutQuart"===e&&(o=1- --n*n*n*n),"easeInOutQuart"===e&&(o=n<.5?8*n*n*n*n:1-8*--n*n*n*n),"easeInQuint"===e&&(o=n*n*n*n*n),"easeOutQuint"===e&&(o=1+--n*n*n*n*n),"easeInOutQuint"===e&&(o=n<.5?16*n*n*n*n*n:1+16*--n*n*n*n*n),t.easingPatterns[e]&&(o=t.easingPatterns[e](n)),o||n},g=function(e,t,n){var o=0;if(e.offsetParent)do{o+=e.offsetTop,e=e.offsetParent}while(e);return o=Math.max(o-t-n,0),Math.min(o,y()-b())},b=function(){return Math.max(document.documentElement.clientHeight,e.innerHeight||0)},y=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},v=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},O=function(e){return e?d(e)+e.offsetTop:0},S=function(t,n,o){o||(t.focus(),document.activeElement.id!==t.id&&(t.setAttribute("tabindex","-1"),t.focus(),t.style.outline="none"),e.scrollTo(0,n))};l.animateScroll=function(n,o,c){var l=v(o?o.getAttribute("data-options"):null),u=f(t||s,c||{},l),d="[object Number]"===Object.prototype.toString.call(n),h=d||!n.tagName?null:n;if(d||h){var m=e.pageYOffset;u.selectorHeader&&!r&&(r=document.querySelector(u.selectorHeader)),a||(a=O(r));var b,E,I=d?n:g(h,a,parseInt("function"==typeof u.offset?u.offset():u.offset,10)),H=I-m,A=y(),j=0,C=function(t,r,a){var c=e.pageYOffset;(t==r||c==r||e.innerHeight+c>=A)&&(clearInterval(a),S(n,r,d),u.after(n,o))},M=function(){j+=16,b=j/parseInt(u.speed,10),b=b>1?1:b,E=m+H*p(u.easing,b),e.scrollTo(0,Math.floor(E)),C(E,I,i)};0===e.pageYOffset&&e.scrollTo(0,0),u.before(n,o),(function(){clearInterval(i),i=setInterval(M,16)})()}};var E=function(t){try{m(decodeURIComponent(e.location.hash))}catch(t){m(e.location.hash)}n&&(n.id=n.getAttribute("data-scroll-id"),l.animateScroll(n,o),n=null,o=null)},I=function(r){if(0===r.button&&!r.metaKey&&!r.ctrlKey&&(o=h(r.target,t.selector))&&"a"===o.tagName.toLowerCase()&&o.hostname===e.location.hostname&&o.pathname===e.location.pathname&&/#/.test(o.href)){var a;try{a=m(decodeURIComponent(o.hash))}catch(e){a=m(o.hash)}if("#"===a){r.preventDefault(),n=document.body;var c=n.id?n.id:"smooth-scroll-top";return n.setAttribute("data-scroll-id",c),n.id="",void(e.location.hash.substring(1)===c?E():e.location.hash=c)}n=document.querySelector(a),n&&(n.setAttribute("data-scroll-id",n.id),n.id="",o.hash===e.location.hash&&(r.preventDefault(),E()))}},H=function(e){c||(c=setTimeout((function(){c=null,a=O(r)}),66))};return l.destroy=function(){t&&(document.removeEventListener("click",I,!1),e.removeEventListener("resize",H,!1),t=null,n=null,o=null,r=null,a=null,c=null,i=null)},l.init=function(n){u&&(l.destroy(),t=f(s,n||{}),r=t.selectorHeader?document.querySelector(t.selectorHeader):null,a=O(r),document.addEventListener("click",I,!1),e.addEventListener("hashchange",E,!1),r&&e.addEventListener("resize",H,!1))},l})); \ No newline at end of file diff --git a/docs/dist/js/smooth-scroll.js b/docs/dist/js/smooth-scroll.js index bf4e1a8..d763bc6 100755 --- a/docs/dist/js/smooth-scroll.js +++ b/docs/dist/js/smooth-scroll.js @@ -1,5 +1,5 @@ /*! - * smooth-scroll v11.0.0: Animate scrolling to anchor links + * smooth-scroll v11.0.1: Animate scrolling to anchor links * (c) 2017 Chris Ferdinandi * GPL-3.0 License * http://github.com/cferdinandi/smooth-scroll @@ -246,8 +246,6 @@ pattern = settings.easingPatterns[type]( time ); } - console.log(pattern || time); - return pattern || time; // no easing, no acceleration }; diff --git a/docs/dist/js/smooth-scroll.min.js b/docs/dist/js/smooth-scroll.min.js index 5161d16..184687a 100755 --- a/docs/dist/js/smooth-scroll.min.js +++ b/docs/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ -/*! smooth-scroll v11.0.0 | (c) 2017 Chris Ferdinandi | GPL-3.0 License | http://github.com/cferdinandi/smooth-scroll */ -!(function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)})("undefined"!=typeof global?global:this.window||this.global,(function(e){"use strict";var t,n,o,r,a,c,i,l={},u="querySelector"in document&&"addEventListener"in e,s={selector:"[data-scroll]",selectorHeader:null,speed:500,offset:0,easing:"easeInOutCubic",easingPatterns:{},before:function(){},after:function(){}},f=function(){var e={},t=!1,n=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(t=arguments[0],n++);for(;n=0&&t.item(n)!==this;);return n>-1});e&&e!==document;e=e.parentNode)if(e.matches(t))return e;return null},m=function(e){"#"===e.charAt(0)&&(e=e.substr(1));for(var t,n=String(e),o=n.length,r=-1,a="",c=n.charCodeAt(0);++r=1&&t<=31||127==t||0===r&&t>=48&&t<=57||1===r&&t>=48&&t<=57&&45===c?a+="\\"+t.toString(16)+" ":a+=t>=128||45===t||95===t||t>=48&&t<=57||t>=65&&t<=90||t>=97&&t<=122?n.charAt(r):"\\"+n.charAt(r)}return"#"+a},p=function(e,n){var o;return"easeInQuad"===e&&(o=n*n),"easeOutQuad"===e&&(o=n*(2-n)),"easeInOutQuad"===e&&(o=n<.5?2*n*n:(4-2*n)*n-1),"easeInCubic"===e&&(o=n*n*n),"easeOutCubic"===e&&(o=--n*n*n+1),"easeInOutCubic"===e&&(o=n<.5?4*n*n*n:(n-1)*(2*n-2)*(2*n-2)+1),"easeInQuart"===e&&(o=n*n*n*n),"easeOutQuart"===e&&(o=1- --n*n*n*n),"easeInOutQuart"===e&&(o=n<.5?8*n*n*n*n:1-8*--n*n*n*n),"easeInQuint"===e&&(o=n*n*n*n*n),"easeOutQuint"===e&&(o=1+--n*n*n*n*n),"easeInOutQuint"===e&&(o=n<.5?16*n*n*n*n*n:1+16*--n*n*n*n*n),t.easingPatterns[e]&&(o=t.easingPatterns[e](n)),console.log(o||n),o||n},g=function(e,t,n){var o=0;if(e.offsetParent)do{o+=e.offsetTop,e=e.offsetParent}while(e);return o=Math.max(o-t-n,0),Math.min(o,y()-b())},b=function(){return Math.max(document.documentElement.clientHeight,e.innerHeight||0)},y=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},v=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},O=function(e){return e?d(e)+e.offsetTop:0},S=function(t,n,o){o||(t.focus(),document.activeElement.id!==t.id&&(t.setAttribute("tabindex","-1"),t.focus(),t.style.outline="none"),e.scrollTo(0,n))};l.animateScroll=function(n,o,c){var l=v(o?o.getAttribute("data-options"):null),u=f(t||s,c||{},l),d="[object Number]"===Object.prototype.toString.call(n),h=d||!n.tagName?null:n;if(d||h){var m=e.pageYOffset;u.selectorHeader&&!r&&(r=document.querySelector(u.selectorHeader)),a||(a=O(r));var b,E,I=d?n:g(h,a,parseInt("function"==typeof u.offset?u.offset():u.offset,10)),H=I-m,A=y(),j=0,C=function(t,r,a){var c=e.pageYOffset;(t==r||c==r||e.innerHeight+c>=A)&&(clearInterval(a),S(n,r,d),u.after(n,o))},M=function(){j+=16,b=j/parseInt(u.speed,10),b=b>1?1:b,E=m+H*p(u.easing,b),e.scrollTo(0,Math.floor(E)),C(E,I,i)};0===e.pageYOffset&&e.scrollTo(0,0),u.before(n,o),(function(){clearInterval(i),i=setInterval(M,16)})()}};var E=function(t){try{m(decodeURIComponent(e.location.hash))}catch(t){m(e.location.hash)}n&&(n.id=n.getAttribute("data-scroll-id"),l.animateScroll(n,o),n=null,o=null)},I=function(r){if(0===r.button&&!r.metaKey&&!r.ctrlKey&&(o=h(r.target,t.selector))&&"a"===o.tagName.toLowerCase()&&o.hostname===e.location.hostname&&o.pathname===e.location.pathname&&/#/.test(o.href)){var a;try{a=m(decodeURIComponent(o.hash))}catch(e){a=m(o.hash)}if("#"===a){r.preventDefault(),n=document.body;var c=n.id?n.id:"smooth-scroll-top";return n.setAttribute("data-scroll-id",c),n.id="",void(e.location.hash.substring(1)===c?E():e.location.hash=c)}n=document.querySelector(a),n&&(n.setAttribute("data-scroll-id",n.id),n.id="",o.hash===e.location.hash&&(r.preventDefault(),E()))}},H=function(e){c||(c=setTimeout((function(){c=null,a=O(r)}),66))};return l.destroy=function(){t&&(document.removeEventListener("click",I,!1),e.removeEventListener("resize",H,!1),t=null,n=null,o=null,r=null,a=null,c=null,i=null)},l.init=function(n){u&&(l.destroy(),t=f(s,n||{}),r=t.selectorHeader?document.querySelector(t.selectorHeader):null,a=O(r),document.addEventListener("click",I,!1),e.addEventListener("hashchange",E,!1),r&&e.addEventListener("resize",H,!1))},l})); \ No newline at end of file +/*! smooth-scroll v11.0.1 | (c) 2017 Chris Ferdinandi | GPL-3.0 License | http://github.com/cferdinandi/smooth-scroll */ +!(function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)})("undefined"!=typeof global?global:this.window||this.global,(function(e){"use strict";var t,n,o,r,a,c,i,l={},u="querySelector"in document&&"addEventListener"in e,s={selector:"[data-scroll]",selectorHeader:null,speed:500,offset:0,easing:"easeInOutCubic",easingPatterns:{},before:function(){},after:function(){}},f=function(){var e={},t=!1,n=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(t=arguments[0],n++);for(;n=0&&t.item(n)!==this;);return n>-1});e&&e!==document;e=e.parentNode)if(e.matches(t))return e;return null},m=function(e){"#"===e.charAt(0)&&(e=e.substr(1));for(var t,n=String(e),o=n.length,r=-1,a="",c=n.charCodeAt(0);++r=1&&t<=31||127==t||0===r&&t>=48&&t<=57||1===r&&t>=48&&t<=57&&45===c?a+="\\"+t.toString(16)+" ":a+=t>=128||45===t||95===t||t>=48&&t<=57||t>=65&&t<=90||t>=97&&t<=122?n.charAt(r):"\\"+n.charAt(r)}return"#"+a},p=function(e,n){var o;return"easeInQuad"===e&&(o=n*n),"easeOutQuad"===e&&(o=n*(2-n)),"easeInOutQuad"===e&&(o=n<.5?2*n*n:(4-2*n)*n-1),"easeInCubic"===e&&(o=n*n*n),"easeOutCubic"===e&&(o=--n*n*n+1),"easeInOutCubic"===e&&(o=n<.5?4*n*n*n:(n-1)*(2*n-2)*(2*n-2)+1),"easeInQuart"===e&&(o=n*n*n*n),"easeOutQuart"===e&&(o=1- --n*n*n*n),"easeInOutQuart"===e&&(o=n<.5?8*n*n*n*n:1-8*--n*n*n*n),"easeInQuint"===e&&(o=n*n*n*n*n),"easeOutQuint"===e&&(o=1+--n*n*n*n*n),"easeInOutQuint"===e&&(o=n<.5?16*n*n*n*n*n:1+16*--n*n*n*n*n),t.easingPatterns[e]&&(o=t.easingPatterns[e](n)),o||n},g=function(e,t,n){var o=0;if(e.offsetParent)do{o+=e.offsetTop,e=e.offsetParent}while(e);return o=Math.max(o-t-n,0),Math.min(o,y()-b())},b=function(){return Math.max(document.documentElement.clientHeight,e.innerHeight||0)},y=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},v=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},O=function(e){return e?d(e)+e.offsetTop:0},S=function(t,n,o){o||(t.focus(),document.activeElement.id!==t.id&&(t.setAttribute("tabindex","-1"),t.focus(),t.style.outline="none"),e.scrollTo(0,n))};l.animateScroll=function(n,o,c){var l=v(o?o.getAttribute("data-options"):null),u=f(t||s,c||{},l),d="[object Number]"===Object.prototype.toString.call(n),h=d||!n.tagName?null:n;if(d||h){var m=e.pageYOffset;u.selectorHeader&&!r&&(r=document.querySelector(u.selectorHeader)),a||(a=O(r));var b,E,I=d?n:g(h,a,parseInt("function"==typeof u.offset?u.offset():u.offset,10)),H=I-m,A=y(),j=0,C=function(t,r,a){var c=e.pageYOffset;(t==r||c==r||e.innerHeight+c>=A)&&(clearInterval(a),S(n,r,d),u.after(n,o))},M=function(){j+=16,b=j/parseInt(u.speed,10),b=b>1?1:b,E=m+H*p(u.easing,b),e.scrollTo(0,Math.floor(E)),C(E,I,i)};0===e.pageYOffset&&e.scrollTo(0,0),u.before(n,o),(function(){clearInterval(i),i=setInterval(M,16)})()}};var E=function(t){try{m(decodeURIComponent(e.location.hash))}catch(t){m(e.location.hash)}n&&(n.id=n.getAttribute("data-scroll-id"),l.animateScroll(n,o),n=null,o=null)},I=function(r){if(0===r.button&&!r.metaKey&&!r.ctrlKey&&(o=h(r.target,t.selector))&&"a"===o.tagName.toLowerCase()&&o.hostname===e.location.hostname&&o.pathname===e.location.pathname&&/#/.test(o.href)){var a;try{a=m(decodeURIComponent(o.hash))}catch(e){a=m(o.hash)}if("#"===a){r.preventDefault(),n=document.body;var c=n.id?n.id:"smooth-scroll-top";return n.setAttribute("data-scroll-id",c),n.id="",void(e.location.hash.substring(1)===c?E():e.location.hash=c)}n=document.querySelector(a),n&&(n.setAttribute("data-scroll-id",n.id),n.id="",o.hash===e.location.hash&&(r.preventDefault(),E()))}},H=function(e){c||(c=setTimeout((function(){c=null,a=O(r)}),66))};return l.destroy=function(){t&&(document.removeEventListener("click",I,!1),e.removeEventListener("resize",H,!1),t=null,n=null,o=null,r=null,a=null,c=null,i=null)},l.init=function(n){u&&(l.destroy(),t=f(s,n||{}),r=t.selectorHeader?document.querySelector(t.selectorHeader):null,a=O(r),document.addEventListener("click",I,!1),e.addEventListener("hashchange",E,!1),r&&e.addEventListener("resize",H,!1))},l})); \ No newline at end of file diff --git a/package.json b/package.json index 2671b64..974e812 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "smooth-scroll", - "version": "11.0.0", + "version": "11.0.1", "description": "Animate scrolling to anchor links", "main": "./dist/js/smooth-scroll.min.js", "author": { diff --git a/src/js/smooth-scroll.js b/src/js/smooth-scroll.js index ef29536..e99e192 100755 --- a/src/js/smooth-scroll.js +++ b/src/js/smooth-scroll.js @@ -239,8 +239,6 @@ pattern = settings.easingPatterns[type]( time ); } - console.log(pattern || time); - return pattern || time; // no easing, no acceleration }; From 7e50f4badd2a7c1e3a41dc19f7dc51256ad3128b Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Tue, 2 May 2017 10:42:41 -0400 Subject: [PATCH 197/285] Create CNAME --- docs/CNAME | 1 + 1 file changed, 1 insertion(+) create mode 100644 docs/CNAME diff --git a/docs/CNAME b/docs/CNAME new file mode 100644 index 0000000..5baa2b7 --- /dev/null +++ b/docs/CNAME @@ -0,0 +1 @@ +smoothscroll.gomakethings.com From 16174f6f6e349235873b7f7c7254df50f9c459d1 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Tue, 2 May 2017 10:43:04 -0400 Subject: [PATCH 198/285] Delete CNAME --- docs/CNAME | 1 - 1 file changed, 1 deletion(-) delete mode 100644 docs/CNAME diff --git a/docs/CNAME b/docs/CNAME deleted file mode 100644 index 5baa2b7..0000000 --- a/docs/CNAME +++ /dev/null @@ -1 +0,0 @@ -smoothscroll.gomakethings.com From 5c9442bd5d209ce1706486874015c13b21a539a1 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Tue, 2 May 2017 10:43:33 -0400 Subject: [PATCH 199/285] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5832886..c34a920 100755 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ A lightweight script to animate scrolling to anchor links. Smooth Scroll works great with [Gumshoe](https://github.com/cferdinandi/gumshoe). -[View the demo and documentation to get started](https://cferdinandi.github.io/smooth-scroll/). +[View the demo and documentation to get started](). ## How to Contribute From 2a65c7c57a1b04f491a5653f4dbaec3b6603682a Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Tue, 2 May 2017 10:43:40 -0400 Subject: [PATCH 200/285] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c34a920..5832886 100755 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ A lightweight script to animate scrolling to anchor links. Smooth Scroll works great with [Gumshoe](https://github.com/cferdinandi/gumshoe). -[View the demo and documentation to get started](). +[View the demo and documentation to get started](https://cferdinandi.github.io/smooth-scroll/). ## How to Contribute From b0cb0d23379ca1fbce99c435f0e266b5f9e0c671 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Tue, 2 May 2017 11:32:06 -0400 Subject: [PATCH 201/285] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5832886..3865e01 100755 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ A lightweight script to animate scrolling to anchor links. Smooth Scroll works great with [Gumshoe](https://github.com/cferdinandi/gumshoe). -[View the demo and documentation to get started](https://cferdinandi.github.io/smooth-scroll/). +[View the demo and documentation to get started](https://cferdinandi.github.io/smooth-scroll/index). ## How to Contribute From c06118831241c45392e8ab886b081e07954e5e75 Mon Sep 17 00:00:00 2001 From: Chris Ferdinandi Date: Tue, 2 May 2017 13:54:03 -0400 Subject: [PATCH 202/285] v2.0.2 (#330) - Updated docs - Fixed bug with new custom easing patterns --- CNAME | 1 - README.md | 4 +- dist/js/smooth-scroll.js | 34 +++--- dist/js/smooth-scroll.min.js | 4 +- docs/assets/img/favicon.ico | Bin 0 -> 8348 bytes docs/assets/js/houdini.min.js | 2 + docs/browsers.html | 9 +- docs/dist/js/smooth-scroll.js | 34 +++--- docs/dist/js/smooth-scroll.min.js | 4 +- docs/extras.html | 171 ++++++++++++++++++++++++++++++ docs/index.html | 8 +- docs/license.html | 12 ++- docs/options.html | 37 ++----- docs/setup.html | 39 ++++++- docs/source.html | 112 ------------------- package.json | 2 +- src/docs/_templates/_footer.html | 2 +- src/docs/_templates/_header.html | 6 +- src/docs/assets/img/favicon.ico | Bin 0 -> 8348 bytes src/docs/assets/js/houdini.min.js | 2 + src/docs/browsers.md | 2 + src/docs/extras.md | 85 +++++++++++++++ src/docs/license.md | 4 +- src/docs/options.md | 35 +----- src/docs/setup.md | 34 +++++- src/docs/source.md | 19 ---- src/js/smooth-scroll.js | 32 +++--- 27 files changed, 425 insertions(+), 269 deletions(-) delete mode 100755 CNAME create mode 100755 docs/assets/img/favicon.ico create mode 100644 docs/assets/js/houdini.min.js create mode 100644 docs/extras.html delete mode 100644 docs/source.html create mode 100755 src/docs/assets/img/favicon.ico create mode 100644 src/docs/assets/js/houdini.min.js create mode 100644 src/docs/extras.md delete mode 100644 src/docs/source.md diff --git a/CNAME b/CNAME deleted file mode 100755 index 3610aa3..0000000 --- a/CNAME +++ /dev/null @@ -1 +0,0 @@ -https://smooth-scroll.gomakethings.com \ No newline at end of file diff --git a/README.md b/README.md index 3865e01..ee4711b 100755 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ A lightweight script to animate scrolling to anchor links. Smooth Scroll works great with [Gumshoe](https://github.com/cferdinandi/gumshoe). -[View the demo and documentation to get started](https://cferdinandi.github.io/smooth-scroll/index). +[View the demo and documentation to get started](http://cferdinandi.github.com/smooth-scroll/). ## How to Contribute @@ -11,4 +11,4 @@ Please review the [contributing guidelines](CONTRIBUTING.md). ## License -The code is available under the [GPLv3 License](LICENSE.md) or a [Commercial License](https://cferdinandi.github.io/smooth-scroll/license#commercial-license). +The code is available under the [GPLv3 License](LICENSE.md) or a [Commercial License](https://cferdinandi.github.io/smooth-scroll/license#commercial-license). \ No newline at end of file diff --git a/dist/js/smooth-scroll.js b/dist/js/smooth-scroll.js index d763bc6..e48e2b1 100755 --- a/dist/js/smooth-scroll.js +++ b/dist/js/smooth-scroll.js @@ -1,5 +1,5 @@ /*! - * smooth-scroll v11.0.1: Animate scrolling to anchor links + * smooth-scroll v11.0.2: Animate scrolling to anchor links * (c) 2017 Chris Ferdinandi * GPL-3.0 License * http://github.com/cferdinandi/smooth-scroll @@ -224,26 +224,26 @@ * @param {Number} time Time animation should take to complete * @returns {Number} */ - var easingPattern = function ( type, time ) { + var easingPattern = function ( settings, time ) { var pattern; // Default Easing Patterns - if ( type === 'easeInQuad' ) pattern = time * time; // accelerating from zero velocity - if ( type === 'easeOutQuad' ) pattern = time * (2 - time); // decelerating to zero velocity - if ( type === 'easeInOutQuad' ) pattern = time < 0.5 ? 2 * time * time : -1 + (4 - 2 * time) * time; // acceleration until halfway, then deceleration - if ( type === 'easeInCubic' ) pattern = time * time * time; // accelerating from zero velocity - if ( type === 'easeOutCubic' ) pattern = (--time) * time * time + 1; // decelerating to zero velocity - if ( type === 'easeInOutCubic' ) pattern = time < 0.5 ? 4 * time * time * time : (time - 1) * (2 * time - 2) * (2 * time - 2) + 1; // acceleration until halfway, then deceleration - if ( type === 'easeInQuart' ) pattern = time * time * time * time; // accelerating from zero velocity - if ( type === 'easeOutQuart' ) pattern = 1 - (--time) * time * time * time; // decelerating to zero velocity - if ( type === 'easeInOutQuart' ) pattern = time < 0.5 ? 8 * time * time * time * time : 1 - 8 * (--time) * time * time * time; // acceleration until halfway, then deceleration - if ( type === 'easeInQuint' ) pattern = time * time * time * time * time; // accelerating from zero velocity - if ( type === 'easeOutQuint' ) pattern = 1 + (--time) * time * time * time * time; // decelerating to zero velocity - if ( type === 'easeInOutQuint' ) pattern = time < 0.5 ? 16 * time * time * time * time * time : 1 + 16 * (--time) * time * time * time * time; // acceleration until halfway, then deceleration + if ( settings.easing === 'easeInQuad' ) pattern = time * time; // accelerating from zero velocity + if ( settings.easing === 'easeOutQuad' ) pattern = time * (2 - time); // decelerating to zero velocity + if ( settings.easing === 'easeInOutQuad' ) pattern = time < 0.5 ? 2 * time * time : -1 + (4 - 2 * time) * time; // acceleration until halfway, then deceleration + if ( settings.easing === 'easeInCubic' ) pattern = time * time * time; // accelerating from zero velocity + if ( settings.easing === 'easeOutCubic' ) pattern = (--time) * time * time + 1; // decelerating to zero velocity + if ( settings.easing === 'easeInOutCubic' ) pattern = time < 0.5 ? 4 * time * time * time : (time - 1) * (2 * time - 2) * (2 * time - 2) + 1; // acceleration until halfway, then deceleration + if ( settings.easing === 'easeInQuart' ) pattern = time * time * time * time; // accelerating from zero velocity + if ( settings.easing === 'easeOutQuart' ) pattern = 1 - (--time) * time * time * time; // decelerating to zero velocity + if ( settings.easing === 'easeInOutQuart' ) pattern = time < 0.5 ? 8 * time * time * time * time : 1 - 8 * (--time) * time * time * time; // acceleration until halfway, then deceleration + if ( settings.easing === 'easeInQuint' ) pattern = time * time * time * time * time; // accelerating from zero velocity + if ( settings.easing === 'easeOutQuint' ) pattern = 1 + (--time) * time * time * time * time; // decelerating to zero velocity + if ( settings.easing === 'easeInOutQuint' ) pattern = time < 0.5 ? 16 * time * time * time * time * time : 1 + 16 * (--time) * time * time * time * time; // acceleration until halfway, then deceleration // Custom Easing Patterns - if ( settings.easingPatterns[type] ) { - pattern = settings.easingPatterns[type]( time ); + if ( settings.easingPatterns[settings.easing] ) { + pattern = settings.easingPatterns[settings.easing]( time ); } return pattern || time; // no easing, no acceleration @@ -394,7 +394,7 @@ timeLapsed += 16; percentage = ( timeLapsed / parseInt(animateSettings.speed, 10) ); percentage = ( percentage > 1 ) ? 1 : percentage; - position = startLocation + ( distance * easingPattern(animateSettings.easing, percentage) ); + position = startLocation + ( distance * easingPattern(animateSettings, percentage) ); root.scrollTo( 0, Math.floor(position) ); stopAnimateScroll(position, endLocation, animationInterval); }; diff --git a/dist/js/smooth-scroll.min.js b/dist/js/smooth-scroll.min.js index 184687a..736d520 100755 --- a/dist/js/smooth-scroll.min.js +++ b/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ -/*! smooth-scroll v11.0.1 | (c) 2017 Chris Ferdinandi | GPL-3.0 License | http://github.com/cferdinandi/smooth-scroll */ -!(function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)})("undefined"!=typeof global?global:this.window||this.global,(function(e){"use strict";var t,n,o,r,a,c,i,l={},u="querySelector"in document&&"addEventListener"in e,s={selector:"[data-scroll]",selectorHeader:null,speed:500,offset:0,easing:"easeInOutCubic",easingPatterns:{},before:function(){},after:function(){}},f=function(){var e={},t=!1,n=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(t=arguments[0],n++);for(;n=0&&t.item(n)!==this;);return n>-1});e&&e!==document;e=e.parentNode)if(e.matches(t))return e;return null},m=function(e){"#"===e.charAt(0)&&(e=e.substr(1));for(var t,n=String(e),o=n.length,r=-1,a="",c=n.charCodeAt(0);++r=1&&t<=31||127==t||0===r&&t>=48&&t<=57||1===r&&t>=48&&t<=57&&45===c?a+="\\"+t.toString(16)+" ":a+=t>=128||45===t||95===t||t>=48&&t<=57||t>=65&&t<=90||t>=97&&t<=122?n.charAt(r):"\\"+n.charAt(r)}return"#"+a},p=function(e,n){var o;return"easeInQuad"===e&&(o=n*n),"easeOutQuad"===e&&(o=n*(2-n)),"easeInOutQuad"===e&&(o=n<.5?2*n*n:(4-2*n)*n-1),"easeInCubic"===e&&(o=n*n*n),"easeOutCubic"===e&&(o=--n*n*n+1),"easeInOutCubic"===e&&(o=n<.5?4*n*n*n:(n-1)*(2*n-2)*(2*n-2)+1),"easeInQuart"===e&&(o=n*n*n*n),"easeOutQuart"===e&&(o=1- --n*n*n*n),"easeInOutQuart"===e&&(o=n<.5?8*n*n*n*n:1-8*--n*n*n*n),"easeInQuint"===e&&(o=n*n*n*n*n),"easeOutQuint"===e&&(o=1+--n*n*n*n*n),"easeInOutQuint"===e&&(o=n<.5?16*n*n*n*n*n:1+16*--n*n*n*n*n),t.easingPatterns[e]&&(o=t.easingPatterns[e](n)),o||n},g=function(e,t,n){var o=0;if(e.offsetParent)do{o+=e.offsetTop,e=e.offsetParent}while(e);return o=Math.max(o-t-n,0),Math.min(o,y()-b())},b=function(){return Math.max(document.documentElement.clientHeight,e.innerHeight||0)},y=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},v=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},O=function(e){return e?d(e)+e.offsetTop:0},S=function(t,n,o){o||(t.focus(),document.activeElement.id!==t.id&&(t.setAttribute("tabindex","-1"),t.focus(),t.style.outline="none"),e.scrollTo(0,n))};l.animateScroll=function(n,o,c){var l=v(o?o.getAttribute("data-options"):null),u=f(t||s,c||{},l),d="[object Number]"===Object.prototype.toString.call(n),h=d||!n.tagName?null:n;if(d||h){var m=e.pageYOffset;u.selectorHeader&&!r&&(r=document.querySelector(u.selectorHeader)),a||(a=O(r));var b,E,I=d?n:g(h,a,parseInt("function"==typeof u.offset?u.offset():u.offset,10)),H=I-m,A=y(),j=0,C=function(t,r,a){var c=e.pageYOffset;(t==r||c==r||e.innerHeight+c>=A)&&(clearInterval(a),S(n,r,d),u.after(n,o))},M=function(){j+=16,b=j/parseInt(u.speed,10),b=b>1?1:b,E=m+H*p(u.easing,b),e.scrollTo(0,Math.floor(E)),C(E,I,i)};0===e.pageYOffset&&e.scrollTo(0,0),u.before(n,o),(function(){clearInterval(i),i=setInterval(M,16)})()}};var E=function(t){try{m(decodeURIComponent(e.location.hash))}catch(t){m(e.location.hash)}n&&(n.id=n.getAttribute("data-scroll-id"),l.animateScroll(n,o),n=null,o=null)},I=function(r){if(0===r.button&&!r.metaKey&&!r.ctrlKey&&(o=h(r.target,t.selector))&&"a"===o.tagName.toLowerCase()&&o.hostname===e.location.hostname&&o.pathname===e.location.pathname&&/#/.test(o.href)){var a;try{a=m(decodeURIComponent(o.hash))}catch(e){a=m(o.hash)}if("#"===a){r.preventDefault(),n=document.body;var c=n.id?n.id:"smooth-scroll-top";return n.setAttribute("data-scroll-id",c),n.id="",void(e.location.hash.substring(1)===c?E():e.location.hash=c)}n=document.querySelector(a),n&&(n.setAttribute("data-scroll-id",n.id),n.id="",o.hash===e.location.hash&&(r.preventDefault(),E()))}},H=function(e){c||(c=setTimeout((function(){c=null,a=O(r)}),66))};return l.destroy=function(){t&&(document.removeEventListener("click",I,!1),e.removeEventListener("resize",H,!1),t=null,n=null,o=null,r=null,a=null,c=null,i=null)},l.init=function(n){u&&(l.destroy(),t=f(s,n||{}),r=t.selectorHeader?document.querySelector(t.selectorHeader):null,a=O(r),document.addEventListener("click",I,!1),e.addEventListener("hashchange",E,!1),r&&e.addEventListener("resize",H,!1))},l})); \ No newline at end of file +/*! smooth-scroll v11.0.2 | (c) 2017 Chris Ferdinandi | GPL-3.0 License | http://github.com/cferdinandi/smooth-scroll */ +!(function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)})("undefined"!=typeof global?global:this.window||this.global,(function(e){"use strict";var t,n,o,r,a,i,c,l={},s="querySelector"in document&&"addEventListener"in e,u={selector:"[data-scroll]",selectorHeader:null,speed:500,offset:0,easing:"easeInOutCubic",easingPatterns:{},before:function(){},after:function(){}},f=function(){var e={},t=!1,n=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(t=arguments[0],n++);for(;n=0&&t.item(n)!==this;);return n>-1});e&&e!==document;e=e.parentNode)if(e.matches(t))return e;return null},m=function(e){"#"===e.charAt(0)&&(e=e.substr(1));for(var t,n=String(e),o=n.length,r=-1,a="",i=n.charCodeAt(0);++r=1&&t<=31||127==t||0===r&&t>=48&&t<=57||1===r&&t>=48&&t<=57&&45===i?a+="\\"+t.toString(16)+" ":a+=t>=128||45===t||95===t||t>=48&&t<=57||t>=65&&t<=90||t>=97&&t<=122?n.charAt(r):"\\"+n.charAt(r)}return"#"+a},p=function(e,t){var n;return"easeInQuad"===e.easing&&(n=t*t),"easeOutQuad"===e.easing&&(n=t*(2-t)),"easeInOutQuad"===e.easing&&(n=t<.5?2*t*t:(4-2*t)*t-1),"easeInCubic"===e.easing&&(n=t*t*t),"easeOutCubic"===e.easing&&(n=--t*t*t+1),"easeInOutCubic"===e.easing&&(n=t<.5?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e.easing&&(n=t*t*t*t),"easeOutQuart"===e.easing&&(n=1- --t*t*t*t),"easeInOutQuart"===e.easing&&(n=t<.5?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e.easing&&(n=t*t*t*t*t),"easeOutQuint"===e.easing&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e.easing&&(n=t<.5?16*t*t*t*t*t:1+16*--t*t*t*t*t),e.easingPatterns[e.easing]&&(n=e.easingPatterns[e.easing](t)),n||t},g=function(e,t,n){var o=0;if(e.offsetParent)do{o+=e.offsetTop,e=e.offsetParent}while(e);return o=Math.max(o-t-n,0),Math.min(o,y()-b())},b=function(){return Math.max(document.documentElement.clientHeight,e.innerHeight||0)},y=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},v=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},O=function(e){return e?d(e)+e.offsetTop:0},S=function(t,n,o){o||(t.focus(),document.activeElement.id!==t.id&&(t.setAttribute("tabindex","-1"),t.focus(),t.style.outline="none"),e.scrollTo(0,n))};l.animateScroll=function(n,o,i){var l=v(o?o.getAttribute("data-options"):null),s=f(t||u,i||{},l),d="[object Number]"===Object.prototype.toString.call(n),h=d||!n.tagName?null:n;if(d||h){var m=e.pageYOffset;s.selectorHeader&&!r&&(r=document.querySelector(s.selectorHeader)),a||(a=O(r));var b,E,I=d?n:g(h,a,parseInt("function"==typeof s.offset?s.offset():s.offset,10)),H=I-m,A=y(),j=0,C=function(t,r,a){var i=e.pageYOffset;(t==r||i==r||e.innerHeight+i>=A)&&(clearInterval(a),S(n,r,d),s.after(n,o))},M=function(){j+=16,b=j/parseInt(s.speed,10),b=b>1?1:b,E=m+H*p(s,b),e.scrollTo(0,Math.floor(E)),C(E,I,c)};0===e.pageYOffset&&e.scrollTo(0,0),s.before(n,o),(function(){clearInterval(c),c=setInterval(M,16)})()}};var E=function(t){try{m(decodeURIComponent(e.location.hash))}catch(t){m(e.location.hash)}n&&(n.id=n.getAttribute("data-scroll-id"),l.animateScroll(n,o),n=null,o=null)},I=function(r){if(0===r.button&&!r.metaKey&&!r.ctrlKey&&(o=h(r.target,t.selector))&&"a"===o.tagName.toLowerCase()&&o.hostname===e.location.hostname&&o.pathname===e.location.pathname&&/#/.test(o.href)){var a;try{a=m(decodeURIComponent(o.hash))}catch(e){a=m(o.hash)}if("#"===a){r.preventDefault(),n=document.body;var i=n.id?n.id:"smooth-scroll-top";return n.setAttribute("data-scroll-id",i),n.id="",void(e.location.hash.substring(1)===i?E():e.location.hash=i)}n=document.querySelector(a),n&&(n.setAttribute("data-scroll-id",n.id),n.id="",o.hash===e.location.hash&&(r.preventDefault(),E()))}},H=function(e){i||(i=setTimeout((function(){i=null,a=O(r)}),66))};return l.destroy=function(){t&&(document.removeEventListener("click",I,!1),e.removeEventListener("resize",H,!1),t=null,n=null,o=null,r=null,a=null,i=null,c=null)},l.init=function(n){s&&(l.destroy(),t=f(u,n||{}),r=t.selectorHeader?document.querySelector(t.selectorHeader):null,a=O(r),document.addEventListener("click",I,!1),e.addEventListener("hashchange",E,!1),r&&e.addEventListener("resize",H,!1))},l})); \ No newline at end of file diff --git a/docs/assets/img/favicon.ico b/docs/assets/img/favicon.ico new file mode 100755 index 0000000000000000000000000000000000000000..9c988977c83ec5e7090270bbe8b2cfd06850c1f4 GIT binary patch literal 8348 zcmeI0Sx8h-7{~9}PGu`mR61mttuGQKzL==vJ}wF2v(Rfuv=D(%P)|N&5tZ~1f)r8E zQ$4oOhO}!t=0o68ViD~%{r;CZbh*xqGou#76+X^6-}!(4Z@K4u_d1s4vr;U--(vJz zS+gxG)3U7DjP`n>WmPiILI=dkL!|fq{;vwu)z!_asHjLQDk@r9Sy?&rZ)8_oT)e)d zq~rkO4gB^O78ZU91OlJY^)g;z+{fO^v5uv*v@{d$cH|d1hsw&zLd-+>vPE<0w1@61 z_*QgF#v%^*wjm$H4R5HtyxjIhz9FZ`zxIR)WBak&I+_@;KVtlbb9;;KB!0^n+vHEe zx`pRah3+(SJ6019y8X$-0AD-j%I2q*-^lAAve0nB+pL%*_}pdmVA8?2m}epmxQ?3r zct*I7%TCSHt23Iee@EN;YP*5-{3NEI9*}%03 zxn-Uc@f1bkGP<0coN3&t*NT^%pJr!gPcnP%5#AB~%LbpRaJ>oFpo6|K!OdmXU^nUf zDtGv=7=5HMUjMQsr^n(Xju7(|k@%#;e?@h5bx0zcXgKK;@b3fLE6!jrsQbAw8ZWpt z#Mvq#*4@!?(zAcqoIm2;8w2YDyI-96K8a0Q3~bz63FIF)XEY%BttN+Ve0K3%IvF1! z@6g%LlzE?Y+C%q*`Lq1|{Ke7u64g_?WpMUZRaM!~Q1?l`(b+(hTMM?cduMFw?`seKo+9ofmbdo7(tYCmK2o+2}lU!(d6qwd07gQ6bk ztOvqz)f@d-kN7xMTU#sthuz%denxv>4!QTnYAwGtH8pylpLcWO_nKVYtXw4nT&b|J;Hu(u{W+~kne#D%2WP`;RSW?)?HBVVSOT@gpvSrzSW2H ze)^&FCSm=Vb#qfwQ%Vw)Ntxg?lN!|UJoMe^Pm07d`sWqU?*#l@VE;n!uYM=s49(|G z%}b;h-1#Y-yWPkuTfmpi-)>??f}Gr!8c9ingPf2-@^9^S?GOGc!4 z!nU8d^EdIeP8jU(V}D(9#%%7zJ!A;%GU?2pdX;(xzAqV_MtVpma>t=df%__451ilY zaIOmX_yz~o{=SCywoBKjUJXyW(c?FjS_jF~uU?Uxn>$ne1V3F!hvw3055DEXqMvT; zog>dn@8XAW4T1fRe1l)}4&t2S#73F>z-JI&llhilzDKcv_eHT8rUrizyF18T=4Xci zVkn4z3o>XR#IAD`Fzb;<@CDd^!FM{(Zw2e`*yoI7=iH|T$FP4-&E8|%?A(iYj_q1_ kR>zC?a9#zx3V0RpD&SSXtAJMluL52Lyb5>~7<~nP1E8Zd6#xJL literal 0 HcmV?d00001 diff --git a/docs/assets/js/houdini.min.js b/docs/assets/js/houdini.min.js new file mode 100644 index 0000000..2f1b226 --- /dev/null +++ b/docs/assets/js/houdini.min.js @@ -0,0 +1,2 @@ +/*! Houdini v9.4.0 | (c) 2017 Chris Ferdinandi | MIT License | http://github.com/cferdinandi/houdini */ +!(function(t,e){"function"==typeof define&&define.amd?define([],e(t)):"object"==typeof exports?module.exports=e(t):t.houdini=e(t)})("undefined"!=typeof global?global:this.window||this.global,(function(t){"use strict";var e,o,n={},c="querySelector"in document&&"addEventListener"in t&&"classList"in document.createElement("_"),a={selectorToggle:"[data-collapse]",selectorContent:".collapse",toggleActiveClass:"active",contentActiveClass:"active",initClass:"js-houdini",stopVideo:!0,callbackOpen:function(){},callbackClose:function(){}},i=function(t,e,o){if("[object Object]"===Object.prototype.toString.call(t))for(var n in t)Object.prototype.hasOwnProperty.call(t,n)&&e.call(o,t[n],n,t);else for(var c=0,a=t.length;c=0&&e.item(o)!==this;);return o>-1});t&&t!==document;t=t.parentNode)if(t.matches(e))return t;return null},l=function(t){"#"===t.charAt(0)&&(t=t.substr(1));for(var e,o=String(t),n=o.length,c=-1,a="",i=o.charCodeAt(0);++c=1&&e<=31||127==e||0===c&&e>=48&&e<=57||1===c&&e>=48&&e<=57&&45===i?a+="\\"+e.toString(16)+" ":a+=e>=128||45===e||95===e||e>=48&&e<=57||e>=65&&e<=90||e>=97&&e<=122?o.charAt(c):"\\"+o.charAt(c)}return"#"+a},u=function(t,e){if(e.stopVideo&&t.classList.contains(e.contentActiveClass)){var o=t.querySelector("iframe"),n=t.querySelector("video");if(o){var c=o.src;o.src=c}n&&n.pause()}},d=function(e,o){if(!e.hasAttribute("data-houdini-no-focus")){if(!e.classList.contains(o.contentActiveClass))return void(e.hasAttribute("data-houdini-focused")&&e.removeAttribute("tabindex"));var n={x:t.pageXOffset,y:t.pageYOffset};e.focus(),document.activeElement.id!==e.id&&(e.setAttribute("tabindex","-1"),e.setAttribute("data-houdini-focused",!0),e.focus()),t.scrollTo(n.x,n.y)}};n.closeContent=function(t,o,n){var c=r(e||a,n||{}),i=document.querySelector(l(t));i&&(u(i,c),o&&o.classList.remove(c.toggleActiveClass),i.classList.remove(c.contentActiveClass),d(i,c),e.callbackClose(i,o))},n.openContent=function(t,o,c){var s=r(e||a,c||{}),u=document.querySelector(l(t)),f=o&&o.hasAttribute("data-group")?document.querySelectorAll('[data-group="'+o.getAttribute("data-group")+'"]'):[];u&&(i(f,(function(t){n.closeContent(t.hash,t)})),o&&o.classList.add(s.toggleActiveClass),u.classList.add(s.contentActiveClass),d(u,s),u.removeAttribute("data-houdini-no-focus"),s.callbackOpen(u,o))};var f=function(c){var a=t.location.hash;if(o&&(o.id=o.getAttribute("data-collapse-id"),o=null),a){var i=document.querySelector(e.selectorToggle+'[href*="'+a+'"]');n.openContent(a,i)}},h=function(c){if(0===c.button&&!c.metaKey&&!c.ctrlKey){var a=s(c.target,e.selectorToggle);if(a&&a.hash){if(a.classList.contains(e.toggleActiveClass))return c.preventDefault(),void n.closeContent(a.hash,a);o=document.querySelector(a.hash),o&&(o.setAttribute("data-collapse-id",o.id),o.id="",a.hash===t.location.hash&&(c.preventDefault(),f()))}}},v=function(n){if((o=s(n.target,e.selectorContent))&&!o.classList.contains(e.contentActiveClass)){var c=o.id;if(o.setAttribute("data-collapse-id",c),o.setAttribute("data-houdini-no-focus",!0),o.id="",c===t.location.hash.substring(1))return void f();t.location.hash=c}};return n.destroy=function(){e&&(document.documentElement.classList.remove(e.initClass),document.removeEventListener("click",h,!1),document.removeEventListener("focus",v,!0),t.removeEventListener("hashchange",f,!1),e=null,o=null)},n.init=function(o){c&&(n.destroy(),e=r(a,o||{}),document.documentElement.classList.add(e.initClass),document.addEventListener("click",h,!1),document.addEventListener("focus",v,!0),t.addEventListener("hashchange",f,!1),f())},n})); \ No newline at end of file diff --git a/docs/browsers.html b/docs/browsers.html index 74a456e..d933079 100755 --- a/docs/browsers.html +++ b/docs/browsers.html @@ -7,6 +7,10 @@ + + + + @@ -43,8 +47,8 @@
  • Download
  • Demo
  • Getting Started
    • -
  • Working with Source
  • Options & Settings
    • +
  • Extras
  • Browser Compatibility
  • License
    • @@ -54,6 +58,7 @@

    Browser Compatibility

    +

    Supported Browsers

    Smooth Scroll works in all modern browsers, and IE 9 and above.

    Smooth Scroll is built with modern JavaScript APIs, and uses progressive enhancement. If the JavaScript file fails to load, or if your site is viewed on older and less capable browsers, anchor links will jump the way they normally would.

    @@ -96,7 +101,7 @@

    Animating from the bottom

    offset: 5 }); highlightActiveNav.init({ - urlPrefix: '/smooth-scroll/' + urlPrefix: '/kraken/' }); diff --git a/docs/dist/js/smooth-scroll.js b/docs/dist/js/smooth-scroll.js index d763bc6..e48e2b1 100755 --- a/docs/dist/js/smooth-scroll.js +++ b/docs/dist/js/smooth-scroll.js @@ -1,5 +1,5 @@ /*! - * smooth-scroll v11.0.1: Animate scrolling to anchor links + * smooth-scroll v11.0.2: Animate scrolling to anchor links * (c) 2017 Chris Ferdinandi * GPL-3.0 License * http://github.com/cferdinandi/smooth-scroll @@ -224,26 +224,26 @@ * @param {Number} time Time animation should take to complete * @returns {Number} */ - var easingPattern = function ( type, time ) { + var easingPattern = function ( settings, time ) { var pattern; // Default Easing Patterns - if ( type === 'easeInQuad' ) pattern = time * time; // accelerating from zero velocity - if ( type === 'easeOutQuad' ) pattern = time * (2 - time); // decelerating to zero velocity - if ( type === 'easeInOutQuad' ) pattern = time < 0.5 ? 2 * time * time : -1 + (4 - 2 * time) * time; // acceleration until halfway, then deceleration - if ( type === 'easeInCubic' ) pattern = time * time * time; // accelerating from zero velocity - if ( type === 'easeOutCubic' ) pattern = (--time) * time * time + 1; // decelerating to zero velocity - if ( type === 'easeInOutCubic' ) pattern = time < 0.5 ? 4 * time * time * time : (time - 1) * (2 * time - 2) * (2 * time - 2) + 1; // acceleration until halfway, then deceleration - if ( type === 'easeInQuart' ) pattern = time * time * time * time; // accelerating from zero velocity - if ( type === 'easeOutQuart' ) pattern = 1 - (--time) * time * time * time; // decelerating to zero velocity - if ( type === 'easeInOutQuart' ) pattern = time < 0.5 ? 8 * time * time * time * time : 1 - 8 * (--time) * time * time * time; // acceleration until halfway, then deceleration - if ( type === 'easeInQuint' ) pattern = time * time * time * time * time; // accelerating from zero velocity - if ( type === 'easeOutQuint' ) pattern = 1 + (--time) * time * time * time * time; // decelerating to zero velocity - if ( type === 'easeInOutQuint' ) pattern = time < 0.5 ? 16 * time * time * time * time * time : 1 + 16 * (--time) * time * time * time * time; // acceleration until halfway, then deceleration + if ( settings.easing === 'easeInQuad' ) pattern = time * time; // accelerating from zero velocity + if ( settings.easing === 'easeOutQuad' ) pattern = time * (2 - time); // decelerating to zero velocity + if ( settings.easing === 'easeInOutQuad' ) pattern = time < 0.5 ? 2 * time * time : -1 + (4 - 2 * time) * time; // acceleration until halfway, then deceleration + if ( settings.easing === 'easeInCubic' ) pattern = time * time * time; // accelerating from zero velocity + if ( settings.easing === 'easeOutCubic' ) pattern = (--time) * time * time + 1; // decelerating to zero velocity + if ( settings.easing === 'easeInOutCubic' ) pattern = time < 0.5 ? 4 * time * time * time : (time - 1) * (2 * time - 2) * (2 * time - 2) + 1; // acceleration until halfway, then deceleration + if ( settings.easing === 'easeInQuart' ) pattern = time * time * time * time; // accelerating from zero velocity + if ( settings.easing === 'easeOutQuart' ) pattern = 1 - (--time) * time * time * time; // decelerating to zero velocity + if ( settings.easing === 'easeInOutQuart' ) pattern = time < 0.5 ? 8 * time * time * time * time : 1 - 8 * (--time) * time * time * time; // acceleration until halfway, then deceleration + if ( settings.easing === 'easeInQuint' ) pattern = time * time * time * time * time; // accelerating from zero velocity + if ( settings.easing === 'easeOutQuint' ) pattern = 1 + (--time) * time * time * time * time; // decelerating to zero velocity + if ( settings.easing === 'easeInOutQuint' ) pattern = time < 0.5 ? 16 * time * time * time * time * time : 1 + 16 * (--time) * time * time * time * time; // acceleration until halfway, then deceleration // Custom Easing Patterns - if ( settings.easingPatterns[type] ) { - pattern = settings.easingPatterns[type]( time ); + if ( settings.easingPatterns[settings.easing] ) { + pattern = settings.easingPatterns[settings.easing]( time ); } return pattern || time; // no easing, no acceleration @@ -394,7 +394,7 @@ timeLapsed += 16; percentage = ( timeLapsed / parseInt(animateSettings.speed, 10) ); percentage = ( percentage > 1 ) ? 1 : percentage; - position = startLocation + ( distance * easingPattern(animateSettings.easing, percentage) ); + position = startLocation + ( distance * easingPattern(animateSettings, percentage) ); root.scrollTo( 0, Math.floor(position) ); stopAnimateScroll(position, endLocation, animationInterval); }; diff --git a/docs/dist/js/smooth-scroll.min.js b/docs/dist/js/smooth-scroll.min.js index 184687a..736d520 100755 --- a/docs/dist/js/smooth-scroll.min.js +++ b/docs/dist/js/smooth-scroll.min.js @@ -1,2 +1,2 @@ -/*! smooth-scroll v11.0.1 | (c) 2017 Chris Ferdinandi | GPL-3.0 License | http://github.com/cferdinandi/smooth-scroll */ -!(function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)})("undefined"!=typeof global?global:this.window||this.global,(function(e){"use strict";var t,n,o,r,a,c,i,l={},u="querySelector"in document&&"addEventListener"in e,s={selector:"[data-scroll]",selectorHeader:null,speed:500,offset:0,easing:"easeInOutCubic",easingPatterns:{},before:function(){},after:function(){}},f=function(){var e={},t=!1,n=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(t=arguments[0],n++);for(;n=0&&t.item(n)!==this;);return n>-1});e&&e!==document;e=e.parentNode)if(e.matches(t))return e;return null},m=function(e){"#"===e.charAt(0)&&(e=e.substr(1));for(var t,n=String(e),o=n.length,r=-1,a="",c=n.charCodeAt(0);++r=1&&t<=31||127==t||0===r&&t>=48&&t<=57||1===r&&t>=48&&t<=57&&45===c?a+="\\"+t.toString(16)+" ":a+=t>=128||45===t||95===t||t>=48&&t<=57||t>=65&&t<=90||t>=97&&t<=122?n.charAt(r):"\\"+n.charAt(r)}return"#"+a},p=function(e,n){var o;return"easeInQuad"===e&&(o=n*n),"easeOutQuad"===e&&(o=n*(2-n)),"easeInOutQuad"===e&&(o=n<.5?2*n*n:(4-2*n)*n-1),"easeInCubic"===e&&(o=n*n*n),"easeOutCubic"===e&&(o=--n*n*n+1),"easeInOutCubic"===e&&(o=n<.5?4*n*n*n:(n-1)*(2*n-2)*(2*n-2)+1),"easeInQuart"===e&&(o=n*n*n*n),"easeOutQuart"===e&&(o=1- --n*n*n*n),"easeInOutQuart"===e&&(o=n<.5?8*n*n*n*n:1-8*--n*n*n*n),"easeInQuint"===e&&(o=n*n*n*n*n),"easeOutQuint"===e&&(o=1+--n*n*n*n*n),"easeInOutQuint"===e&&(o=n<.5?16*n*n*n*n*n:1+16*--n*n*n*n*n),t.easingPatterns[e]&&(o=t.easingPatterns[e](n)),o||n},g=function(e,t,n){var o=0;if(e.offsetParent)do{o+=e.offsetTop,e=e.offsetParent}while(e);return o=Math.max(o-t-n,0),Math.min(o,y()-b())},b=function(){return Math.max(document.documentElement.clientHeight,e.innerHeight||0)},y=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},v=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},O=function(e){return e?d(e)+e.offsetTop:0},S=function(t,n,o){o||(t.focus(),document.activeElement.id!==t.id&&(t.setAttribute("tabindex","-1"),t.focus(),t.style.outline="none"),e.scrollTo(0,n))};l.animateScroll=function(n,o,c){var l=v(o?o.getAttribute("data-options"):null),u=f(t||s,c||{},l),d="[object Number]"===Object.prototype.toString.call(n),h=d||!n.tagName?null:n;if(d||h){var m=e.pageYOffset;u.selectorHeader&&!r&&(r=document.querySelector(u.selectorHeader)),a||(a=O(r));var b,E,I=d?n:g(h,a,parseInt("function"==typeof u.offset?u.offset():u.offset,10)),H=I-m,A=y(),j=0,C=function(t,r,a){var c=e.pageYOffset;(t==r||c==r||e.innerHeight+c>=A)&&(clearInterval(a),S(n,r,d),u.after(n,o))},M=function(){j+=16,b=j/parseInt(u.speed,10),b=b>1?1:b,E=m+H*p(u.easing,b),e.scrollTo(0,Math.floor(E)),C(E,I,i)};0===e.pageYOffset&&e.scrollTo(0,0),u.before(n,o),(function(){clearInterval(i),i=setInterval(M,16)})()}};var E=function(t){try{m(decodeURIComponent(e.location.hash))}catch(t){m(e.location.hash)}n&&(n.id=n.getAttribute("data-scroll-id"),l.animateScroll(n,o),n=null,o=null)},I=function(r){if(0===r.button&&!r.metaKey&&!r.ctrlKey&&(o=h(r.target,t.selector))&&"a"===o.tagName.toLowerCase()&&o.hostname===e.location.hostname&&o.pathname===e.location.pathname&&/#/.test(o.href)){var a;try{a=m(decodeURIComponent(o.hash))}catch(e){a=m(o.hash)}if("#"===a){r.preventDefault(),n=document.body;var c=n.id?n.id:"smooth-scroll-top";return n.setAttribute("data-scroll-id",c),n.id="",void(e.location.hash.substring(1)===c?E():e.location.hash=c)}n=document.querySelector(a),n&&(n.setAttribute("data-scroll-id",n.id),n.id="",o.hash===e.location.hash&&(r.preventDefault(),E()))}},H=function(e){c||(c=setTimeout((function(){c=null,a=O(r)}),66))};return l.destroy=function(){t&&(document.removeEventListener("click",I,!1),e.removeEventListener("resize",H,!1),t=null,n=null,o=null,r=null,a=null,c=null,i=null)},l.init=function(n){u&&(l.destroy(),t=f(s,n||{}),r=t.selectorHeader?document.querySelector(t.selectorHeader):null,a=O(r),document.addEventListener("click",I,!1),e.addEventListener("hashchange",E,!1),r&&e.addEventListener("resize",H,!1))},l})); \ No newline at end of file +/*! smooth-scroll v11.0.2 | (c) 2017 Chris Ferdinandi | GPL-3.0 License | http://github.com/cferdinandi/smooth-scroll */ +!(function(e,t){"function"==typeof define&&define.amd?define([],t(e)):"object"==typeof exports?module.exports=t(e):e.smoothScroll=t(e)})("undefined"!=typeof global?global:this.window||this.global,(function(e){"use strict";var t,n,o,r,a,i,c,l={},s="querySelector"in document&&"addEventListener"in e,u={selector:"[data-scroll]",selectorHeader:null,speed:500,offset:0,easing:"easeInOutCubic",easingPatterns:{},before:function(){},after:function(){}},f=function(){var e={},t=!1,n=0,o=arguments.length;"[object Boolean]"===Object.prototype.toString.call(arguments[0])&&(t=arguments[0],n++);for(;n=0&&t.item(n)!==this;);return n>-1});e&&e!==document;e=e.parentNode)if(e.matches(t))return e;return null},m=function(e){"#"===e.charAt(0)&&(e=e.substr(1));for(var t,n=String(e),o=n.length,r=-1,a="",i=n.charCodeAt(0);++r=1&&t<=31||127==t||0===r&&t>=48&&t<=57||1===r&&t>=48&&t<=57&&45===i?a+="\\"+t.toString(16)+" ":a+=t>=128||45===t||95===t||t>=48&&t<=57||t>=65&&t<=90||t>=97&&t<=122?n.charAt(r):"\\"+n.charAt(r)}return"#"+a},p=function(e,t){var n;return"easeInQuad"===e.easing&&(n=t*t),"easeOutQuad"===e.easing&&(n=t*(2-t)),"easeInOutQuad"===e.easing&&(n=t<.5?2*t*t:(4-2*t)*t-1),"easeInCubic"===e.easing&&(n=t*t*t),"easeOutCubic"===e.easing&&(n=--t*t*t+1),"easeInOutCubic"===e.easing&&(n=t<.5?4*t*t*t:(t-1)*(2*t-2)*(2*t-2)+1),"easeInQuart"===e.easing&&(n=t*t*t*t),"easeOutQuart"===e.easing&&(n=1- --t*t*t*t),"easeInOutQuart"===e.easing&&(n=t<.5?8*t*t*t*t:1-8*--t*t*t*t),"easeInQuint"===e.easing&&(n=t*t*t*t*t),"easeOutQuint"===e.easing&&(n=1+--t*t*t*t*t),"easeInOutQuint"===e.easing&&(n=t<.5?16*t*t*t*t*t:1+16*--t*t*t*t*t),e.easingPatterns[e.easing]&&(n=e.easingPatterns[e.easing](t)),n||t},g=function(e,t,n){var o=0;if(e.offsetParent)do{o+=e.offsetTop,e=e.offsetParent}while(e);return o=Math.max(o-t-n,0),Math.min(o,y()-b())},b=function(){return Math.max(document.documentElement.clientHeight,e.innerHeight||0)},y=function(){return Math.max(document.body.scrollHeight,document.documentElement.scrollHeight,document.body.offsetHeight,document.documentElement.offsetHeight,document.body.clientHeight,document.documentElement.clientHeight)},v=function(e){return e&&"object"==typeof JSON&&"function"==typeof JSON.parse?JSON.parse(e):{}},O=function(e){return e?d(e)+e.offsetTop:0},S=function(t,n,o){o||(t.focus(),document.activeElement.id!==t.id&&(t.setAttribute("tabindex","-1"),t.focus(),t.style.outline="none"),e.scrollTo(0,n))};l.animateScroll=function(n,o,i){var l=v(o?o.getAttribute("data-options"):null),s=f(t||u,i||{},l),d="[object Number]"===Object.prototype.toString.call(n),h=d||!n.tagName?null:n;if(d||h){var m=e.pageYOffset;s.selectorHeader&&!r&&(r=document.querySelector(s.selectorHeader)),a||(a=O(r));var b,E,I=d?n:g(h,a,parseInt("function"==typeof s.offset?s.offset():s.offset,10)),H=I-m,A=y(),j=0,C=function(t,r,a){var i=e.pageYOffset;(t==r||i==r||e.innerHeight+i>=A)&&(clearInterval(a),S(n,r,d),s.after(n,o))},M=function(){j+=16,b=j/parseInt(s.speed,10),b=b>1?1:b,E=m+H*p(s,b),e.scrollTo(0,Math.floor(E)),C(E,I,c)};0===e.pageYOffset&&e.scrollTo(0,0),s.before(n,o),(function(){clearInterval(c),c=setInterval(M,16)})()}};var E=function(t){try{m(decodeURIComponent(e.location.hash))}catch(t){m(e.location.hash)}n&&(n.id=n.getAttribute("data-scroll-id"),l.animateScroll(n,o),n=null,o=null)},I=function(r){if(0===r.button&&!r.metaKey&&!r.ctrlKey&&(o=h(r.target,t.selector))&&"a"===o.tagName.toLowerCase()&&o.hostname===e.location.hostname&&o.pathname===e.location.pathname&&/#/.test(o.href)){var a;try{a=m(decodeURIComponent(o.hash))}catch(e){a=m(o.hash)}if("#"===a){r.preventDefault(),n=document.body;var i=n.id?n.id:"smooth-scroll-top";return n.setAttribute("data-scroll-id",i),n.id="",void(e.location.hash.substring(1)===i?E():e.location.hash=i)}n=document.querySelector(a),n&&(n.setAttribute("data-scroll-id",n.id),n.id="",o.hash===e.location.hash&&(r.preventDefault(),E()))}},H=function(e){i||(i=setTimeout((function(){i=null,a=O(r)}),66))};return l.destroy=function(){t&&(document.removeEventListener("click",I,!1),e.removeEventListener("resize",H,!1),t=null,n=null,o=null,r=null,a=null,i=null,c=null)},l.init=function(n){s&&(l.destroy(),t=f(u,n||{}),r=t.selectorHeader?document.querySelector(t.selectorHeader):null,a=O(r),document.addEventListener("click",I,!1),e.addEventListener("hashchange",E,!1),r&&e.addEventListener("resize",H,!1))},l})); \ No newline at end of file diff --git a/docs/extras.html b/docs/extras.html new file mode 100644 index 0000000..5448790 --- /dev/null +++ b/docs/extras.html @@ -0,0 +1,171 @@ + + + + + + Smooth Scroll + + + + + + + + + + + + + + + + + +
    +
    + +
    + + + +

    + + + Smooth Scroll + +
    + Version 11 +

    + +
    + +

    Extras

    +

    Frequently asked questions, code snippets, and more to help you get the most out of Smooth Scroll.

    +
    + +

    Scrolling to an anchor link on another page

    +

    This, unfortunately, cannot be done well.

    +

    Most browsers instantly jump you to the anchor location when you load a page. You could use scrollTo(0, 0) to pull users back up to the top, and then manually use the smoothScroll.animateScroll() method, but in my experience, it results in a visible jump on the page that's a worse experience than the default browser behavior.

    +
    + +

    Scrolling without updating the URL

    +

    Smooth Scroll is designed to progressively enhance anchor links while offloading as much to the browser as possible. In it's current implementation, it relies on hashchange events (which occur whenever a # changes in the URL) to trigger the scrolling behavior.

    +

    A benefit of this approach is that it preserves browser history and let's users navigate between anchors with the forward and back buttons on the browsers, just like you would normally.

    +

    However, I know certain front-end frameworks also use URL hashes for their own internal processes. While I view this as an anti-pattern, and won't bake hashless anchor links into Smooth Scroll's core, you can enable scrolling without updating the URL via the Smooth Scroll API.

    +

    Here's a relatively lightweight helper function that listens for click events and uses the smoothScroll.animateScroll() method to scroll to the anchor. If you use this, you should not need initialize Smooth Scroll with smoothScroll.init().

    +
    var smoothScrollWithoutHash = function (selector, settings) {
+
+    /**
+     * Get the closest matching element up the DOM tree.
+     * @private
+     * @param  {Element} elem     Starting element
+     * @param  {String}  selector Selector to match against
+     * @return {Boolean|Element}  Returns null if not match found
+     */
+    var getClosest = function ( elem, selector ) {
+
+        // Element.matches() polyfill
+        if (!Element.prototype.matches) {
+            Element.prototype.matches =
+                Element.prototype.matchesSelector ||
+                Element.prototype.mozMatchesSelector ||
+                Element.prototype.msMatchesSelector ||
+                Element.prototype.oMatchesSelector ||
+                Element.prototype.webkitMatchesSelector ||
+                function(s) {
+                    var matches = (this.document || this.ownerDocument).querySelectorAll(s),
+                        i = matches.length;
+                    while (--i >= 0 && matches.item(i) !== this) {}
+                    return i > -1;
+                };
+        }
+
+        // Get closest match
+        for ( ; elem && elem !== document; elem = elem.parentNode ) {
+            if ( elem.matches( selector ) ) return elem;
+        }
+
+        return null;
+
+    };
+
+
+    /**
+     * If smooth scroll element clicked, animate scroll
+     * @private
+     */
+    var clickHandler = function (event) {
+        var toggle = getClosest( event.target, selector );
+        console.log(toggle);
+        if ( !toggle || toggle.tagName.toLowerCase() !== 'a' ) return;
+        console.log(toggle.hash);
+        var anchor = document.querySelector( toggle.hash );
+        if ( !anchor ) return;
+
+        event.preventDefault(); // Prevent default click event
+        smoothScroll.animateScroll( anchor, toggle, settings || {} ); // Animate scroll
+    };
+
+    window.addEventListener('click', clickHandler, false );
+
+};
+
+// Run our function
+smoothScrollWithoutHash( 'a[href*="#"]' );
+
    +
    + + +
    + + + + + + + + + + + + + \ No newline at end of file diff --git a/docs/index.html b/docs/index.html index 56c4214..3125eff 100755 --- a/docs/index.html +++ b/docs/index.html @@ -7,6 +7,10 @@ + + + + @@ -43,8 +47,8 @@
  • Download
  • Demo
  • Getting Started
    • -
  • Working with Source
  • Options & Settings
    • +
  • Extras
  • Browser Compatibility
  • License
    • @@ -146,7 +150,7 @@

    Demo

    offset: 5 }); highlightActiveNav.init({ - urlPrefix: '/smooth-scroll/' + urlPrefix: '/kraken/' }); diff --git a/docs/license.html b/docs/license.html index 5e13706..60b847c 100755 --- a/docs/license.html +++ b/docs/license.html @@ -7,6 +7,10 @@ + + + + @@ -43,8 +47,8 @@
  • Download
  • Demo
  • Getting Started
    • -
  • Working with Source
  • Options & Settings
    • +
  • Extras
  • Browser Compatibility
  • License
    • @@ -99,7 +103,7 @@

    Buy a Commercial License

    An Organization License can be used by an unlimited number of developers. - Buy an Organization License now for $999 + Buy an Organization License now for $999 @@ -118,7 +122,7 @@

    1. Definitions

    2. Commercial license grant

    Subject to the terms of this Agreement, Go Make Things grants to You a revocable, non-exclusive, non-transferable license:

      -
    • for [n Licensed Developers—varies based on the license your purchase] to use the Software to create Modifications and Applications;
      • +
    • for [n licensed developers—varies based on the license your purchase] to use the Software to create Modifications and Applications;
    • for You to distribute the Software and/or Modifications to an unlimited number of End Users solely as integrated into the Applications;
    • and for End Users to use the Software as incorporated into Your Applications in accordance with the terms of this Agreement.
    @@ -204,7 +208,7 @@

    OEM License

    offset: 5 }); highlightActiveNav.init({ - urlPrefix: '/smooth-scroll/' + urlPrefix: '/kraken/' }); diff --git a/docs/options.html b/docs/options.html index ebc6deb..02bb9c0 100755 --- a/docs/options.html +++ b/docs/options.html @@ -7,6 +7,10 @@ + + + + @@ -43,8 +47,8 @@
  • Download
  • Demo
  • Getting Started
    • -
  • Working with Source
  • Options & Settings
    • +
  • Extras
  • Browser Compatibility
  • License
    • @@ -130,7 +134,7 @@

    Override settings with data attr Anchor Link </a> -

    Note: You must use valid JSON in order for the data-options feature to work. Does not support the callback method.

    +

    Note: You must use valid JSON in order for the data-options feature to work. Does not support the before and after callback methods, or the easingPatterns object.

    @@ -139,8 +143,8 @@

    Use Smooth Scroll events i

    animateScroll()

    Animate scrolling to an anchor.

    smoothScroll.animateScroll(
-    anchor, // Node to scroll to. ex. document.querySelector( '#bazinga' )
-    toggle, // Node that toggles the animation, OR an integer. ex. document.querySelector( '#toggle' )
+    anchor, // Node to scroll to, OR an integer. ex. document.querySelector( '#bazinga' )
+    toggle, // Node that toggles the animation. ex. document.querySelector( '#toggle' )
     options // Classes and callbacks. Same options as those passed into the init() function.
 );
    @@ -178,29 +182,6 @@

    Fixed Headers

    }); </script> -
    - - - -

    This is an often requested feature, but Smooth Scroll does not include an option to animate scrolling to links on other pages.

    -

    You can attempt to implement it using the API, but it's very difficult to prevent the automatic browser jump when the page loads, and anything I've done to work around it results in weird, janky issues, so I've decided to leave this out of the core. Here's a potential workaround...

    -
      -

    1. Do not add the data-scroll attribute to links to other pages. Treat them like normal links, and include your anchor link hash as normal.

      -
       <a href="some-page.html#example">
-
      -
      2. -

    2. Add the following script to the footer of your page, after the smoothScroll.init() function.

      -
       <script>
-     if ( window.location.hash ) {
-         var anchor = document.querySelector( window.location.hash ); // Get the anchor
-         var toggle = document.querySelector( 'a[href*="' + window.location.hash + '"]' ); // Get the toggle (if one exists)
-         var options = {}; // Any custom options you want to use would go here
-         smoothScroll.animateScroll( anchor, toggle, options );
-     }
- </script>
-
      -
      3. -