Merge branch 'master' into nrobakova/fix-tests-errors

ddincheva · web-flow · commit ea360a459327 · 2020-01-14T14:52:04.000+02:00
diff --git a/projects/igniteui-angular/src/lib/directives/for-of/for_of.directive.ts b/projects/igniteui-angular/src/lib/directives/for-of/for_of.directive.ts
@@ -1176,6 +1176,9 @@ export class IgxForOfDirective<T> implements OnInit, OnChanges, DoCheck, OnDestr
             this.scrollComponent.size = this._calcHeight();
             if ( this.scrollComponent.size <= parseInt(this.igxForContainerSize, 10)) {
                 this.scrollPosition = 0;
+                // Need to reset the scrollAmount value here, because
+                // Firefox will not fire the scrollComponent scroll event handler
+                this.scrollComponent.scrollAmount = 0;
             }
         }
         if (scrollable !== this.isScrollable()) {

Original file line number	Diff line number	Diff line change
`@@ -1176,6 +1176,9 @@ export class IgxForOfDirective<T> implements OnInit, OnChanges, DoCheck, OnDestr`
`1176`	`1176`	`this.scrollComponent.size = this._calcHeight();`
`1177`	`1177`	`if ( this.scrollComponent.size <= parseInt(this.igxForContainerSize, 10)) {`
`1178`	`1178`	`this.scrollPosition = 0;`
	`1179`	`+ // Need to reset the scrollAmount value here, because`
	`1180`	`+ // Firefox will not fire the scrollComponent scroll event handler`
	`1181`	`+ this.scrollComponent.scrollAmount = 0;`
`1179`	`1182`	`}`
`1180`	`1183`	`}`
`1181`	`1184`	`if (scrollable !== this.isScrollable()) {`