@cryptotaxi247 / netdata-1 / commits / 89764c95d

allow hiding dygraph axis - fix broken sparklines

Costa Tsaousis (ktsaou) committed May 3, 2018 at 09:15 UTC 89764c95d8b1f45a73b189a441bbed1e888d9aa8
2 files changed +7 -4
web/dashboard.js
+6 -3
@@ -6337,6 +6337,7 @@ var NETDATA = window.NETDATA || {};
6337 :false;
6338
6339 state.tmp.dygraph_include_zero = NETDATA.dataAttribute(state.element, 'dygraph-includezero', (state.tmp.dygraph_chart_type === 'stacked'));
6340 + var drawAxis = NETDATA.dataAttributeBoolean(state.element, 'dygraph-drawaxis', true);
6341
6342 state.tmp.dygraph_options = {
6343 colors: NETDATA.dataAttribute(state.element, 'dygraph-colors', state.chartColors()),
@@ -6400,7 +6401,7 @@ var NETDATA = window.NETDATA || {};
6401 ),
6402 stackedGraph: NETDATA.dataAttribute(state.element, 'dygraph-stackedgraph', (state.tmp.dygraph_chart_type === 'stacked')),
6403 stackedGraphNaNFill: NETDATA.dataAttribute(state.element, 'dygraph-stackedgraphnanfill', 'none'),
6403 - drawAxis: NETDATA.dataAttributeBoolean(state.element, 'dygraph-drawaxis', true),
6404 + drawAxis: drawAxis,
6405 axisLabelFontSize: NETDATA.dataAttribute(state.element, 'dygraph-axislabelfontsize', 10),
6406 axisLineColor: NETDATA.dataAttribute(state.element, 'dygraph-axislinecolor', NETDATA.themes.current.axis),
6407 axisLineWidth: NETDATA.dataAttribute(state.element, 'dygraph-axislinewidth', 1.0),
@@ -6424,7 +6425,7 @@ var NETDATA = window.NETDATA || {};
6425 pixelsPerLabel: NETDATA.dataAttribute(state.element, 'dygraph-xpixelsperlabel', 50),
6426 ticker: Dygraph.dateTicker,
6427 axisLabelWidth: NETDATA.dataAttribute(state.element, 'dygraph-xaxislabelwidth', 60),
6427 - drawAxis: NETDATA.dataAttributeBoolean(state.element, 'dygraph-drawxaxis', true),
6428 + drawAxis: NETDATA.dataAttributeBoolean(state.element, 'dygraph-drawxaxis', drawAxis),
6429 axisLabelFormatter: function (d, gran) {
6430 void(gran);
6431 return NETDATA.dateTime.xAxisTimeString(d);
@@ -6434,7 +6435,7 @@ var NETDATA = window.NETDATA || {};
6435 logscale: (NETDATA.chartLibraries.dygraph.isLogScale(state) === true)?true:undefined,
6436 pixelsPerLabel: NETDATA.dataAttribute(state.element, 'dygraph-ypixelsperlabel', 15),
6437 axisLabelWidth: NETDATA.dataAttribute(state.element, 'dygraph-yaxislabelwidth', 50),
6437 - drawAxis: NETDATA.dataAttributeBoolean(state.element, 'dygraph-drawyaxis', true),
6438 + drawAxis: NETDATA.dataAttributeBoolean(state.element, 'dygraph-drawyaxis', drawAxis),
6439 axisLabelFormatter: function (y) {
6440
6441 // unfortunately, we have to call this every single time
@@ -7012,6 +7013,8 @@ var NETDATA = window.NETDATA || {};
7013 state.tmp.dygraph_options.labelsSeparateLines = true;
7014 state.tmp.dygraph_options.rightGap = 0;
7015 state.tmp.dygraph_options.yRangePad = 1;
7016 + state.tmp.dygraph_options.axes.x.drawAxis = false;
7017 + state.tmp.dygraph_options.axes.y.drawAxis = false;
7018 }
7019
7020 if(smooth === true) {
web/index.html
+1 -1
@@ -5725,6 +5725,6 @@
5725 </div>
5726 </div>
5727 <div id="hiddenDownloadLinks" style="display: none;" hidden></div>
5728 - <script type="text/javascript" src="dashboard.js?v20180326-2"></script>
5728 + <script type="text/javascript" src="dashboard.js?v20180503-1"></script>
5729 </body>
5730 </html>