Skip to content

Commit 73ee72d

Browse files
committed
properly detect digest in progress
1 parent daabd3c commit 73ee72d

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/ui-scroll.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ angular.module('ui.scroll', [])
349349
let updates = updateDOM();
350350

351351
// We need the item bindings to be processed before we can do adjustment
352-
!$scope.$$phase && $scope.$digest();
352+
!$scope.$$phase && !$scope.$root.$$phase && $scope.$digest();
353353

354354
updates.inserted.forEach(w => w.element.removeClass('ng-hide'));
355355
updates.prepended.forEach(w => w.element.removeClass('ng-hide'));
@@ -370,7 +370,7 @@ angular.module('ui.scroll', [])
370370
let updates = updateDOM();
371371

372372
// We need the item bindings to be processed before we can do adjustment
373-
!$scope.$$phase && $scope.$digest();
373+
!$scope.$$phase && !$scope.$root.$$phase && $scope.$digest();
374374

375375
updates.inserted.forEach(w => w.element.removeClass('ng-hide'));
376376
updates.prepended.forEach(w => w.element.removeClass('ng-hide'));

0 commit comments

Comments
 (0)