@@ -466,7 +466,10 @@ module.exports = function(Chart) {
466466 helpers . getConstraintHeight = function ( domNode ) {
467467 return getConstraintDimension ( domNode , 'max-height' , 'clientHeight' ) ;
468468 } ;
469- helpers . calculatePadding = function ( container , padding , parentDimension ) {
469+ /**
470+ * @private
471+ */
472+ helpers . _calculatePadding = function ( container , padding , parentDimension ) {
470473 padding = helpers . getStyle ( container , padding ) ;
471474
472475 return padding . indexOf ( '%' ) > - 1 ? parentDimension / parseInt ( padding , 10 ) : parseInt ( padding , 10 ) ;
@@ -477,10 +480,11 @@ module.exports = function(Chart) {
477480 return domNode . clientWidth ;
478481 }
479482
480- var paddingLeft = helpers . calculatePadding ( container , 'padding-left' , container . clientWidth ) ;
481- var paddingRight = helpers . calculatePadding ( container , 'padding-right' , container . clientWidth ) ;
483+ var clientWidth = container . clientWidth ;
484+ var paddingLeft = helpers . _calculatePadding ( container , 'padding-left' , clientWidth ) ;
485+ var paddingRight = helpers . _calculatePadding ( container , 'padding-right' , clientWidth ) ;
482486
483- var w = container . clientWidth - paddingLeft - paddingRight ;
487+ var w = clientWidth - paddingLeft - paddingRight ;
484488 var cw = helpers . getConstraintWidth ( domNode ) ;
485489 return isNaN ( cw ) ? w : Math . min ( w , cw ) ;
486490 } ;
@@ -490,10 +494,11 @@ module.exports = function(Chart) {
490494 return domNode . clientHeight ;
491495 }
492496
493- var paddingTop = helpers . calculatePadding ( container , 'padding-top' , container . clientHeight ) ;
494- var paddingBottom = helpers . calculatePadding ( container , 'padding-bottom' , container . clientHeight ) ;
497+ var clientHeight = container . clientHeight ;
498+ var paddingTop = helpers . _calculatePadding ( container , 'padding-top' , clientHeight ) ;
499+ var paddingBottom = helpers . _calculatePadding ( container , 'padding-bottom' , clientHeight ) ;
495500
496- var h = container . clientHeight - paddingTop - paddingBottom ;
501+ var h = clientHeight - paddingTop - paddingBottom ;
497502 var ch = helpers . getConstraintHeight ( domNode ) ;
498503 return isNaN ( ch ) ? h : Math . min ( h , ch ) ;
499504 } ;
0 commit comments