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

Merge remote-tracking branch 'origin/master' into develop

Browse Source
This commit is contained in:
Torkel Ödegaard
2015-03-05 11:17:39 +01:00
parent af9dc4c277 1ac9b50f21
commit 58034c24ce
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/panels/graph/graph.js
View File

@@ -370,10 +370,11 @@ function (angular, $, kbn, moment, _, GraphTooltip) {
if (min && max && ticks) {
var secPerTick = ((max - min) / ticks) / 1000;
console.log('secPerTick', secPerTick);
if (secPerTick <= 45) {
return "%H:%M:%S";
}
if (secPerTick <= 3600) {
if (secPerTick <= 7200) {
return "%H:%M";
}
if (secPerTick <= 80000) {