Merge pull request #35 from alexguzman/master

Chris Ferdinandi · Chris Ferdinandi · commit 9882e1a7c4a2 · 2014-02-10T09:38:45.000-05:00
Fix iOS stuck in infinite loop bug and Chrome browser zoom bug.
diff --git 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);
+})(window, document);

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ window.smoothScroll = (function (window, document, undefined) {`
`99`	`99`	`// Stop the scrolling animation when the anchor is reached (or at the top/bottom of the page)`
`100`	`100`	`var stopAnimation = function () {`
`101`	`101`	`var currentLocation = window.pageYOffset;`
`102`		`- if ( currentLocation == endLocation \|\| ( (window.innerHeight + currentLocation) >= document.body.scrollHeight ) ) {`
	`102`	`+ if ( position == endLocation \|\| currentLocation == endLocation \|\| ( (window.innerHeight + currentLocation) >= document.body.scrollHeight ) ) {`
`103`	`103`	`clearInterval(runAnimation);`
`104`	`104`	`}`
`105`	`105`	`};`
`@@ -161,4 +161,4 @@ window.smoothScroll = (function (window, document, undefined) {`
`161`	`161`
`162`	`162`	`}`
`163`	`163`
`164`		`-})(window, document);`
	`164`	`+})(window, document);`