Merge branch 'fix/elastic#1962' of https://github.com/stormpython/kibana

into fix/elastic#1962
jthomassie · Jan 19, 2015 · a2d892f · a2d892f
2 parents 5ceebf1 + efb5858
commit a2d892f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/src/kibana/components/vislib/lib/handler/types/line.js b/src/kibana/components/vislib/lib/handler/types/line.js
@@ -30,6 +30,7 @@ define(function (require) {
         }),
         yAxis: new YAxis({
           el   : vis.el,
+          yMin : data.getYMinValue(),
           yMax : data.getYMaxValue(),
           _attr: vis._attr
         })

diff --git a/src/kibana/components/vislib/vis.js b/src/kibana/components/vislib/vis.js
@@ -26,7 +26,7 @@ define(function (require) {
       this.el = $el.get ? $el.get(0) : $el;
       this.ChartClass = chartTypes[config.type];
       this._attr = _.defaults(config || {}, {
-        defaultYMin: false
+        defaultYMin: true
       });
       this.eventTypes = {
         enabled: []

diff --git a/test/unit/specs/vislib/lib/y_axis.js b/test/unit/specs/vislib/lib/y_axis.js
@@ -137,9 +137,12 @@ define(function (require) {
       yAxisDiv = el.append('div')
         .attr('class', 'y-axis-div');
 
-      dataObj = new Data(data, {});
+      dataObj = new Data(data, {
+        defaultYMin: true
+      });
       yAxis = new YAxis({
         el: node,
+        yMin: dataObj.getYMinValue(),
         yMax: dataObj.getYMaxValue(),
         _attr: {
           margin: { top: 0, right: 0, bottom: 0, left: 0 }