From daf80b3b481564ad77745cfc49bea9d93acf3443 Mon Sep 17 00:00:00 2001 From: Nadia Robakova Date: Wed, 7 Aug 2019 11:37:59 +0300 Subject: [PATCH 1/3] fix(*): change static flag for the templates to true #5550 --- .../src/lib/banner/banner.component.ts | 4 ++-- .../src/lib/calendar/calendar.component.ts | 4 ++-- .../src/lib/combo/combo.component.ts | 16 ++++++++-------- .../src/lib/date-picker/date-picker.component.ts | 6 +++--- .../src/lib/grids/column.component.ts | 6 +++--- .../src/lib/grids/grid-base.component.ts | 14 +++++++------- .../src/lib/grids/grid/grid.component.ts | 4 ++-- .../lib/grids/tree-grid/tree-grid.component.ts | 4 ++-- .../src/lib/list/list.component.ts | 8 ++++---- .../src/lib/navbar/navbar.component.ts | 2 +- .../src/lib/progressbar/progressbar.component.ts | 2 +- .../src/lib/select/select.component.ts | 2 +- .../src/lib/slider/slider.component.ts | 2 +- .../src/lib/tabbar/tabbar.component.ts | 4 ++-- .../src/lib/tabs/tab-item.component.ts | 2 +- .../src/lib/tabs/tabs-group.component.ts | 2 +- .../src/lib/time-picker/time-picker.component.ts | 2 +- 17 files changed, 42 insertions(+), 42 deletions(-) diff --git a/projects/igniteui-angular/src/lib/banner/banner.component.ts b/projects/igniteui-angular/src/lib/banner/banner.component.ts index 723883a8101..f7bf9d4a1ab 100644 --- a/projects/igniteui-angular/src/lib/banner/banner.component.ts +++ b/projects/igniteui-angular/src/lib/banner/banner.component.ts @@ -47,13 +47,13 @@ export class IgxBannerComponent implements IToggleView { @ViewChild('expansionPanel', { static: true }) private _expansionPanel: IgxExpansionPanelComponent; - @ContentChild(IgxBannerActionsDirective, { static: true }) + @ContentChild(IgxBannerActionsDirective, { static: false }) private _bannerActionTemplate: IgxBannerActionsDirective; /** * @hidden */ - @ContentChild(IgxIconComponent, { static: true }) + @ContentChild(IgxIconComponent, { static: false }) public bannerIcon: IgxIconComponent; /** diff --git a/projects/igniteui-angular/src/lib/calendar/calendar.component.ts b/projects/igniteui-angular/src/lib/calendar/calendar.component.ts index bcb6bed7dd6..4ba840359a9 100644 --- a/projects/igniteui-angular/src/lib/calendar/calendar.component.ts +++ b/projects/igniteui-angular/src/lib/calendar/calendar.component.ts @@ -274,14 +274,14 @@ export class IgxCalendarComponent extends IgxMonthPickerBase implements AfterVie /** * @hidden */ - @ContentChild(forwardRef(() => IgxCalendarHeaderTemplateDirective), { read: IgxCalendarHeaderTemplateDirective, static: true }) + @ContentChild(forwardRef(() => IgxCalendarHeaderTemplateDirective), { read: IgxCalendarHeaderTemplateDirective, static: false }) private headerTemplateDirective: IgxCalendarHeaderTemplateDirective; /** * @hidden */ // tslint:disable-next-line:max-line-length - @ContentChild(forwardRef(() => IgxCalendarSubheaderTemplateDirective), { read: IgxCalendarSubheaderTemplateDirective, static: true }) + @ContentChild(forwardRef(() => IgxCalendarSubheaderTemplateDirective), { read: IgxCalendarSubheaderTemplateDirective, static: false }) private subheaderTemplateDirective: IgxCalendarSubheaderTemplateDirective; /** diff --git a/projects/igniteui-angular/src/lib/combo/combo.component.ts b/projects/igniteui-angular/src/lib/combo/combo.component.ts index 2a2fe28424e..54e5e15e8ad 100644 --- a/projects/igniteui-angular/src/lib/combo/combo.component.ts +++ b/projects/igniteui-angular/src/lib/combo/combo.component.ts @@ -221,7 +221,7 @@ export class IgxComboComponent extends DisplayDensityBase implements IgxComboBas * * ``` */ - @ContentChild(IgxComboItemDirective, { read: TemplateRef, static: true }) + @ContentChild(IgxComboItemDirective, { read: TemplateRef, static: false }) public itemTemplate: TemplateRef = null; /** @@ -244,7 +244,7 @@ export class IgxComboComponent extends DisplayDensityBase implements IgxComboBas * * ``` */ - @ContentChild(IgxComboHeaderDirective, { read: TemplateRef, static: true }) + @ContentChild(IgxComboHeaderDirective, { read: TemplateRef, static: false }) public headerTemplate: TemplateRef = null; /** @@ -267,7 +267,7 @@ export class IgxComboComponent extends DisplayDensityBase implements IgxComboBas * * ``` */ - @ContentChild(IgxComboFooterDirective, { read: TemplateRef, static: true }) + @ContentChild(IgxComboFooterDirective, { read: TemplateRef, static: false }) public footerTemplate: TemplateRef = null; /** @@ -288,7 +288,7 @@ export class IgxComboComponent extends DisplayDensityBase implements IgxComboBas * * ``` */ - @ContentChild(IgxComboHeaderItemDirective, { read: TemplateRef, static: true }) + @ContentChild(IgxComboHeaderItemDirective, { read: TemplateRef, static: false }) public headerItemTemplate: TemplateRef = null; /** @@ -311,7 +311,7 @@ export class IgxComboComponent extends DisplayDensityBase implements IgxComboBas * * ``` */ - @ContentChild(IgxComboAddItemDirective, { read: TemplateRef, static: true }) + @ContentChild(IgxComboAddItemDirective, { read: TemplateRef, static: false }) public addItemTemplate: TemplateRef = null; /** @@ -334,7 +334,7 @@ export class IgxComboComponent extends DisplayDensityBase implements IgxComboBas * * ``` */ - @ContentChild(IgxComboEmptyDirective, { read: TemplateRef, static: true }) + @ContentChild(IgxComboEmptyDirective, { read: TemplateRef, static: false }) public emptyTemplate: TemplateRef = null; /** @@ -355,7 +355,7 @@ export class IgxComboComponent extends DisplayDensityBase implements IgxComboBas * * ``` */ - @ContentChild(IgxComboToggleIconDirective, { read: TemplateRef, static: true }) + @ContentChild(IgxComboToggleIconDirective, { read: TemplateRef, static: false }) public toggleIconTemplate: TemplateRef = null; /** @@ -376,7 +376,7 @@ export class IgxComboComponent extends DisplayDensityBase implements IgxComboBas * * ``` */ - @ContentChild(IgxComboClearIconDirective, { read: TemplateRef, static: true }) + @ContentChild(IgxComboClearIconDirective, { read: TemplateRef, static: false }) public clearIconTemplate: TemplateRef = null; @ViewChild('primitive', { read: TemplateRef, static: true }) diff --git a/projects/igniteui-angular/src/lib/date-picker/date-picker.component.ts b/projects/igniteui-angular/src/lib/date-picker/date-picker.component.ts index 037e27d224c..67adcca5a0a 100644 --- a/projects/igniteui-angular/src/lib/date-picker/date-picker.component.ts +++ b/projects/igniteui-angular/src/lib/date-picker/date-picker.component.ts @@ -704,19 +704,19 @@ export class IgxDatePickerComponent implements IDatePicker, ControlValueAccessor /** *@hidden */ - @ContentChild(IgxDatePickerTemplateDirective, { read: IgxDatePickerTemplateDirective, static: true }) + @ContentChild(IgxDatePickerTemplateDirective, { read: IgxDatePickerTemplateDirective, static: false }) protected datePickerTemplateDirective: IgxDatePickerTemplateDirective; /** *@hidden */ - @ContentChild(IgxCalendarHeaderTemplateDirective, { read: IgxCalendarHeaderTemplateDirective, static: true }) + @ContentChild(IgxCalendarHeaderTemplateDirective, { read: IgxCalendarHeaderTemplateDirective, static: false }) public headerTemplate: IgxCalendarHeaderTemplateDirective; /** *@hidden */ - @ContentChild(IgxCalendarSubheaderTemplateDirective, { read: IgxCalendarSubheaderTemplateDirective, static: true }) + @ContentChild(IgxCalendarSubheaderTemplateDirective, { read: IgxCalendarSubheaderTemplateDirective, static: false }) public subheaderTemplate: IgxCalendarSubheaderTemplateDirective; /** diff --git a/projects/igniteui-angular/src/lib/grids/column.component.ts b/projects/igniteui-angular/src/lib/grids/column.component.ts index 9af83ad1aa9..abc4cf3cae6 100644 --- a/projects/igniteui-angular/src/lib/grids/column.component.ts +++ b/projects/igniteui-angular/src/lib/grids/column.component.ts @@ -1101,7 +1101,7 @@ export class IgxColumnComponent implements AfterContentInit { /** *@hidden */ - @ContentChild(IgxCellTemplateDirective, { read: IgxCellTemplateDirective, static: true }) + @ContentChild(IgxCellTemplateDirective, { read: IgxCellTemplateDirective, static: false }) protected cellTemplate: IgxCellTemplateDirective; /** *@hidden @@ -1111,14 +1111,14 @@ export class IgxColumnComponent implements AfterContentInit { /** *@hidden */ - @ContentChild(IgxCellEditorTemplateDirective, { read: IgxCellEditorTemplateDirective, static: true }) + @ContentChild(IgxCellEditorTemplateDirective, { read: IgxCellEditorTemplateDirective, static: false }) protected editorTemplate: IgxCellEditorTemplateDirective; protected _vIndex = NaN; /** *@hidden */ - @ContentChild(IgxFilterCellTemplateDirective, { read: IgxFilterCellTemplateDirective, static: true }) + @ContentChild(IgxFilterCellTemplateDirective, { read: IgxFilterCellTemplateDirective, static: false }) public filterCellTemplateDirective: IgxFilterCellTemplateDirective; constructor(public gridAPI: GridBaseAPIService, public cdr: ChangeDetectorRef) { } diff --git a/projects/igniteui-angular/src/lib/grids/grid-base.component.ts b/projects/igniteui-angular/src/lib/grids/grid-base.component.ts index 8a6bcbc0b70..18b42e30ddc 100644 --- a/projects/igniteui-angular/src/lib/grids/grid-base.component.ts +++ b/projects/igniteui-angular/src/lib/grids/grid-base.component.ts @@ -1554,25 +1554,25 @@ export abstract class IgxGridBaseComponent extends DisplayDensityBase implements /** *@hidden */ - @ContentChild(IgxExcelStyleSortingTemplateDirective, { read: IgxExcelStyleSortingTemplateDirective, static: true }) + @ContentChild(IgxExcelStyleSortingTemplateDirective, { read: IgxExcelStyleSortingTemplateDirective, static: false }) public excelStyleSortingTemplateDirective: IgxExcelStyleSortingTemplateDirective; /** *@hidden */ - @ContentChild(IgxExcelStyleMovingTemplateDirective, { read: IgxExcelStyleMovingTemplateDirective, static: true }) + @ContentChild(IgxExcelStyleMovingTemplateDirective, { read: IgxExcelStyleMovingTemplateDirective, static: false }) public excelStyleMovingTemplateDirective: IgxExcelStyleMovingTemplateDirective; /** *@hidden */ - @ContentChild(IgxExcelStyleHidingTemplateDirective, { read: IgxExcelStyleHidingTemplateDirective, static: true }) + @ContentChild(IgxExcelStyleHidingTemplateDirective, { read: IgxExcelStyleHidingTemplateDirective, static: false }) public excelStyleHidingTemplateDirective: IgxExcelStyleHidingTemplateDirective; /** *@hidden */ - @ContentChild(IgxExcelStylePinningTemplateDirective, { read: IgxExcelStylePinningTemplateDirective, static: true }) + @ContentChild(IgxExcelStylePinningTemplateDirective, { read: IgxExcelStylePinningTemplateDirective, static: false }) public excelStylePinningTemplateDirective: IgxExcelStylePinningTemplateDirective; @@ -1857,7 +1857,7 @@ export abstract class IgxGridBaseComponent extends DisplayDensityBase implements /** * @hidden */ - @ContentChild(IgxRowEditTemplateDirective, { read: TemplateRef, static: true }) + @ContentChild(IgxRowEditTemplateDirective, { read: TemplateRef, static: false }) public rowEditCustom: TemplateRef; /** @hidden */ @@ -1865,10 +1865,10 @@ export abstract class IgxGridBaseComponent extends DisplayDensityBase implements return this.rowEditCustom ? this.rowEditCustom : this.defaultRowEditTemplate; } /** @hidden */ - @ContentChild(IgxRowEditTextDirective, { read: TemplateRef, static: true }) + @ContentChild(IgxRowEditTextDirective, { read: TemplateRef, static: false }) public rowEditText: TemplateRef; /** @hidden */ - @ContentChild(IgxRowEditActionsDirective, { read: TemplateRef, static: true }) + @ContentChild(IgxRowEditActionsDirective, { read: TemplateRef, static: false }) public rowEditActions: TemplateRef; /** diff --git a/projects/igniteui-angular/src/lib/grids/grid/grid.component.ts b/projects/igniteui-angular/src/lib/grids/grid/grid.component.ts index c8fa64eb434..cd1f415f2c6 100644 --- a/projects/igniteui-angular/src/lib/grids/grid/grid.component.ts +++ b/projects/igniteui-angular/src/lib/grids/grid/grid.component.ts @@ -469,7 +469,7 @@ export class IgxGridComponent extends IgxGridBaseComponent implements IGridDataB /** * @hidden */ - @ContentChild(IgxGroupByRowTemplateDirective, { read: IgxGroupByRowTemplateDirective, static: true }) + @ContentChild(IgxGroupByRowTemplateDirective, { read: IgxGroupByRowTemplateDirective, static: false }) protected groupTemplate: IgxGroupByRowTemplateDirective; /** @@ -490,7 +490,7 @@ export class IgxGridComponent extends IgxGridBaseComponent implements IGridDataB * * ``` */ - @ContentChild(IgxDragIndicatorIconDirective, { read: TemplateRef, static: true }) + @ContentChild(IgxDragIndicatorIconDirective, { read: TemplateRef, static: false }) public dragIndicatorIconTemplate: TemplateRef = null; @ViewChildren(IgxGridGroupByRowComponent, { read: IgxGridGroupByRowComponent }) diff --git a/projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid.component.ts b/projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid.component.ts index 32d5a7088fd..743c139e6cd 100644 --- a/projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid.component.ts +++ b/projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid.component.ts @@ -300,7 +300,7 @@ export class IgxTreeGridComponent extends IgxGridBaseComponent implements IGridD /** * @hidden */ - @ContentChild(IgxRowLoadingIndicatorTemplateDirective, { read: IgxRowLoadingIndicatorTemplateDirective, static: true }) + @ContentChild(IgxRowLoadingIndicatorTemplateDirective, { read: IgxRowLoadingIndicatorTemplateDirective, static: false }) protected rowLoadingTemplate: IgxRowLoadingIndicatorTemplateDirective; /** @@ -321,7 +321,7 @@ export class IgxTreeGridComponent extends IgxGridBaseComponent implements IGridD * * ``` */ - @ContentChild(IgxDragIndicatorIconDirective, { read: TemplateRef, static: true }) + @ContentChild(IgxDragIndicatorIconDirective, { read: TemplateRef, static: false }) public dragIndicatorIconTemplate: TemplateRef = null; /** diff --git a/projects/igniteui-angular/src/lib/list/list.component.ts b/projects/igniteui-angular/src/lib/list/list.component.ts index aa28bd59720..93a631dbc34 100644 --- a/projects/igniteui-angular/src/lib/list/list.component.ts +++ b/projects/igniteui-angular/src/lib/list/list.component.ts @@ -172,7 +172,7 @@ export class IgxListComponent extends IgxListBase { * ``` * @memberof IgxListComponent */ - @ContentChild(IgxEmptyListTemplateDirective, { read: IgxEmptyListTemplateDirective, static: true }) + @ContentChild(IgxEmptyListTemplateDirective, { read: IgxEmptyListTemplateDirective, static: false }) public emptyListTemplate: IgxEmptyListTemplateDirective; /** @@ -182,7 +182,7 @@ export class IgxListComponent extends IgxListBase { * ``` * @memberof IgxListComponent */ - @ContentChild(IgxDataLoadingTemplateDirective, { read: IgxDataLoadingTemplateDirective, static: true }) + @ContentChild(IgxDataLoadingTemplateDirective, { read: IgxDataLoadingTemplateDirective, static: false }) public dataLoadingTemplate: IgxDataLoadingTemplateDirective; /** @@ -196,7 +196,7 @@ export class IgxListComponent extends IgxListBase { * ``` * @memberof IgxListComponent */ - @ContentChild(IgxListItemLeftPanningTemplateDirective, { read: IgxListItemLeftPanningTemplateDirective, static: true }) + @ContentChild(IgxListItemLeftPanningTemplateDirective, { read: IgxListItemLeftPanningTemplateDirective, static: false }) public listItemLeftPanningTemplate: IgxListItemLeftPanningTemplateDirective; /** @@ -210,7 +210,7 @@ export class IgxListComponent extends IgxListBase { * ``` * @memberof IgxListComponent */ - @ContentChild(IgxListItemRightPanningTemplateDirective, { read: IgxListItemRightPanningTemplateDirective, static: true }) + @ContentChild(IgxListItemRightPanningTemplateDirective, { read: IgxListItemRightPanningTemplateDirective, static: false }) public listItemRightPanningTemplate: IgxListItemRightPanningTemplateDirective; /** diff --git a/projects/igniteui-angular/src/lib/navbar/navbar.component.ts b/projects/igniteui-angular/src/lib/navbar/navbar.component.ts index 3ce17510225..391d7ffe382 100644 --- a/projects/igniteui-angular/src/lib/navbar/navbar.component.ts +++ b/projects/igniteui-angular/src/lib/navbar/navbar.component.ts @@ -133,7 +133,7 @@ export class IgxNavbarComponent { /** * @hidden */ - @ContentChild(IgxActionIconDirective, { read: IgxActionIconDirective, static: true }) + @ContentChild(IgxActionIconDirective, { read: IgxActionIconDirective, static: false }) protected actionIconTemplate: IgxActionIconDirective; /** diff --git a/projects/igniteui-angular/src/lib/progressbar/progressbar.component.ts b/projects/igniteui-angular/src/lib/progressbar/progressbar.component.ts index 8d77f48b29f..abf11a0e5d3 100644 --- a/projects/igniteui-angular/src/lib/progressbar/progressbar.component.ts +++ b/projects/igniteui-angular/src/lib/progressbar/progressbar.component.ts @@ -537,7 +537,7 @@ export class IgxCircularProgressBarComponent extends BaseProgress { @Input() public text: string; - @ContentChild(IgxProcessBarTextTemplateDirective, { read: IgxProcessBarTextTemplateDirective, static: true }) + @ContentChild(IgxProcessBarTextTemplateDirective, { read: IgxProcessBarTextTemplateDirective, static: false }) public textTemplate: IgxProcessBarTextTemplateDirective; /** diff --git a/projects/igniteui-angular/src/lib/select/select.component.ts b/projects/igniteui-angular/src/lib/select/select.component.ts index f4436bb6da4..b2aa8744479 100644 --- a/projects/igniteui-angular/src/lib/select/select.component.ts +++ b/projects/igniteui-angular/src/lib/select/select.component.ts @@ -188,7 +188,7 @@ export class IgxSelectComponent extends IgxDropDownComponent implements IgxSelec * * ``` */ - @ContentChild(IgxSelectToggleIconDirective, { read: TemplateRef, static: true }) + @ContentChild(IgxSelectToggleIconDirective, { read: TemplateRef, static: false }) public toggleIconTemplate: TemplateRef = null; /** @hidden @internal */ diff --git a/projects/igniteui-angular/src/lib/slider/slider.component.ts b/projects/igniteui-angular/src/lib/slider/slider.component.ts index 73e08c43d17..533ab821758 100644 --- a/projects/igniteui-angular/src/lib/slider/slider.component.ts +++ b/projects/igniteui-angular/src/lib/slider/slider.component.ts @@ -137,7 +137,7 @@ export class IgxSliderComponent implements /** * @hidden */ - @ContentChild(IgxThumbToTemplateDirective, { read: TemplateRef, static: true }) + @ContentChild(IgxThumbToTemplateDirective, { read: TemplateRef, static: false }) public thumbToTemplateRef: TemplateRef; /** diff --git a/projects/igniteui-angular/src/lib/tabbar/tabbar.component.ts b/projects/igniteui-angular/src/lib/tabbar/tabbar.component.ts index ea71a0af9a5..3612fdffc3d 100644 --- a/projects/igniteui-angular/src/lib/tabbar/tabbar.component.ts +++ b/projects/igniteui-angular/src/lib/tabbar/tabbar.component.ts @@ -423,7 +423,7 @@ export class IgxTabPanelComponent implements AfterContentInit, AfterViewChecked /** *@hidden */ - @ContentChild(IgxTabTemplateDirective, { read: IgxTabTemplateDirective, static: true }) + @ContentChild(IgxTabTemplateDirective, { read: IgxTabTemplateDirective, static: false }) protected tabTemplate: IgxTabTemplateDirective; constructor(private _tabBar: IgxBottomNavComponent, private _element: ElementRef) { @@ -664,7 +664,7 @@ export class IgxTabComponent { protected defaultTabTemplate: TemplateRef; /**@hidden*/ - @ContentChild(IgxTabTemplateDirective, { read: IgxTabTemplateDirective, static: true }) + @ContentChild(IgxTabTemplateDirective, { read: IgxTabTemplateDirective, static: false }) protected customTabTemplateDir: IgxTabTemplateDirective; /** diff --git a/projects/igniteui-angular/src/lib/tabs/tab-item.component.ts b/projects/igniteui-angular/src/lib/tabs/tab-item.component.ts index 3f051d4e3e6..cf05840af10 100644 --- a/projects/igniteui-angular/src/lib/tabs/tab-item.component.ts +++ b/projects/igniteui-angular/src/lib/tabs/tab-item.component.ts @@ -75,7 +75,7 @@ export class IgxTabItemComponent extends IgxTabItemBase { protected defaultTabTemplate: TemplateRef; /**@hidden*/ - @ContentChild(IgxTabItemTemplateDirective, { read: IgxTabItemTemplateDirective, static: true }) + @ContentChild(IgxTabItemTemplateDirective, { read: IgxTabItemTemplateDirective, static: false }) protected customTabTemplateDir: IgxTabItemTemplateDirective; private _nativeTabItem: ElementRef; diff --git a/projects/igniteui-angular/src/lib/tabs/tabs-group.component.ts b/projects/igniteui-angular/src/lib/tabs/tabs-group.component.ts index 454735f867e..d5d5ef9f9b5 100644 --- a/projects/igniteui-angular/src/lib/tabs/tabs-group.component.ts +++ b/projects/igniteui-angular/src/lib/tabs/tabs-group.component.ts @@ -71,7 +71,7 @@ export class IgxTabsGroupComponent extends IgxTabsGroupBase implements AfterCont /** * @hidden */ - @ContentChild(IgxTabItemTemplateDirective, { read: IgxTabItemTemplateDirective, static: true }) + @ContentChild(IgxTabItemTemplateDirective, { read: IgxTabItemTemplateDirective, static: false }) protected tabTemplate: IgxTabItemTemplateDirective; private _tabTemplate: TemplateRef; diff --git a/projects/igniteui-angular/src/lib/time-picker/time-picker.component.ts b/projects/igniteui-angular/src/lib/time-picker/time-picker.component.ts index daa6c4bc53f..b53b725f1d2 100644 --- a/projects/igniteui-angular/src/lib/time-picker/time-picker.component.ts +++ b/projects/igniteui-angular/src/lib/time-picker/time-picker.component.ts @@ -505,7 +505,7 @@ export class IgxTimePickerComponent implements /** *@hidden */ - @ContentChild(IgxTimePickerTemplateDirective, { read: IgxTimePickerTemplateDirective, static: true }) + @ContentChild(IgxTimePickerTemplateDirective, { read: IgxTimePickerTemplateDirective, static: false }) protected timePickerTemplateDirective: IgxTimePickerTemplateDirective; /** From 2ddfb265b890055a94d19dcc9b86726c660395b9 Mon Sep 17 00:00:00 2001 From: Nadia Robakova Date: Thu, 8 Aug 2019 09:43:46 +0300 Subject: [PATCH 2/3] fix(*): change static flag for the templates to false #5550 --- .../igniteui-angular/src/lib/calendar/calendar.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/igniteui-angular/src/lib/calendar/calendar.component.ts b/projects/igniteui-angular/src/lib/calendar/calendar.component.ts index 4ba840359a9..bcb6bed7dd6 100644 --- a/projects/igniteui-angular/src/lib/calendar/calendar.component.ts +++ b/projects/igniteui-angular/src/lib/calendar/calendar.component.ts @@ -274,14 +274,14 @@ export class IgxCalendarComponent extends IgxMonthPickerBase implements AfterVie /** * @hidden */ - @ContentChild(forwardRef(() => IgxCalendarHeaderTemplateDirective), { read: IgxCalendarHeaderTemplateDirective, static: false }) + @ContentChild(forwardRef(() => IgxCalendarHeaderTemplateDirective), { read: IgxCalendarHeaderTemplateDirective, static: true }) private headerTemplateDirective: IgxCalendarHeaderTemplateDirective; /** * @hidden */ // tslint:disable-next-line:max-line-length - @ContentChild(forwardRef(() => IgxCalendarSubheaderTemplateDirective), { read: IgxCalendarSubheaderTemplateDirective, static: false }) + @ContentChild(forwardRef(() => IgxCalendarSubheaderTemplateDirective), { read: IgxCalendarSubheaderTemplateDirective, static: true }) private subheaderTemplateDirective: IgxCalendarSubheaderTemplateDirective; /** From 5fefc5e3bc72d8978e67275c3f45c7816135c9a5 Mon Sep 17 00:00:00 2001 From: Zdravko Kolev Date: Mon, 12 Aug 2019 17:29:58 +0300 Subject: [PATCH 3/3] fix(coveralls): remove coveralls configs #5550 --- .travis.yml | 2 +- azure-pipelines.yml | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index c40db0de2a3..ba9ff0dd54d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ script: - npm run build:style - if [ -z "${TRAVIS_TAG}" ]; then npm run test:lib; fi - if [ -z "${TRAVIS_TAG}" ]; then npm run test:schematics; fi -- if [ -z "${TRAVIS_TAG}" ] && [ "${TRAVIS_REPO_SLUG}" == "IgniteUI/igniteui-angular" ]; then cat ./coverage/lcov.info | coveralls; fi +# - if [ -z "${TRAVIS_TAG}" ] && [ "${TRAVIS_REPO_SLUG}" == "IgniteUI/igniteui-angular" ]; then cat ./coverage/lcov.info | coveralls; fi before_deploy: - npm run build:schematics diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 4e8e53c3bdd..2a3b040e405 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -18,11 +18,11 @@ steps: env: NODE_OPTIONS: "--max_old_space_size=4096" -- script: cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js - condition: and(succeeded(), eq(variables['system.teamProject'], 'igniteui-angular')) - displayName: 'Code coverage @ Coveralls' - env: - COVERALLS_REPO_TOKEN: $(coveralls.repoToken) +# - script: cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js +# condition: and(succeeded(), eq(variables['system.teamProject'], 'igniteui-angular')) +# displayName: 'Code coverage @ Coveralls' +# env: +# COVERALLS_REPO_TOKEN: $(coveralls.repoToken) - script: npm run test:schematics displayName: 'Run migrations & schematics' @@ -33,8 +33,8 @@ steps: testRunner: 'JUnit' testResultsFiles: '**/TESTS-*.xml' -- task: PublishCodeCoverageResults@1 - inputs: - codeCoverageTool: Cobertura - summaryFileLocation: '$(System.DefaultWorkingDirectory)/coverage/cobertura-coverage.xml' - reportDirectory: '$(System.DefaultWorkingDirectory)/coverage' +# - task: PublishCodeCoverageResults@1 +# inputs: +# codeCoverageTool: Cobertura +# summaryFileLocation: '$(System.DefaultWorkingDirectory)/coverage/cobertura-coverage.xml' +# reportDirectory: '$(System.DefaultWorkingDirectory)/coverage'