Merge pull request grafana#5389 from grafana/revert-5383-issue-4747

bergquist · web-flow · commit d8be2f1ecc69 · 2016-06-20T11:02:43.000+02:00
Revert "issue grafana#4747 - add date and time units to singlestat panel."
diff --git a/public/app/core/utils/kbn.js b/public/app/core/utils/kbn.js
@@ -1,9 +1,8 @@
 define([
   'jquery',
   'lodash',
-  'moment'
 ],
-function($, _, moment) {
+function($, _) {
   'use strict';
 
   var kbn = {};
@@ -581,20 +580,6 @@ function($, _, moment) {
     }
   };
 
-  // Date and time
-  kbn.toDateTime = function(size, timeScale) {
-    var datetime = moment(size * timeScale);
-    return datetime.format('YYYY-MM-DD hh:mm:ss');
-  };
-
-  kbn.valueFormats.datems = function(size) {
-    return kbn.toDateTime(size, 1000);
-  };
-
-  kbn.valueFormats.dates = function(size) {
-    return kbn.toDateTime(size, 1);
-  };
-
   ///// FORMAT MENU /////
 
   kbn.getUnitFormats = function() {
@@ -633,13 +618,6 @@ function($, _, moment) {
           {text: 'days (d)',          value: 'd'    },
         ]
       },
-      {
-        text: 'date and time',
-        submenu: [
-          {text: 'date (ms)', value: 'datems'},
-          {text: 'date (s)',  value: 'dates' }
-        ]
-      },
       {
         text: 'data',
         submenu: [
