Skip to content

Commit

Permalink
Merge pull request #3491 from IgniteUI/nalipiev/update-18
Browse files Browse the repository at this point in the history
update with official angular 18
  • Loading branch information
Lipata authored Jun 7, 2024
2 parents e4d6a5e + a7aa565 commit 2a7165f
Show file tree
Hide file tree
Showing 5 changed files with 56 additions and 57 deletions.
98 changes: 49 additions & 49 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,11 @@
"bootstrap": "5.3.2",
"file-saver": "^2.0.2",
"hammerjs": "^2.0.8",
"igniteui-angular": "^18.0.0-rc.1",
"igniteui-angular": "^18.0.0",
"igniteui-angular-charts": "^17.2.1",
"igniteui-angular-core": "^17.2.1",
"igniteui-angular-extras": "^18.0.1",
"igniteui-angular-i18n": "^18.0.0-rc.0",
"igniteui-angular-extras": "^18.0.4",
"igniteui-angular-i18n": "^18.0.0",
"igniteui-dockmanager": "^1.14.2",
"igniteui-live-editing": "^2.2.0",
"igniteui-webcomponents": "^4.7.0",
Expand All @@ -88,7 +88,7 @@
"@angular/cli": "^18.0.2",
"@angular/compiler-cli": "^18.0.1",
"@angular/language-service": "^18.0.1",
"@igniteui/angular-schematics": "18.0.1330-rc.0",
"@igniteui/angular-schematics": "18.0.1330",
"@juggle/resize-observer": "^3.3.1",
"@types/jasmine": "^5.1.2",
"@types/jasminewd2": "^2.0.13",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

<igx-combo #combo class="combo" [data]="lData" [displayKey]="'field'" [valueKey]="'field'"
placeholder="Location(s)" searchPlaceholder="Search..." [allowCustomValues]="customValues"
(addition)="handleAddition($event)" [filteringOptions]="{ filterable: filterable, caseSensitive: false }"
(addition)="handleAddition($event)" [filteringOptions]="{ filterable }"
[showSearchCaseIcon]="showSearchCaseIcon" [itemsMaxHeight]="255" [disabled]="disabled">
</igx-combo>

Expand Down
3 changes: 1 addition & 2 deletions src/app/lists/combo/combo-remote/combo-remote.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
(selectionChanging)="handleSelectionChanging($event)"
(closing)="onClosing()" (opened)="onOpened()"
(closed)="onClosed()"
placeholder="Location(s)"
[filteringOptions]="{ filterable: true, caseSensitive: false }">
placeholder="Location(s)">
</igx-combo>
<igx-toast #loadingToast></igx-toast>
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="control-wrapper">
<igx-combo [width]="'430px'" [data]="weaponsData" [displayKey]="'field'" [valueKey]="'field'" [overlaySettings]="{outlet: elem}"
[groupKey]="'weaponRange'" placeholder="Pick up two weapons" searchPlaceholder="Search..." [filteringOptions]="{ filterable: true, caseSensitive: false }"
[groupKey]="'weaponRange'" placeholder="Pick up two weapons" searchPlaceholder="Search..."
[itemsMaxHeight]="255" (selectionChanging)="setWeaponsLimit($event)">
</igx-combo>

Expand Down

0 comments on commit 2a7165f

Please sign in to comment.