IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-01-09 23:53:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

feat(units): refactoring #5404

Browse Source
This commit is contained in:
Torkel Ödegaard 2016-06-21 21:08:07 +02:00
parent a7a5f36b49
commit 24a54cd95b
1 changed files with 2 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
public/app/core/utils/kbn.js
View File

@ -581,37 +581,10 @@ function($, _, moment) {
}
};
// Date and time
kbn.toDateTime = function(size, timeScale) {
var datetime;
if (timeScale === 's') {
datetime = moment.unix(size);
} else {
datetime = moment(size);
}
return datetime;
};
kbn.toDuration = function(size, timeScale) {
return moment.duration(size, timeScale);
};
kbn.valueFormats.dtms = function(size) {
return kbn.toDateTime(size, 'ms').format('YYYY-MM-DD hh:mm:ss');
};
kbn.valueFormats.dts = function(size) {
return kbn.toDateTime(size, 's').format('YYYY-MM-DD hh:mm:ss');
};
kbn.valueFormats.dtfromnowms = function(size) {
return kbn.toDateTime(size, 'ms').fromNow(true);
};
kbn.valueFormats.dtfromnows = function(size) {
return kbn.toDateTime(size, 's').fromNow(true);
};
kbn.valueFormats.dtdurationms = function(size) {
return kbn.toDuration(size, 'ms').humanize();
};
@ -656,17 +629,8 @@ function($, _, moment) {
{text: 'minutes (m)', value: 'm' },
{text: 'hours (h)', value: 'h' },
{text: 'days (d)', value: 'd' },
]
},
{
text: 'date and time',
submenu: [
{text: 'date and time (ms)', value: 'dtms'},
{text: 'date and time (s)', value: 'dts' },
{text: 'from now (ms)', value: 'dtfromnowms' },
{text: 'from now (s)', value: 'dtfromnows' },
{text: 'duration (ms)', value: 'dtdurationms' },
{text: 'duration (s)', value: 'dtdurations' }
{text: 'duration (ms)', value: 'dtdurationms' },
{text: 'duration (s)', value: 'dtdurations' }
]
},
{