Skip to content

Commit 872ef90

Browse files
authored
Merge branch 'master' into set-width-hideallcolumns-master
2 parents 4ab465a + fdbd5cd commit 872ef90

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

projects/igniteui-angular/src/lib/carousel/carousel.component.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ import {
2121
Injectable
2222
} from '@angular/core';
2323
import { IgxIconModule } from '../icon/index';
24-
import { IBaseEventArgs } from '../core/utils';
24+
import { IBaseEventArgs, PlatformUtil } from '../core/utils';
2525
import { Subject, merge } from 'rxjs';
2626
import { takeUntil } from 'rxjs/operators';
2727
import { IgxCarouselIndicatorDirective, IgxCarouselNextButtonDirective, IgxCarouselPrevButtonDirective } from './carousel.directives';
2828
import { useAnimation, AnimationBuilder, AnimationPlayer, AnimationReferenceMetadata } from '@angular/animations';
29-
import { slideInLeft, fadeIn, rotateInCenter } from '../animations/main';
29+
import { slideInLeft, fadeIn } from '../animations/main';
3030
import { IgxSlideComponent, Direction } from './slide.component';
3131
import { ICarouselResourceStrings } from '../core/i18n/carousel-resources';
3232
import { CurrentResourceStrings } from '../core/i18n/resources';
@@ -436,7 +436,8 @@ export class IgxCarouselComponent implements OnDestroy, AfterContentInit {
436436
private animationPosition = 0;
437437
private newDuration = 0;
438438

439-
constructor(private element: ElementRef, private iterableDiffers: IterableDiffers, private builder: AnimationBuilder) {
439+
constructor(private element: ElementRef, private iterableDiffers: IterableDiffers,
440+
private builder: AnimationBuilder, private platformUtil: PlatformUtil) {
440441
this.differ = this.iterableDiffers.find([]).create(null);
441442
}
442443

@@ -887,7 +888,7 @@ export class IgxCarouselComponent implements OnDestroy, AfterContentInit {
887888
private restartInterval() {
888889
this.resetInterval();
889890

890-
if (!isNaN(this.interval) && this.interval > 0) {
891+
if (!isNaN(this.interval) && this.interval > 0 && this.platformUtil.isBrowser) {
891892
this.lastInterval = setInterval(() => {
892893
const tick = +this.interval;
893894
if (this.playing && this.total && !isNaN(tick) && tick > 0) {

projects/igniteui-angular/src/lib/grids/grid-base.directive.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
330330
}
331331

332332
/**
333-
* Emitted before filtering is performed.
333+
* Emitted after filtering is performed.
334334
* Returns the filtering expressions tree of the column for which filtering was performed.
335335
* ```typescript
336336
* filteringExprTreeChange(event: IFilteringExpressionsTree){
@@ -347,7 +347,7 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
347347
public filteringExpressionsTreeChange = new EventEmitter<IFilteringExpressionsTree>();
348348

349349
/**
350-
* Emitted before advanced filtering is performed.
350+
* Emitted after advanced filtering is performed.
351351
* Returns the advanced filtering expressions tree.
352352
* ```typescript
353353
* advancedFilteringExprTreeChange(event: IFilteringExpressionsTree){

projects/igniteui-angular/src/lib/grids/state.directive.spec.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,11 @@ import { IgxBooleanFilteringOperand } from '../data-operations/filtering-conditi
1414
import { IGroupingState } from '../data-operations/groupby-state.interface';
1515
import { IGroupByExpandState } from '../data-operations/groupby-expand-state.interface';
1616
import { GridSelectionMode } from './common/enums';
17+
import { configureTestSuite } from '../test-utils/configure-suite';
1718

1819
describe('IgxGridState - input properties #grid', () => {
20+
configureTestSuite();
21+
1922
beforeEach(async(() => {
2023
TestBed.configureTestingModule({
2124
declarations: [

0 commit comments

Comments
 (0)