Merge pull request #4201 from SomeKittens/fix-expanded-double-scroll

fix(expandable): fix #4156 by calling stopProp on subgrid scroll
angular-ui · Aug 16, 2015 · 20ff45e · 20ff45e
2 parents e6bc300 + a7dd337
commit 20ff45e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/js/core/directives/ui-grid-render-container.js b/src/js/core/directives/ui-grid-render-container.js
@@ -113,6 +113,7 @@
               }
               else {
                 event.preventDefault();
+                event.stopPropagation();
                 scrollEvent.fireThrottledScrollingEvent('', scrollEvent);
               }
 

diff --git a/src/js/core/services/ui-grid-util.js b/src/js/core/services/ui-grid-util.js
@@ -1393,7 +1393,8 @@ module.service('gridUtil', ['$log', '$window', '$document', '$http', '$templateC
       deltaX: deltaX,
       deltaY: deltaY,
       deltaFactor: lowestDelta,
-      preventDefault: function () { event.preventDefault(); }
+      preventDefault: function () { event.preventDefault(); },
+      stopPropagation: function () { event.stopPropagation(); }
     };
 
     // Clearout lowestDelta after sometime to better
-Original file line number
+Diff line change
@@ Expand Up / @@ -113,6 +113,7 @@ @@
                   }
                   else {
                     event.preventDefault();
+                    event.stopPropagation();
                     scrollEvent.fireThrottledScrollingEvent('', scrollEvent);
                   }
@@ Expand Down @@