Skip to content

Commit 79f6c21

Browse files
committed
fix(Filter): Watch running w/o change check
The filter term watches were all firing whether or not there was a change to the values!
1 parent 1182b05 commit 79f6c21

File tree

2 files changed

+10
-11
lines changed

2 files changed

+10
-11
lines changed

src/features/edit/js/gridEdit.js

-3
Original file line numberDiff line numberDiff line change
@@ -549,7 +549,6 @@
549549

550550
var cellElement;
551551
$scope.$apply(function () {
552-
debugger;
553552
inEdit = true;
554553
cancelBeginEditEvents();
555554
var cellElement = angular.element(html);
@@ -677,8 +676,6 @@
677676
});
678677

679678
$elm.on('keydown', function (evt) {
680-
// debugger;
681-
682679
switch (evt.keyCode) {
683680
case uiGridConstants.keymap.ESC:
684681
evt.stopPropagation();

src/js/core/directives/ui-grid-header-cell.js

+10-8
Original file line numberDiff line numberDiff line change
@@ -213,14 +213,16 @@
213213
var filterDeregisters = [];
214214
angular.forEach($scope.col.filters, function(filter, i) {
215215
filterDeregisters.push($scope.$watch('col.filters[' + i + '].term', function(n, o) {
216-
uiGridCtrl.grid.api.core.raise.filterChanged();
217-
uiGridCtrl.grid.refresh()
218-
.then(function () {
219-
if (uiGridCtrl.prevScrollArgs && uiGridCtrl.prevScrollArgs.y && uiGridCtrl.prevScrollArgs.y.percentage) {
220-
uiGridCtrl.fireScrollingEvent({ y: { percentage: uiGridCtrl.prevScrollArgs.y.percentage } });
221-
}
222-
// uiGridCtrl.fireEvent('force-vertical-scroll');
223-
});
216+
if (n !== o) {
217+
uiGridCtrl.grid.api.core.raise.filterChanged();
218+
uiGridCtrl.grid.refresh()
219+
.then(function () {
220+
if (uiGridCtrl.prevScrollArgs && uiGridCtrl.prevScrollArgs.y && uiGridCtrl.prevScrollArgs.y.percentage) {
221+
uiGridCtrl.fireScrollingEvent({ y: { percentage: uiGridCtrl.prevScrollArgs.y.percentage } });
222+
}
223+
// uiGridCtrl.fireEvent('force-vertical-scroll');
224+
});
225+
}
224226
}));
225227
});
226228
$scope.$on('$destroy', function() {

0 commit comments

Comments
 (0)