Merge pull request #37 from DjRAST/master

Fix for issue #36: Scrolling to bottom does not work in container
d-oliveros · Oct 20, 2015 · 1a132ff · 1a132ff
2 parents b8e41b8 + 8137a14
commit 1a132ff
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/dist/angular-smooth-scroll.min.js b/dist/angular-smooth-scroll.min.js
diff --git a/lib/angular-smooth-scroll.js b/lib/angular-smooth-scroll.js
@@ -110,11 +110,12 @@
 			 */
 			var stopAnimation = function () {
 				currentLocation = getScrollLocation();
-				internalHeight = window.innerHeight + currentLocation;
 				if(containerPresent) {
 					scrollHeight = container.scrollHeight;
+					internalHeight = container.clientHeight + currentLocation;
 				} else {
 					scrollHeight = document.body.scrollheight;
+					internalHeight = window.innerHeight + currentLocation;
 				}
 
 				if (