Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(filtering): chips creation while typing in JP on Edge #3616

Merged
merged 8 commits into from
Jan 16, 2019
Merged

fix(filtering): chips creation while typing in JP on Edge #3616

Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b7f96d7
fix(filtering): chip creation while typing in JP on Edge #3599
SAndreeva Jan 15, 2019
b7fc26e
refactor(*): rewrite the senseless logic #3599
SAndreeva Jan 15, 2019
bfe96a8
Merge branch '7.1.x' into SAndreeva/fix-bug-3599
SAndreeva Jan 15, 2019
d1017b3
Merge branch 'SAndreeva/fix-bug-3599' of https://github.com/IgniteUI/…
SAndreeva Jan 15, 2019
c6d4fff
Merge branch '7.1.x' into SAndreeva/fix-bug-3599
kdinev Jan 16, 2019
0095e8b
Merge branch '7.1.x' into SAndreeva/fix-bug-3599
SAndreeva Jan 16, 2019
1d8feac
refactor(*): combine clauses to avoid code duplication #3599
SAndreeva Jan 16, 2019
ce12b2a
Merge branch '7.1.x' into SAndreeva/fix-bug-3599
kdinev Jan 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions projects/igniteui-angular/src/lib/grids/filtering/grid-filtering-row.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import { IChipSelectEventArgs, IBaseChipEventArgs, IgxChipsAreaComponent, IgxChi
import { ExpressionUI } from './grid-filtering.service';
import { IgxDropDownItemComponent } from '../../drop-down/drop-down-item.component';
import { IgxFilteringService } from './grid-filtering.service';
import { KEYS } from '../../core/utils';
import { KEYS, isEdge } from '../../core/utils';
import { AbsoluteScrollStrategy } from '../../services/overlay/scroll';

/**
Expand Down Expand Up @@ -286,7 +286,9 @@ export class IgxGridFilteringRowComponent implements AfterViewInit {
public onInput(eventArgs) {
// The 'iskeyPressed' flag is needed for a case in IE, because the input event is fired on focus and for some reason,
// when you have a japanese character as a placeholder, on init the value here is empty string .
if (this.isKeyPressed) {
if (isEdge()) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can combine the two if clauses as their blocks are the same.

this.value = eventArgs.target.value;
} else if (this.isKeyPressed) {
this.value = eventArgs.target.value;
}
}
Expand Down