Skip to content

Commit

Permalink
fix(expandable): fix #4156 by calling stopProp on subgrid scroll
Browse files Browse the repository at this point in the history
Previously, the stopPropagation function was not on scrollEvent, causing
scrolling in subgrids to also scroll the main grid.  This PR exposes stopProp
and calls it on subgrid scroll

fixes #4156
  • Loading branch information
SomeKittens committed Aug 15, 2015
1 parent e6bc300 commit a7dd337
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
1 change: 1 addition & 0 deletions src/js/core/directives/ui-grid-render-container.js
Expand Up @@ -113,6 +113,7 @@
}
else {
event.preventDefault();
event.stopPropagation();
scrollEvent.fireThrottledScrollingEvent('', scrollEvent);
}

Expand Down
3 changes: 2 additions & 1 deletion src/js/core/services/ui-grid-util.js
Expand Up @@ -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
Expand Down

0 comments on commit a7dd337

Please sign in to comment.