Skip to content

Commit d28a7e0

Browse files
zdrawkuzdrawku
authored
Merge branch '8.1.x' into vslavov/combo-selection-event
2 parents 5141969 + ac6547a commit d28a7e0

File tree

18 files changed

+51
-51
lines changed

18 files changed

+51
-51
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ script:
2323
- npm run build:style
2424
- if [ -z "${TRAVIS_TAG}" ]; then npm run test:lib; fi
2525
- if [ -z "${TRAVIS_TAG}" ]; then npm run test:schematics; fi
26-
- if [ -z "${TRAVIS_TAG}" ] && [ "${TRAVIS_REPO_SLUG}" == "IgniteUI/igniteui-angular" ]; then cat ./coverage/lcov.info | coveralls; fi
26+
# - if [ -z "${TRAVIS_TAG}" ] && [ "${TRAVIS_REPO_SLUG}" == "IgniteUI/igniteui-angular" ]; then cat ./coverage/lcov.info | coveralls; fi
2727

2828
before_deploy:
2929
- npm run build:schematics

‎azure-pipelines.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ steps:
1818
env:
1919
NODE_OPTIONS: "--max_old_space_size=4096"
2020

21-
- script: cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js
22-
condition: and(succeeded(), eq(variables['system.teamProject'], 'igniteui-angular'))
23-
displayName: 'Code coverage @ Coveralls'
24-
env:
25-
COVERALLS_REPO_TOKEN: $(coveralls.repoToken)
21+
# - script: cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js
22+
# condition: and(succeeded(), eq(variables['system.teamProject'], 'igniteui-angular'))
23+
# displayName: 'Code coverage @ Coveralls'
24+
# env:
25+
# COVERALLS_REPO_TOKEN: $(coveralls.repoToken)
2626

2727
- script: npm run test:schematics
2828
displayName: 'Run migrations & schematics'
@@ -33,8 +33,8 @@ steps:
3333
testRunner: 'JUnit'
3434
testResultsFiles: '**/TESTS-*.xml'
3535

36-
- task: PublishCodeCoverageResults@1
37-
inputs:
38-
codeCoverageTool: Cobertura
39-
summaryFileLocation: '$(System.DefaultWorkingDirectory)/coverage/cobertura-coverage.xml'
40-
reportDirectory: '$(System.DefaultWorkingDirectory)/coverage'
36+
# - task: PublishCodeCoverageResults@1
37+
# inputs:
38+
# codeCoverageTool: Cobertura
39+
# summaryFileLocation: '$(System.DefaultWorkingDirectory)/coverage/cobertura-coverage.xml'
40+
# reportDirectory: '$(System.DefaultWorkingDirectory)/coverage'

‎projects/igniteui-angular/src/lib/banner/banner.component.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,13 @@ export class IgxBannerComponent implements IToggleView {
4747
@ViewChild('expansionPanel', { static: true })
4848
private _expansionPanel: IgxExpansionPanelComponent;
4949

50-
@ContentChild(IgxBannerActionsDirective, { static: true })
50+
@ContentChild(IgxBannerActionsDirective, { static: false })
5151
private _bannerActionTemplate: IgxBannerActionsDirective;
5252

5353
/**
5454
* @hidden
5555
*/
56-
@ContentChild(IgxIconComponent, { static: true })
56+
@ContentChild(IgxIconComponent, { static: false })
5757
public bannerIcon: IgxIconComponent;
5858

5959
/**

‎projects/igniteui-angular/src/lib/combo/combo.component.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ export class IgxComboComponent extends DisplayDensityBase implements IgxComboBas
243243
* </igx-combo>
244244
* ```
245245
*/
246-
@ContentChild(IgxComboItemDirective, { read: TemplateRef, static: true })
246+
@ContentChild(IgxComboItemDirective, { read: TemplateRef, static: false })
247247
public itemTemplate: TemplateRef<any> = null;
248248

249249
/**
@@ -266,7 +266,7 @@ export class IgxComboComponent extends DisplayDensityBase implements IgxComboBas
266266
* </igx-combo>
267267
* ```
268268
*/
269-
@ContentChild(IgxComboHeaderDirective, { read: TemplateRef, static: true })
269+
@ContentChild(IgxComboHeaderDirective, { read: TemplateRef, static: false })
270270
public headerTemplate: TemplateRef<any> = null;
271271

272272
/**
@@ -289,7 +289,7 @@ export class IgxComboComponent extends DisplayDensityBase implements IgxComboBas
289289
* </igx-combo>
290290
* ```
291291
*/
292-
@ContentChild(IgxComboFooterDirective, { read: TemplateRef, static: true })
292+
@ContentChild(IgxComboFooterDirective, { read: TemplateRef, static: false })
293293
public footerTemplate: TemplateRef<any> = null;
294294

295295
/**
@@ -310,7 +310,7 @@ export class IgxComboComponent extends DisplayDensityBase implements IgxComboBas
310310
* </igx-combo>
311311
* ```
312312
*/
313-
@ContentChild(IgxComboHeaderItemDirective, { read: TemplateRef, static: true })
313+
@ContentChild(IgxComboHeaderItemDirective, { read: TemplateRef, static: false })
314314
public headerItemTemplate: TemplateRef<any> = null;
315315

316316
/**
@@ -333,7 +333,7 @@ export class IgxComboComponent extends DisplayDensityBase implements IgxComboBas
333333
* </igx-combo>
334334
* ```
335335
*/
336-
@ContentChild(IgxComboAddItemDirective, { read: TemplateRef, static: true })
336+
@ContentChild(IgxComboAddItemDirective, { read: TemplateRef, static: false })
337337
public addItemTemplate: TemplateRef<any> = null;
338338

339339
/**
@@ -356,7 +356,7 @@ export class IgxComboComponent extends DisplayDensityBase implements IgxComboBas
356356
* </igx-combo>
357357
* ```
358358
*/
359-
@ContentChild(IgxComboEmptyDirective, { read: TemplateRef, static: true })
359+
@ContentChild(IgxComboEmptyDirective, { read: TemplateRef, static: false })
360360
public emptyTemplate: TemplateRef<any> = null;
361361

362362
/**
@@ -377,7 +377,7 @@ export class IgxComboComponent extends DisplayDensityBase implements IgxComboBas
377377
* </igx-combo>
378378
* ```
379379
*/
380-
@ContentChild(IgxComboToggleIconDirective, { read: TemplateRef, static: true })
380+
@ContentChild(IgxComboToggleIconDirective, { read: TemplateRef, static: false })
381381
public toggleIconTemplate: TemplateRef<any> = null;
382382

383383
/**
@@ -398,7 +398,7 @@ export class IgxComboComponent extends DisplayDensityBase implements IgxComboBas
398398
* </igx-combo>
399399
* ```
400400
*/
401-
@ContentChild(IgxComboClearIconDirective, { read: TemplateRef, static: true })
401+
@ContentChild(IgxComboClearIconDirective, { read: TemplateRef, static: false })
402402
public clearIconTemplate: TemplateRef<any> = null;
403403

404404
@ViewChild('primitive', { read: TemplateRef, static: true })

‎projects/igniteui-angular/src/lib/date-picker/date-picker.component.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -704,19 +704,19 @@ export class IgxDatePickerComponent implements IDatePicker, ControlValueAccessor
704704
/**
705705
*@hidden
706706
*/
707-
@ContentChild(IgxDatePickerTemplateDirective, { read: IgxDatePickerTemplateDirective, static: true })
707+
@ContentChild(IgxDatePickerTemplateDirective, { read: IgxDatePickerTemplateDirective, static: false })
708708
protected datePickerTemplateDirective: IgxDatePickerTemplateDirective;
709709

710710
/**
711711
*@hidden
712712
*/
713-
@ContentChild(IgxCalendarHeaderTemplateDirective, { read: IgxCalendarHeaderTemplateDirective, static: true })
713+
@ContentChild(IgxCalendarHeaderTemplateDirective, { read: IgxCalendarHeaderTemplateDirective, static: false })
714714
public headerTemplate: IgxCalendarHeaderTemplateDirective;
715715

716716
/**
717717
*@hidden
718718
*/
719-
@ContentChild(IgxCalendarSubheaderTemplateDirective, { read: IgxCalendarSubheaderTemplateDirective, static: true })
719+
@ContentChild(IgxCalendarSubheaderTemplateDirective, { read: IgxCalendarSubheaderTemplateDirective, static: false })
720720
public subheaderTemplate: IgxCalendarSubheaderTemplateDirective;
721721

722722
/**

‎projects/igniteui-angular/src/lib/grids/column.component.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1101,7 +1101,7 @@ export class IgxColumnComponent implements AfterContentInit {
11011101
/**
11021102
*@hidden
11031103
*/
1104-
@ContentChild(IgxCellTemplateDirective, { read: IgxCellTemplateDirective, static: true })
1104+
@ContentChild(IgxCellTemplateDirective, { read: IgxCellTemplateDirective, static: false })
11051105
protected cellTemplate: IgxCellTemplateDirective;
11061106
/**
11071107
*@hidden
@@ -1111,14 +1111,14 @@ export class IgxColumnComponent implements AfterContentInit {
11111111
/**
11121112
*@hidden
11131113
*/
1114-
@ContentChild(IgxCellEditorTemplateDirective, { read: IgxCellEditorTemplateDirective, static: true })
1114+
@ContentChild(IgxCellEditorTemplateDirective, { read: IgxCellEditorTemplateDirective, static: false })
11151115
protected editorTemplate: IgxCellEditorTemplateDirective;
11161116

11171117
protected _vIndex = NaN;
11181118
/**
11191119
*@hidden
11201120
*/
1121-
@ContentChild(IgxFilterCellTemplateDirective, { read: IgxFilterCellTemplateDirective, static: true })
1121+
@ContentChild(IgxFilterCellTemplateDirective, { read: IgxFilterCellTemplateDirective, static: false })
11221122
public filterCellTemplateDirective: IgxFilterCellTemplateDirective;
11231123

11241124
constructor(public gridAPI: GridBaseAPIService<IgxGridBaseComponent & IGridDataBindable>, public cdr: ChangeDetectorRef) { }

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1554,25 +1554,25 @@ export abstract class IgxGridBaseComponent extends DisplayDensityBase implements
15541554
/**
15551555
*@hidden
15561556
*/
1557-
@ContentChild(IgxExcelStyleSortingTemplateDirective, { read: IgxExcelStyleSortingTemplateDirective, static: true })
1557+
@ContentChild(IgxExcelStyleSortingTemplateDirective, { read: IgxExcelStyleSortingTemplateDirective, static: false })
15581558
public excelStyleSortingTemplateDirective: IgxExcelStyleSortingTemplateDirective;
15591559

15601560
/**
15611561
*@hidden
15621562
*/
1563-
@ContentChild(IgxExcelStyleMovingTemplateDirective, { read: IgxExcelStyleMovingTemplateDirective, static: true })
1563+
@ContentChild(IgxExcelStyleMovingTemplateDirective, { read: IgxExcelStyleMovingTemplateDirective, static: false })
15641564
public excelStyleMovingTemplateDirective: IgxExcelStyleMovingTemplateDirective;
15651565

15661566
/**
15671567
*@hidden
15681568
*/
1569-
@ContentChild(IgxExcelStyleHidingTemplateDirective, { read: IgxExcelStyleHidingTemplateDirective, static: true })
1569+
@ContentChild(IgxExcelStyleHidingTemplateDirective, { read: IgxExcelStyleHidingTemplateDirective, static: false })
15701570
public excelStyleHidingTemplateDirective: IgxExcelStyleHidingTemplateDirective;
15711571

15721572
/**
15731573
*@hidden
15741574
*/
1575-
@ContentChild(IgxExcelStylePinningTemplateDirective, { read: IgxExcelStylePinningTemplateDirective, static: true })
1575+
@ContentChild(IgxExcelStylePinningTemplateDirective, { read: IgxExcelStylePinningTemplateDirective, static: false })
15761576
public excelStylePinningTemplateDirective: IgxExcelStylePinningTemplateDirective;
15771577

15781578

@@ -1857,18 +1857,18 @@ export abstract class IgxGridBaseComponent extends DisplayDensityBase implements
18571857
/**
18581858
* @hidden
18591859
*/
1860-
@ContentChild(IgxRowEditTemplateDirective, { read: TemplateRef, static: true })
1860+
@ContentChild(IgxRowEditTemplateDirective, { read: TemplateRef, static: false })
18611861
public rowEditCustom: TemplateRef<any>;
18621862

18631863
/** @hidden */
18641864
public get rowEditContainer(): TemplateRef<any> {
18651865
return this.rowEditCustom ? this.rowEditCustom : this.defaultRowEditTemplate;
18661866
}
18671867
/** @hidden */
1868-
@ContentChild(IgxRowEditTextDirective, { read: TemplateRef, static: true })
1868+
@ContentChild(IgxRowEditTextDirective, { read: TemplateRef, static: false })
18691869
public rowEditText: TemplateRef<any>;
18701870
/** @hidden */
1871-
@ContentChild(IgxRowEditActionsDirective, { read: TemplateRef, static: true })
1871+
@ContentChild(IgxRowEditActionsDirective, { read: TemplateRef, static: false })
18721872
public rowEditActions: TemplateRef<any>;
18731873

18741874
/**

‎projects/igniteui-angular/src/lib/grids/grid/grid.component.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@ export class IgxGridComponent extends IgxGridBaseComponent implements IGridDataB
469469
/**
470470
* @hidden
471471
*/
472-
@ContentChild(IgxGroupByRowTemplateDirective, { read: IgxGroupByRowTemplateDirective, static: true })
472+
@ContentChild(IgxGroupByRowTemplateDirective, { read: IgxGroupByRowTemplateDirective, static: false })
473473
protected groupTemplate: IgxGroupByRowTemplateDirective;
474474

475475
/**
@@ -490,7 +490,7 @@ export class IgxGridComponent extends IgxGridBaseComponent implements IGridDataB
490490
* </igx-grid>
491491
* ```
492492
*/
493-
@ContentChild(IgxDragIndicatorIconDirective, { read: TemplateRef, static: true })
493+
@ContentChild(IgxDragIndicatorIconDirective, { read: TemplateRef, static: false })
494494
public dragIndicatorIconTemplate: TemplateRef<any> = null;
495495

496496
@ViewChildren(IgxGridGroupByRowComponent, { read: IgxGridGroupByRowComponent })

‎projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid.component.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ export class IgxTreeGridComponent extends IgxGridBaseComponent implements IGridD
300300
/**
301301
* @hidden
302302
*/
303-
@ContentChild(IgxRowLoadingIndicatorTemplateDirective, { read: IgxRowLoadingIndicatorTemplateDirective, static: true })
303+
@ContentChild(IgxRowLoadingIndicatorTemplateDirective, { read: IgxRowLoadingIndicatorTemplateDirective, static: false })
304304
protected rowLoadingTemplate: IgxRowLoadingIndicatorTemplateDirective;
305305

306306
/**
@@ -321,7 +321,7 @@ export class IgxTreeGridComponent extends IgxGridBaseComponent implements IGridD
321321
* </igx-grid>
322322
* ```
323323
*/
324-
@ContentChild(IgxDragIndicatorIconDirective, { read: TemplateRef, static: true })
324+
@ContentChild(IgxDragIndicatorIconDirective, { read: TemplateRef, static: false })
325325
public dragIndicatorIconTemplate: TemplateRef<any> = null;
326326

327327
/**

‎projects/igniteui-angular/src/lib/list/list.component.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ export class IgxListComponent extends IgxListBase {
172172
* ```
173173
* @memberof IgxListComponent
174174
*/
175-
@ContentChild(IgxEmptyListTemplateDirective, { read: IgxEmptyListTemplateDirective, static: true })
175+
@ContentChild(IgxEmptyListTemplateDirective, { read: IgxEmptyListTemplateDirective, static: false })
176176
public emptyListTemplate: IgxEmptyListTemplateDirective;
177177

178178
/**
@@ -182,7 +182,7 @@ export class IgxListComponent extends IgxListBase {
182182
* ```
183183
* @memberof IgxListComponent
184184
*/
185-
@ContentChild(IgxDataLoadingTemplateDirective, { read: IgxDataLoadingTemplateDirective, static: true })
185+
@ContentChild(IgxDataLoadingTemplateDirective, { read: IgxDataLoadingTemplateDirective, static: false })
186186
public dataLoadingTemplate: IgxDataLoadingTemplateDirective;
187187

188188
/**
@@ -196,7 +196,7 @@ export class IgxListComponent extends IgxListBase {
196196
* ```
197197
* @memberof IgxListComponent
198198
*/
199-
@ContentChild(IgxListItemLeftPanningTemplateDirective, { read: IgxListItemLeftPanningTemplateDirective, static: true })
199+
@ContentChild(IgxListItemLeftPanningTemplateDirective, { read: IgxListItemLeftPanningTemplateDirective, static: false })
200200
public listItemLeftPanningTemplate: IgxListItemLeftPanningTemplateDirective;
201201

202202
/**
@@ -210,7 +210,7 @@ export class IgxListComponent extends IgxListBase {
210210
* ```
211211
* @memberof IgxListComponent
212212
*/
213-
@ContentChild(IgxListItemRightPanningTemplateDirective, { read: IgxListItemRightPanningTemplateDirective, static: true })
213+
@ContentChild(IgxListItemRightPanningTemplateDirective, { read: IgxListItemRightPanningTemplateDirective, static: false })
214214
public listItemRightPanningTemplate: IgxListItemRightPanningTemplateDirective;
215215

216216
/**

0 commit comments

Comments
 (0)