From 14ad9902da35b72db37c4dc0e79ba69b29570075 Mon Sep 17 00:00:00 2001 From: ppisljar Date: Wed, 21 Dec 2016 20:38:00 +0100 Subject: [PATCH] fixing timelion yaxis min setting Backports PR #9428 **Commit 1:** fixing timelion yaxis min setting * Original sha: 9a3c8e86b92f9eb28faa0af9013d5eeaac353aab * Authored by ppisljar on 2016-12-09T15:58:29Z --- .../timelion/server/series_functions/__tests__/yaxis.js | 4 ++-- src/core_plugins/timelion/server/series_functions/yaxis.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core_plugins/timelion/server/series_functions/__tests__/yaxis.js b/src/core_plugins/timelion/server/series_functions/__tests__/yaxis.js index 45d0105e3ff52..d11e1f5b335b0 100644 --- a/src/core_plugins/timelion/server/series_functions/__tests__/yaxis.js +++ b/src/core_plugins/timelion/server/series_functions/__tests__/yaxis.js @@ -45,10 +45,10 @@ describe(filename, () => { ]); }); - it('sets the minimum (default: 0)', () => { + it('sets the minimum (default: no min)', () => { return Promise.all([ invoke(fn, [seriesList, 1, null]).then((r) => { - expect(r.output.list[0]._global.yaxes[0].min).to.equal(0); + expect(r.output.list[0]._global.yaxes[0].min).to.equal(null); }), invoke(fn, [seriesList, 2, 10]).then((r) => { expect(r.output.list[0]._global.yaxes[1].min).to.equal(10); diff --git a/src/core_plugins/timelion/server/series_functions/yaxis.js b/src/core_plugins/timelion/server/series_functions/yaxis.js index 30bece32c57bc..aa6a5409434de 100644 --- a/src/core_plugins/timelion/server/series_functions/yaxis.js +++ b/src/core_plugins/timelion/server/series_functions/yaxis.js @@ -51,7 +51,7 @@ module.exports = new Chainable('yaxis', { var myAxis = eachSeries._global.yaxes[yaxis - 1]; myAxis.position = position || (yaxis % 2 ? 'left' : 'right'); - myAxis.min = min == null ? 0 : min; + myAxis.min = min; myAxis.max = max; myAxis.axisLabelFontSizePixels = 11; myAxis.axisLabel = label;