- Fix helper._calculatePadding return NaN; (#6857)

diff --git a/.gitignore b/.gitignore
index 6a066b92f38b0ab6d79d1dddaabbe8b8cab5dd7a..9fbcff2ef8a71696a53bd3433193eef307483137 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,5 @@ bower.json
 *.log
 *.swp
 *.stackdump
+
+chart.js-*.tgz

diff --git a/src/core/core.helpers.js b/src/core/core.helpers.js
index 33c94799e155c70ac0315cfa9d973cf767320db3..20d4cfaba48357db39fffc947faf87f02b58cb47 100644 (file)
--- a/src/core/core.helpers.js
+++ b/src/core/core.helpers.js
@@ -454,7 +454,7 @@ module.exports = function() {
         * @private
         */
        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);
        };