From 264e29b75fa658c070bf2a503be70255bad7f6ad Mon Sep 17 00:00:00 2001 From: Juan Thomassie Date: Tue, 19 Aug 2014 14:02:12 -0500 Subject: [PATCH] fixed how x_axis checks widths to apply rotate --- .../components/vislib/components/XAxis/_x_axis.js | 14 +++++--------- src/kibana/components/vislib/modules/YAxis.js | 1 - src/kibana/components/vislib/vis.js | 2 -- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/src/kibana/components/vislib/components/XAxis/_x_axis.js b/src/kibana/components/vislib/components/XAxis/_x_axis.js index d9ca405eb1ef..e9416d0e3df8 100644 --- a/src/kibana/components/vislib/components/XAxis/_x_axis.js +++ b/src/kibana/components/vislib/components/XAxis/_x_axis.js @@ -31,17 +31,13 @@ define(function (require) { // check widths to apply rotate var bbox = selection.selectAll('.tick text').node().getBBox(); var tickN = selection.selectAll('.tick text')[0].length; - var ticksLength = bbox.width * 1.05 * tickN; - if (ticksLength > width) { - self.rotateAxisLabels(selection); - } - var lbls = selection.selectAll('.tick text')[0]; - console.log('ticks n', tickN, lbls); + var maxW = width / tickN; for (var i = 0; i < tickN; i++) { - console.log(i, lbls[i]); - //if (bbox[i]) { - //} + if (lbls[i].clientWidth > maxW) { + self.rotateAxisLabels(selection); + break; + } } // check widths to apply filter diff --git a/src/kibana/components/vislib/modules/YAxis.js b/src/kibana/components/vislib/modules/YAxis.js index 0659fd8241a1..20a8519f664b 100644 --- a/src/kibana/components/vislib/modules/YAxis.js +++ b/src/kibana/components/vislib/modules/YAxis.js @@ -25,7 +25,6 @@ define(function (require) { }; YAxis.prototype.appendSVG = function (self) { - console.log(self); return function (selection) { selection.each(function () { var div = d3.select(this); diff --git a/src/kibana/components/vislib/vis.js b/src/kibana/components/vislib/vis.js index ae10ab34dfd9..e1409fe8ae7e 100644 --- a/src/kibana/components/vislib/vis.js +++ b/src/kibana/components/vislib/vis.js @@ -103,8 +103,6 @@ define(function (require) { } }); - console.log(this); - this.checkSize('.chart'); };