Skip to content

Commit 9d10a9c

Browse files
authored
Merge branch 'vnext' into didimmova/add-tailwind-sample-vnext
2 parents 6b0de6f + afd3a60 commit 9d10a9c

File tree

4 files changed

+8
-23
lines changed

4 files changed

+8
-23
lines changed

angular.json

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,7 @@
3939
"node_modules"
4040
]
4141
},
42-
"browser": "src/main.ts",
43-
"server": "src/main.server.ts",
44-
"outputMode": "static",
45-
"ssr": {
46-
"entry": "src/server.ts"
47-
}
42+
"browser": "src/main.ts"
4843
},
4944
"configurations": {
5045
"production": {
@@ -164,12 +159,7 @@
164159
]
165160
},
166161
"preserveSymlinks": true,
167-
"browser": "projects/app-lob/src/main.ts",
168-
"server": "projects/app-lob/src/main.server.ts",
169-
"outputMode": "static",
170-
"ssr": {
171-
"entry": "projects/app-lob/src/server.ts"
172-
}
162+
"browser": "projects/app-lob/src/main.ts"
173163
},
174164
"configurations": {
175165
"production": {
@@ -294,12 +284,7 @@
294284
"node_modules"
295285
]
296286
},
297-
"browser": "projects/app-crm/src/main.ts",
298-
"server": "projects/app-crm/src/main.server.ts",
299-
"outputMode": "static",
300-
"ssr": {
301-
"entry": "projects/app-crm/src/server.ts"
302-
}
287+
"browser": "projects/app-crm/src/main.ts"
303288
},
304289
"configurations": {
305290
"production": {

src/app/app.routes.server.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ export const serverRoutes: ServerRoute[] = [
103103
},
104104
{
105105
path: 'samples/grid/**',
106-
renderMode: RenderMode.Prerender // TODO: Fails with Prerender
106+
renderMode: RenderMode.Client // TODO: Fails with Prerender
107107
},
108108
{
109109
path: '**',
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11

22
<igx-combo #combo class="combo" [data]="lData" [displayKey]="'field'" [valueKey]="'field'"
33
placeholder="Location(s)" searchPlaceholder="Search..." [allowCustomValues]="customValues"
4-
(addition)="handleAddition($event)" [filteringOptions]="{ filterable }"
4+
(addition)="handleAddition($event)" [disableFiltering]="disableFiltering"
55
[showSearchCaseIcon]="showSearchCaseIcon" [itemsMaxHeight]="255" [disabled]="disabled">
66
</igx-combo>
77

8-
<igx-switch [(ngModel)]="filterable">Enable Filtering</igx-switch><br />
9-
<igx-switch [disabled]="!filterable" [(ngModel)]="showSearchCaseIcon">Show Case-sensitive Icon</igx-switch><br />
8+
<igx-switch [(ngModel)]="disableFiltering">Disable Filtering</igx-switch><br />
9+
<igx-switch [disabled]="disableFiltering" [(ngModel)]="showSearchCaseIcon">Show Case-sensitive Icon</igx-switch><br />
1010
<igx-switch [(ngModel)]="customValues">Allow Custom Values</igx-switch><br />
1111
<igx-switch (change)="enableGroups($event)">Enable Grouping</igx-switch><br />
1212
<igx-switch [(ngModel)]="disabled">Disable Combo</igx-switch>

src/app/lists/combo/combo-features/combo-features.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export class ComboFeaturesComponent implements OnInit{
1414
// eslint-disable-next-line @typescript-eslint/naming-convention
1515
public GROUP_KEY = 'region';
1616
public lData: any[];
17-
public filterable = true;
17+
public disableFiltering = false;
1818
public showSearchCaseIcon = false;
1919
public customValues = true;
2020
public disabled = false;

0 commit comments

Comments
 (0)