fix(scrollView): always stay exactly within boundaries after bounce

Closes #1736
ionic-team · Jul 7, 2014 · 1c789f8 · 1c789f8
1 parent d5d38bb
commit 1c789f8
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/js/views/scrollView.js b/js/views/scrollView.js
@@ -2118,6 +2118,16 @@ ionic.views.Scroll = ionic.views.View.inherit({
         Math.abs(self.__decelerationVelocityY) >= self.__minVelocityToKeepDecelerating;
       if (!shouldContinue) {
         self.__didDecelerationComplete = true;
+
+        //Make sure the scroll values are within the boundaries after a bounce,
+        //not below 0 or above maximum
+        if (self.options.bouncing) {
+          self.scrollTo(
+            Math.min( Math.max(self.__scrollLeft, 0), self.__maxScrollLeft ),
+            Math.min( Math.max(self.__scrollTop, 0), self.__maxScrollTop ),
+            false
+          );
+        }
       }
       return shouldContinue;
     };