feat(timepickerv2): more work on new timepicker, now absolute time mixed with relative time works, yesterday, this day last week, etc now work

This commit is contained in:
Torkel Ödegaard
2015-09-18 13:54:31 +02:00
parent cea13b1823
commit f5e6722826
5 changed files with 41 additions and 21 deletions

View File

@@ -145,7 +145,7 @@ function (angular, _, $, config, dateMath, moment) {
};
GraphiteDatasource.prototype.translateTime = function(date, roundUp) {
if (_.isString(date)) {
if (_.isString(date) && date.indexOf('/') === 0) {
if (date === 'now') {
return 'now';
}