Fixing lethargy integration

Author: Daniel Li

README.md

@@ -1,6 +1,6 @@
 # smartscroll
 
-smartscroll is a tiny (1046b minfied + gzipped) jQuery plugin that has these *independent* features:
+smartscroll is a tiny (1048b minfied + gzipped) jQuery plugin that has these *independent* features:
 
 1. Section scrolling - Scrolljacking
 2. Auto-hash - Updates the URL hash based on current position on page

examples/auto-hash/index.html

@@ -12,7 +12,7 @@
 		<div class="section" data-hash="a">
 			<div>
 				<h1>smartscroll - Auto-Hash</h1>
-				<p>A tiny (1046b minfied + gzipped) jQuery plugin for scrolljacking and auto-hashing</p>
+				<p>A tiny (1048b minfied + gzipped) jQuery plugin for scrolljacking and auto-hashing</p>
 				<p>See it on <a href="https://github.com/d4nyll/smartscroll" target="_blank">GitHub</a>, or see some <a href="http://blog.danyll.com/smartscroll-jquery-scrolljacking-plugin/" target="_blank">comparisons</a></p>
 				<p>Try out other examples!</p>
 				<ul>
@@ -44,6 +44,7 @@ <h1>smartscroll - Auto-Hash</h1>
 		</div>
 	</div>
 	<script type="text/javascript" src="../../bower_components/lethargy/lethargy.min.js"></script>
+	<script type="text/javascript" src="../../smartscroll.js"></script>
 	<script>
 		$.smartscroll({
 			autoHash: true,

examples/different-heights/index.html

@@ -12,7 +12,7 @@
 		<div class="section" data-hash="a">
 			<div>
 				<h1>smartscroll - Different Heights</h1>
-				<p>A tiny (1046b minfied + gzipped) jQuery plugin for scrolljacking and auto-hashing</p>
+				<p>A tiny (1048b minfied + gzipped) jQuery plugin for scrolljacking and auto-hashing</p>
 				<p>See it on <a href="https://github.com/d4nyll/smartscroll" target="_blank">GitHub</a>, or see some <a href="http://blog.danyll.com/smartscroll-jquery-scrolljacking-plugin/" target="_blank">comparisons</a></p>
 				<p>Try out other examples!</p>
 				<ul>
@@ -43,6 +43,7 @@ <h1>smartscroll - Different Heights</h1>
 		</div>
 	</div>
 	<script type="text/javascript" src="../../bower_components/lethargy/lethargy.min.js"></script>
+	<script type="text/javascript" src="../../smartscroll.js"></script>
 	<script>
 		$.smartscroll({
 			mode: "set"

examples/hybrid-scroll/index.html

@@ -11,7 +11,7 @@
 	<div class="header">
 		<div>
 			<h1>smartscroll - Hybrid Scroll</h1>
-			<p>A tiny (1046b minfied + gzipped) jQuery plugin for scrolljacking and auto-hashing</p>
+			<p>A tiny (1048b minfied + gzipped) jQuery plugin for scrolljacking and auto-hashing</p>
 			<p>See it on <a href="https://github.com/d4nyll/smartscroll" target="_blank">GitHub</a>, or see some <a href="http://blog.danyll.com/smartscroll-jquery-scrolljacking-plugin/" target="_blank">comparisons</a></p>
 			<p>Try out other examples!</p>
 			<ul>
@@ -51,6 +51,7 @@ <h1>Hybrid Scroll</h1>
 		</div>
 	</div>
 	<script type="text/javascript" src="../../bower_components/lethargy/lethargy.min.js"></script>
+	<script type="text/javascript" src="../../smartscroll.js"></script>
 	<script>
 		$.smartscroll({});
 	</script>

examples/index.html

@@ -11,7 +11,7 @@
 	<div class="header">
 		<div>
 			<h1>smartscroll</h1>
-			<p>A tiny (1046b minfied + gzipped) jQuery plugin for scrolljacking and auto-hashing</p>
+			<p>A tiny (1048b minfied + gzipped) jQuery plugin for scrolljacking and auto-hashing</p>
 			<p>See it on <a href="https://github.com/d4nyll/smartscroll" target="_blank">GitHub</a>, or see some <a href="http://blog.danyll.com/smartscroll-jquery-scrolljacking-plugin/" target="_blank">comparisons</a></p>
 			<p>Try out other examples!</p>
 			<ul>
@@ -21,6 +21,7 @@ <h1>smartscroll</h1>
 				<li><a href="http://d4nyll.github.io/smartscroll/hybrid-scroll/">Hybrid Scroll</a></li>
 				<li><a href="http://d4nyll.github.io/smartscroll/auto-hash/">Auto-Hash</a></li>
 				<li><a href="http://d4nyll.github.io/smartscroll/keep-history/">Keep History</a></li>
+				<li><a href="http://d4nyll.github.io/smartscroll/responsive/">Keep History</a></li>
 			</ul>
 		</div>
 	</div>
@@ -71,8 +72,16 @@ <h1>Keep History</h1>
 				<a href="http://d4nyll.github.io/smartscroll/keep-history/">Demo</a>
 			</div>
 		</div>
+		<div class="section" data-hash="responsive">
+			<div>
+				<h1>Responsive</h1>
+				<p>You can disable section scrolling for windows below a certain width. Do not confuse this with touch devices, where scrolljacking is disabled by design.</p>
+				<a href="http://d4nyll.github.io/smartscroll/responsive/">Demo</a>
+			</div>
+		</div>
 	</div>
 	<script type="text/javascript" src="../bower_components/lethargy/lethargy.min.js"></script>
+	<script type="text/javascript" src="../smartscroll.js"></script>
 	<script>
 		$.smartscroll({
 			sectionWrapperSelector: ".section-wrapper",

examples/keep-history/index.html

@@ -12,7 +12,7 @@
 		<div class="section" data-hash="a">
 			<div>
 				<h1>smartscroll - Keep History</h1>
-				<p>A tiny (1046b minfied + gzipped) jQuery plugin for scrolljacking and auto-hashing</p>
+				<p>A tiny (1048b minfied + gzipped) jQuery plugin for scrolljacking and auto-hashing</p>
 				<p>See it on <a href="https://github.com/d4nyll/smartscroll" target="_blank">GitHub</a>, or see some <a href="http://blog.danyll.com/smartscroll-jquery-scrolljacking-plugin/" target="_blank">comparisons</a></p>
 				<p>Try out other examples!</p>
 				<ul>
@@ -38,6 +38,7 @@ <h1>smartscroll - Keep History</h1>
 		</div>
 	</div>
 	<script type="text/javascript" src="../../bower_components/lethargy/lethargy.min.js"></script>
+	<script type="text/javascript" src="../../smartscroll.js"></script>
 	<script>
 		$.smartscroll({
 			keepHistory: true

examples/permalink/index.html

@@ -12,7 +12,7 @@
 		<div class="section" data-hash="a">
 			<div>
 				<h1>smartscroll - Permalink</h1>
-				<p>A tiny (1046b minfied + gzipped) jQuery plugin for scrolljacking and auto-hashing</p>
+				<p>A tiny (1048b minfied + gzipped) jQuery plugin for scrolljacking and auto-hashing</p>
 				<p>See it on <a href="https://github.com/d4nyll/smartscroll" target="_blank">GitHub</a>, or see some <a href="http://blog.danyll.com/smartscroll-jquery-scrolljacking-plugin/" target="_blank">comparisons</a></p>
 				<p>Try out other examples!</p>
 				<ul>
@@ -43,6 +43,7 @@ <h1>smartscroll - Permalink</h1>
 		</div>
 	</div>
 	<script type="text/javascript" src="../../bower_components/lethargy/lethargy.min.js"></script>
+	<script type="text/javascript" src="../../smartscroll.js"></script>
 	<script>
 		$.smartscroll({});
 	</script>

examples/responsive/index.html

@@ -11,7 +11,7 @@
 	<div class="header">
 		<div>
 			<h1>smartscroll - Responsive</h1>
-			<p>A tiny (1050b minfied + gzipped) jQuery plugin for scrolljacking and auto-hashing</p>
+			<p>A tiny (1048b minfied + gzipped) jQuery plugin for scrolljacking and auto-hashing</p>
 			<p>See it on <a href="https://github.com/d4nyll/smartscroll" target="_blank">GitHub</a>, or see some <a href="http://blog.danyll.com/smartscroll-jquery-scrolljacking-plugin/" target="_blank">comparisons</a></p>
 			<p>Try out other examples!</p>
 			<ul>
@@ -73,6 +73,7 @@ <h1>Keep History</h1>
 			</div>
 		</div>
 	</div>
+	<script type="text/javascript" src="../../bower_components/lethargy/lethargy.min.js"></script>
 	<script type="text/javascript" src="../../smartscroll.js"></script>
 	<script>
 		$.smartscroll({

smartscroll.js

@@ -8,7 +8,7 @@
 		keepHistory: false,
 		sectionWrapperSelector: ".section-wrapper",
 		sectionClass: "section",
-		animationSpeed: 300,
+		animationSpeed: 500,
 		headerHash: "header",
 		breakpoint: null
 	}
@@ -115,10 +115,10 @@
 			var bindScroll = function () {
 				$(window).bind('mousewheel DOMMouseScroll', function(e){
 					if(Math.max(window.document.body.scrollTop, document.documentElement.scrollTop) >= $(options.sectionWrapperSelector + ':first').position().top) {
+						var validScroll = lethargy.check(e);
+						e.preventDefault()
+						e.stopPropagation();
 						if(!scrolling) {
-							e.preventDefault()
-							e.stopPropagation();
-							var validScroll = lethargy.check(e);
 							if (validScroll === 1) {
 					        	scrollUp();
 					        } else if (validScroll === -1) {