Skip to content

Commit 017fa71

Browse files
authored
Merge branch '10.1.x' into dpetev/combo-model-validation-10.1
2 parents b0f1ae3 + 0a70abd commit 017fa71

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/app/action-strip/action-strip.sample.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ export class ActionStripSampleComponent implements OnInit {
1313
public result: string;
1414
public isVisible = false;
1515
private counter = 0;
16-
public comfortable = DisplayDensity.comfortable;
17-
public cosy = DisplayDensity.cosy;
18-
public compact = DisplayDensity.compact;
16+
public comfortable: DisplayDensity = DisplayDensity.comfortable;
17+
public cosy: DisplayDensity = DisplayDensity.cosy;
18+
public compact: DisplayDensity = DisplayDensity.compact;
1919
public displayDensity = this.comfortable;
2020

2121
data: any[];

src/app/combo/combo.sample.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ export class ComboSampleComponent implements OnInit, AfterViewInit {
5353
private customItemTemplate;
5454
private initialItemTemplate: TemplateRef<any> = null;
5555

56-
comfortable = DisplayDensity.comfortable;
57-
cosy = DisplayDensity.cosy;
58-
compact = DisplayDensity.compact;
56+
public comfortable: DisplayDensity = DisplayDensity.comfortable;
57+
public cosy: DisplayDensity = DisplayDensity.cosy;
58+
public compact: DisplayDensity = DisplayDensity.compact;
5959

6060
public genres = [];
6161
public user: FormGroup;

0 commit comments

Comments
 (0)