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.

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

Calculating grid's width when initialized with % based on its offsetWidth in IE11(master) #3097

Merged
merged 22 commits into from
Nov 27, 2018
Merged
Changes from 3 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
5d26070
fix(grid): Calculating grid's width based on its offsetWidth in IE11…
Nov 21, 2018
aea8451
Merge branch 'master' into hPopov/fix-bug-3095/fix-grids-width-IE11-m…
zdrawku Nov 22, 2018
461e0b7
fix(igxOverlay): take element, not child, in get overlay info, #3131
ViktorSlavov Nov 23, 2018
a0ece54
test(igxOverlay): add tests for rendering components, #3131
ViktorSlavov Nov 23, 2018
b494db1
Merge branch 'master' into VSlavov/overlay-show-datepicker
ViktorSlavov Nov 23, 2018
0c46036
test(igxOverlay): fix failing tests, call CDR after component attache…
ViktorSlavov Nov 23, 2018
d68c35c
Merge branch 'master' into VSlavov/overlay-show-datepicker
ViktorSlavov Nov 26, 2018
a045cd2
Merge branch 'master' into VSlavov/overlay-show-datepicker
ViktorSlavov Nov 26, 2018
1f1757d
Merge branch 'master' into VSlavov/overlay-show-datepicker
ViktorSlavov Nov 26, 2018
5547db4
Merge branch 'master' into hPopov/fix-bug-3095/fix-grids-width-IE11-m…
zdrawku Nov 26, 2018
bd96bb9
Merge branch 'master' into VSlavov/overlay-show-datepicker
kdinev Nov 26, 2018
9524688
docs(*): update CHANGELOG.md with 6.2.1 changes
damyanpetev Nov 26, 2018
6566e2f
docs(*): Add dark theme to 7.0.0 changelog
damyanpetev Nov 26, 2018
31ae2d5
Merge branch 'master' into dpetev/changelog-update-7
damyanpetev Nov 26, 2018
76ce2cb
Merge branch 'master' into VSlavov/overlay-show-datepicker
ViktorSlavov Nov 27, 2018
6d6d861
Merge branch 'master' into dpetev/changelog-update-7
kdinev Nov 27, 2018
9718f10
Merge pull request #3133 from IgniteUI/VSlavov/overlay-show-datepicker
kdinev Nov 27, 2018
4342ff7
Merge branch 'master' into hPopov/fix-bug-3095/fix-grids-width-IE11-m…
kdinev Nov 27, 2018
8ffd463
Merge pull request #3158 from IgniteUI/dpetev/changelog-update-7
kdinev Nov 27, 2018
1916325
Merge branch 'master' into hPopov/fix-bug-3095/fix-grids-width-IE11-m…
kdinev Nov 27, 2018
bc776b1
Merge branch '7.0.x' into hPopov/fix-bug-3095/fix-grids-width-IE11-ma…
kdinev Nov 27, 2018
40afad4
Merge branch '7.0.x' into hPopov/fix-bug-3095/fix-grids-width-IE11-ma…
kdinev Nov 27, 2018
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
Original file line number Diff line number Diff line change
Expand Up @@ -3489,7 +3489,10 @@ export abstract class IgxGridBaseComponent extends DisplayDensityBase implements

if (this._width && this._width.indexOf('%') !== -1) {
/* width in %*/
const width = parseInt(computed.getPropertyValue('width'), 10);
const width = computed.getPropertyValue('width').indexOf('%') === -1 ?
parseInt(computed.getPropertyValue('width'), 10) :
this.document.getElementById(this.nativeElement.id).offsetWidth;

if (Number.isFinite(width) && width !== this.calcWidth) {
this.calcWidth = width;

Expand Down