Skip to content

Commit

Permalink
Padding without ticks can be undefined.
Browse files Browse the repository at this point in the history
  • Loading branch information
alexanderby committed Jan 10, 2017
1 parent aff6c02 commit 35b524b
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/spec-transform-calc-size.js
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ var fitModelStrategies = {

var g = specRef.unit.guide;
var {xFacetCount, yFacetCount} = getFacetCount(specRef);
var ticksLPad = (g.padding.l - g.paddingNoTicks.l);
var ticksBPad = (g.padding.b - g.paddingNoTicks.b);
var ticksLPad = (g.paddingNoTicks ? (g.padding.l - g.paddingNoTicks.l) : 0);
var ticksBPad = (g.paddingNoTicks ? (g.padding.b - g.paddingNoTicks.b) : 0);
var shouldHideXAxis = (
(g.paddingNoTicks &&
(srcSize.height - ticksBPad < specRef.settings.minChartHeight)) ||
Expand Down Expand Up @@ -143,7 +143,7 @@ var fitModelStrategies = {
'fit-width'(srcSize, calcSize, specRef, tryOptimizeSpec) {

var g = specRef.unit.guide;
var ticksLPad = (g.padding.l - g.paddingNoTicks.l);
var ticksLPad = (g.paddingNoTicks ? (g.padding.l - g.paddingNoTicks.l) : 0);
if ((g.paddingNoTicks &&
(srcSize.width - ticksLPad < specRef.settings.minChartWidth)) ||
(getFacetCount(specRef).xFacetCount * specRef.settings.minFacetWidth + ticksLPad > srcSize.width)
Expand All @@ -163,7 +163,7 @@ var fitModelStrategies = {
'fit-height'(srcSize, calcSize, specRef) {

var g = specRef.unit.guide;
var ticksBPad = (g.padding.b - g.paddingNoTicks.b);
var ticksBPad = (g.paddingNoTicks ? (g.padding.b - g.paddingNoTicks.b) : 0);
if ((g.paddingNoTicks &&
(srcSize.height - ticksBPad < specRef.settings.minChartHeight)) ||
(getFacetCount(specRef).yFacetCount * specRef.settings.minFacetHeight + ticksBPad > srcSize.height)
Expand Down

0 comments on commit 35b524b

Please sign in to comment.