Merge pull request #2496 from VojtechVitek/issue_2461_touchmove

Fix #2461: let the parent container scroll also on touchmove event
angular-ui · Feb 6, 2015 · a1082af · a1082af
2 parents 9928328 + a55438f
commit a1082af
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/js/core/directives/ui-grid-render-container.js b/src/js/core/directives/ui-grid-render-container.js
@@ -206,6 +206,11 @@
                 scrollEvent.x = { percentage: scrollXPercentage, pixels: deltaX };
               }
 
+              // Let the parent container scroll if the grid is already at the top/bottom
+              if ((scrollEvent.y && scrollEvent.y.percentage !== 0 && scrollEvent.y.percentage !== 1) ||
+                  (scrollEvent.x && scrollEvent.x.percentage !== 0 && scrollEvent.x.percentage !== 1)) {
+                event.preventDefault();
+              }
               scrollEvent.fireScrollingEvent();
             }