Просмотр исходного кода

style(graph.tooltip): moves checkdate logic inside each method.

I find it easier to follow and checkdate didnt do much.
carl bergquist 10 лет назад
Родитель
Сommit
2cb83cf19d
1 измененных файлов с 2 добавлено и 12 удалено
  1. 2 12
      public/app/features/dashboard/dashboardSrv.js

+ 2 - 12
public/app/features/dashboard/dashboardSrv.js

@@ -214,9 +214,7 @@ function (angular, $, _, moment) {
     };
 
     p.formatDate = function(date, format) {
-
-      date = this.checkDate(date);
-
+      date = moment.isMoment(date) ? date : moment(date);
       format = format || 'YYYY-MM-DD HH:mm:ss';
 
       return this.timezone === 'browser' ?
@@ -225,21 +223,13 @@ function (angular, $, _, moment) {
     };
 
     p.getRelativeTime = function(date) {
-
-      date = this.checkDate(date);
+      date = moment.isMoment(date) ? date : moment(date);
 
       return this.timezone === 'browser' ?
         moment(date).fromNow() :
         moment.utc(date).fromNow();
     };
 
-    p.checkDate = function(date) {
-      if (!moment.isMoment(date)) {
-        date = moment(date);
-      }
-      return date;
-    };
-
     p._updateSchema = function(old) {
       var i, j, k;
       var oldVersion = this.schemaVersion;