fixed an issue where units and date were randomly not rendered on charts
Costa Tsaousis (ktsaou) committed
Feb 5, 2017 at 20:35 UTC
54b96cdd74c1130b1e27e3f404fdfe0f47c50eb2
2 files changed
+27
-14
web/dashboard.js
+26
-13
@@ -2329,33 +2329,44 @@ var NETDATA = window.NETDATA || {};
2329
}
2330
};
2331
2332
+ this.legendSetDateLast = {
2333
+ ms: 0,
2334
+ date: undefined,
2335
+ time: undefined
2336
+ };
2337
+
2338
this.legendSetDate = function(ms) {
2339
if(typeof ms !== 'number') {
2340
this.legendShowUndefined();
2341
return;
2342
}
2343
2338
- var d = new Date(ms);
2344
+ if(this.legendSetDateLast.ms !== ms) {
2345
+ var d = new Date(ms);
2346
+ this.legendSetDateLast.ms = ms;
2347
+ this.legendSetDateLast.date = d.toLocaleDateString();
2348
+ this.legendSetDateLast.time = d.toLocaleTimeString();
2349
+ }
2350
2340
- if(this.element_legend_childs.title_date)
2341
- this.__legendSetDateString(d.toLocaleDateString());
2351
+ if(this.element_legend_childs.title_date !== null)
2352
+ this.__legendSetDateString(this.legendSetDateLast.date);
2353
2343
- if(this.element_legend_childs.title_time)
2344
- this.__legendSetTimeString(d.toLocaleTimeString());
2354
+ if(this.element_legend_childs.title_time !== null)
2355
+ this.__legendSetTimeString(this.legendSetDateLast.time);
2356
2346
- if(this.element_legend_childs.title_units)
2357
+ if(this.element_legend_childs.title_units !== null)
2358
this.__legendSetUnitsString(this.units)
2359
};
2360
2361
this.legendShowUndefined = function() {
2351
- if(this.element_legend_childs.title_date)
2352
- this.__legendSetDateString(' ');
2362
+ if(this.element_legend_childs.title_date !== null)
2363
+ this.__legendSetDateString(' haha ');
2364
2354
- if(this.element_legend_childs.title_time)
2365
+ if(this.element_legend_childs.title_time !== null)
2366
this.__legendSetTimeString(this.chart.name);
2367
2357
- if(this.element_legend_childs.title_units)
2358
- this.__legendSetUnitsString(' ');
2368
+ if(this.element_legend_childs.title_units !== null)
2369
+ this.__legendSetUnitsString(' haha2 ');
2370
2371
if(this.data && this.element_legend_childs.series !== null) {
2372
var labels = this.data.dimension_names;
@@ -2363,8 +2374,7 @@ var NETDATA = window.NETDATA || {};
2374
while(i--) {
2375
var label = labels[i];
2376
2366
- if(typeof label === 'undefined') continue;
2367
- if(typeof this.element_legend_childs.series[label] === 'undefined') continue;
2377
+ if(typeof label === 'undefined' || typeof this.element_legend_childs.series[label] === 'undefined') continue;
2378
this.legendSetLabelValue(label, null);
2379
}
2380
}
@@ -2776,16 +2786,19 @@ var NETDATA = window.NETDATA || {};
2786
2787
this.element_legend_childs.title_date.className += " netdata-legend-title-date";
2788
this.element_legend.appendChild(this.element_legend_childs.title_date);
2789
+ this.__last_shown_legend_date = undefined;
2790
2791
this.element_legend.appendChild(document.createElement('br'));
2792
2793
this.element_legend_childs.title_time.className += " netdata-legend-title-time";
2794
this.element_legend.appendChild(this.element_legend_childs.title_time);
2795
+ this.__last_shown_legend_time = undefined;
2796
2797
this.element_legend.appendChild(document.createElement('br'));
2798
2799
this.element_legend_childs.title_units.className += " netdata-legend-title-units";
2800
this.element_legend.appendChild(this.element_legend_childs.title_units);
2801
+ this.__last_shown_legend_units = undefined;
2802
2803
this.element_legend.appendChild(document.createElement('br'));
2804
web/index.html
+1
-1
@@ -3312,4 +3312,4 @@
3312
</div>
3313
</body>
3314
</html>
3315
-<script type="text/javascript" src="dashboard.js?v20170205-4"></script>
3315
+<script type="text/javascript" src="dashboard.js?v20170205-10"></script>