IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Graph: Fixed issue with x-axis labels showing "MM/DD" after viewing dashboard with pie chart .

Browse Source
This commit is contained in:
Marcus Andersson
2020-05-06 16:05:00 +02:00
committed by GitHub
parent 6a4bb556a5
commit 8de6ef473f
5 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
public/vendor/flot/jquery.flot.time.js vendored
View File

@@ -15,8 +15,7 @@ API.txt for details.
timezone: null, // "browser" for local to the client or timezone for timezone-js
timeformat: null, // format string to use
twelveHourClock: false, // 12 or 24 time in time mode
monthNames: null, // list of names of months
timeFormatter: null // external formatter with timezone support
monthNames: null // list of names of months
}
};
@@ -30,6 +29,7 @@ API.txt for details.
// A subset of the Open Group's strftime format is supported.
function formatDate(d, fmt, monthNames, dayNames) {
if (typeof d.strftime == "function") {
return d.strftime(fmt);
}
@@ -356,15 +356,12 @@ API.txt for details.
};
axis.tickFormatter = function (v, axis) {
var d = dateGenerator(v, axis.options);
// first check global formatter
if (typeof opts.timeFormatter === "function") {
return opts.timeFormatter(d.getTime(), opts.timeformat);
}
// first check global format
// second check global format
if (opts.timeformat != null) {
if (opts.timeformat != null) {
return formatDate(d, opts.timeformat, opts.monthNames, opts.dayNames);
}
@@ -410,6 +407,7 @@ API.txt for details.
}
var rt = formatDate(d, fmt, opts.monthNames, opts.dayNames);
return rt;
};
}