From: etimberg Date: Mon, 8 Feb 2016 00:23:54 +0000 (-0500) Subject: Check to ensure dom node exists when calculating size. Fixes #919 X-Git-Tag: v1.1.0~17 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf0b550a80b3be984084dbcf7ae3b3f24be87e66;p=thirdparty%2FChart.js.git Check to ensure dom node exists when calculating size. Fixes #919 --- diff --git a/src/Chart.Core.js b/src/Chart.Core.js index 3a21f0abd..143244a3d 100755 --- a/src/Chart.Core.js +++ b/src/Chart.Core.js @@ -839,13 +839,13 @@ var container = domNode.parentNode, padding = parseInt(getStyle(container, 'padding-left')) + parseInt(getStyle(container, 'padding-right')); // TODO = check cross browser stuff with this. - return container.clientWidth - padding; + return container ? container.clientWidth - padding : 0; }, getMaximumHeight = helpers.getMaximumHeight = function(domNode){ var container = domNode.parentNode, padding = parseInt(getStyle(container, 'padding-bottom')) + parseInt(getStyle(container, 'padding-top')); // TODO = check cross browser stuff with this. - return container.clientHeight - padding; + return container ? container.clientHeight - padding : 0; }, getStyle = helpers.getStyle = function (el, property) { return el.currentStyle ?