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

Jump to bottom

Update to fix responsive chart size in IE11 when parent container has… #4620

Merged
merged 13 commits into from Apr 22, 2018
Merged

Update to fix responsive chart size in IE11 when parent container has… #4620

Changes from 4 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
ca9b1ae
Update to fix responsive chart size in IE11 when parent container has…
andi-b Aug 7, 2017
3d4fe3a
Updated code formating
andi-b Aug 8, 2017
5528a61
Updated code formatting
andi-b Aug 8, 2017
26a56d7
Updated spaces to tabs
andi-b Aug 8, 2017
f31af0e
Added calculatePadding function
andi-b Jan 16, 2018
52cdcce
Reduced code further
andi-b Jan 16, 2018
083175b
Updated to inline if statement
andi-b Jan 16, 2018
4bfe92d
Testing script added for calculatePadding function
andi-b Feb 7, 2018
23b863c
Merge branch 'master' into patch-1
andi-b Feb 7, 2018
cd00af3
Update code formatting
andi-b Feb 7, 2018
fedda5b
Added variables and made function private
andi-b Feb 9, 2018
ec79652
Removed calls to private function
andi-b Feb 9, 2018
76d0c0c
Removed unused variable
andi-b Feb 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
34 changes: 30 additions & 4 deletions src/core/core.helpers.js
View file
Open in desktop
Expand Up @@ -504,8 +504,21 @@ module.exports = function(Chart) {
return domNode.clientWidth;
}

var paddingLeft = parseInt(helpers.getStyle(container, 'padding-left'), 10);
var paddingRight = parseInt(helpers.getStyle(container, 'padding-right'), 10);
var paddingLeft = helpers.getStyle(container, 'padding-left');
var paddingRight = helpers.getStyle(container, 'padding-right');

if (paddingLeft.indexOf('%') > -1) {
paddingLeft = container.clientWidth / parseInt(paddingLeft, 10);
} else {
paddingLeft = parseInt(paddingLeft, 10);
}

if (paddingRight.indexOf('%') > -1) {
paddingRight = container.clientWidth / parseInt(paddingRight, 10);
} else {
paddingRight = parseInt(paddingRight, 10);
}

var w = container.clientWidth - paddingLeft - paddingRight;
var cw = helpers.getConstraintWidth(domNode);
return isNaN(cw) ? w : Math.min(w, cw);
Expand All @@ -516,8 +529,21 @@ module.exports = function(Chart) {
return domNode.clientHeight;
}

var paddingTop = parseInt(helpers.getStyle(container, 'padding-top'), 10);
var paddingBottom = parseInt(helpers.getStyle(container, 'padding-bottom'), 10);
var paddingTop = helpers.getStyle(container, 'padding-top');
var paddingBottom = helpers.getStyle(container, 'padding-bottom');

if (paddingTop.indexOf('%') > -1) {
paddingTop = container.clientHeight / parseInt(paddingTop, 10);
} else {
paddingTop = parseInt(paddingTop, 10);
}

if (paddingBottom.indexOf('%') > -1) {
paddingBottom = container.clientHeight / parseInt(paddingBottom, 10);
} else {
paddingBottom = parseInt(paddingBottom, 10);
}

var h = container.clientHeight - paddingTop - paddingBottom;
var ch = helpers.getConstraintHeight(domNode);
return isNaN(ch) ? h : Math.min(h, ch);
Expand Down