Skip to content

Commit

Permalink
Correct calculation of padding in percent (#5846)
Browse files Browse the repository at this point in the history
  • Loading branch information
chtheis authored and simonbrunel committed Nov 21, 2018
1 parent bc494e0 commit b68341d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/core/core.helpers.js
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,7 @@ module.exports = function() {
helpers._calculatePadding = function(container, padding, parentDimension) {
padding = helpers.getStyle(container, padding);

return padding.indexOf('%') > -1 ? parentDimension / parseInt(padding, 10) : parseInt(padding, 10);
return padding.indexOf('%') > -1 ? parentDimension * parseInt(padding, 10) / 100 : parseInt(padding, 10);
};
/**
* @private
Expand Down
6 changes: 3 additions & 3 deletions test/specs/core.helpers.tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -790,7 +790,7 @@ describe('Core helper tests', function() {
div.style.height = '300px';
document.body.appendChild(div);

// Inner DIV to have 10% padding of parent
// Inner DIV to have 5% padding of parent
var innerDiv = document.createElement('div');

div.appendChild(innerDiv);
Expand All @@ -802,8 +802,8 @@ describe('Core helper tests', function() {
expect(helpers.getMaximumWidth(canvas)).toBe(300);

// test with percentage
innerDiv.style.padding = '10%';
expect(helpers.getMaximumWidth(canvas)).toBe(240);
innerDiv.style.padding = '5%';
expect(helpers.getMaximumWidth(canvas)).toBe(270);

// test with pixels
innerDiv.style.padding = '10px';
Expand Down

0 comments on commit b68341d

Please sign in to comment.