mirror of
https://github.com/chartjs/Chart.js.git
synced 2024-10-06 04:09:08 +02:00
- Fix helper._calculatePadding return NaN; (#6857)
This commit is contained in:
parent
26ea9f0bbc
commit
0c18c9aaf8
2
.gitignore
vendored
2
.gitignore
vendored
@ -15,3 +15,5 @@ bower.json
|
|||||||
*.log
|
*.log
|
||||||
*.swp
|
*.swp
|
||||||
*.stackdump
|
*.stackdump
|
||||||
|
|
||||||
|
chart.js-*.tgz
|
||||||
|
@ -454,7 +454,7 @@ module.exports = function() {
|
|||||||
* @private
|
* @private
|
||||||
*/
|
*/
|
||||||
helpers._calculatePadding = function(container, padding, parentDimension) {
|
helpers._calculatePadding = function(container, padding, parentDimension) {
|
||||||
padding = helpers.getStyle(container, padding);
|
padding = helpers.getStyle(container, padding) || '0';
|
||||||
|
|
||||||
return padding.indexOf('%') > -1 ? parentDimension * parseInt(padding, 10) / 100 : parseInt(padding, 10);
|
return padding.indexOf('%') > -1 ? parentDimension * parseInt(padding, 10) / 100 : parseInt(padding, 10);
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user