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 #3615

Merged
merged 10 commits into from
Jan 16, 2019
+2 −2
Merged

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

Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
49a44f7
fix(filtering): chip not added while typing in JP on Edge #3599
SAndreeva Jan 14, 2019
e4d4892
fix(filtering): chip not added while typing in JP on Edge #3599
SAndreeva Jan 14, 2019
cb9d080
Merge branch 'master' of https://github.com/IgniteUI/igniteui-angular
SAndreeva Jan 15, 2019
8656628
Merge branch 'master' of https://github.com/IgniteUI/igniteui-angular
SAndreeva Jan 15, 2019
71ddae0
fix(filtering): chip creation while typing in JP on Edge #3599
SAndreeva Jan 15, 2019
97b6a07
Merge branch 'master' into SAndreeva/fix-bug-3599-m
SAndreeva Jan 15, 2019
1aefcb3
refactor(*): rewrite the senseless logic #3599
SAndreeva Jan 15, 2019
79c1a59
Merge branch 'master' into SAndreeva/fix-bug-3599-m
kdinev Jan 16, 2019
c375cf8
refactor(*): combine clauses to avoid code duplication #3599
SAndreeva Jan 16, 2019
aebabf2
Merge branch 'master' into SAndreeva/fix-bug-3599-m
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