From 06f4b017d6178ceb1ea122227889220885f41a01 Mon Sep 17 00:00:00 2001 From: Rick Briganti Date: Mon, 27 Jan 2014 14:01:36 -0500 Subject: [PATCH 1/2] fixed missing module for 'moment' and jslint missing semi colon --- package.json | 1 + src/app/services/graphite/graphiteSrv.js | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 2f73392eb65..5ef829d1cc0 100644 --- a/package.json +++ b/package.json @@ -10,6 +10,7 @@ "url": "http://github.com/torkelo/grafana.git" }, "devDependencies": { + "moment": "~2.5.1", "rjs-build-analysis": "0.0.3", "grunt": "~0.4.0", "grunt-ngmin": "0.0.3", diff --git a/src/app/services/graphite/graphiteSrv.js b/src/app/services/graphite/graphiteSrv.js index 65a9279de92..7ba1424747f 100644 --- a/src/app/services/graphite/graphiteSrv.js +++ b/src/app/services/graphite/graphiteSrv.js @@ -9,6 +9,7 @@ function (angular, _, $, config, kbn) { 'use strict'; var module = angular.module('kibana.services'); + var moment = require('moment'); module.service('graphiteSrv', function($http, $q, filterSrv) { @@ -55,7 +56,7 @@ function (angular, _, $, config, kbn) { date = moment.utc(date).local(); if (config.timezoneOffset) { - date = date.zone(config.timezoneOffset) + date = date.zone(config.timezoneOffset); } return date.format('HH:mm_YYYYMMDD'); From 49e131ce21209e31d87af6f12b60cc1a206d9cdb Mon Sep 17 00:00:00 2001 From: Rick Briganti Date: Mon, 27 Jan 2014 17:30:28 -0500 Subject: [PATCH 2/2] updated how moment is included and removed moment as a dep since it is included --- package.json | 1 - src/app/services/graphite/graphiteSrv.js | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 5ef829d1cc0..2f73392eb65 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,6 @@ "url": "http://github.com/torkelo/grafana.git" }, "devDependencies": { - "moment": "~2.5.1", "rjs-build-analysis": "0.0.3", "grunt": "~0.4.0", "grunt-ngmin": "0.0.3", diff --git a/src/app/services/graphite/graphiteSrv.js b/src/app/services/graphite/graphiteSrv.js index 7ba1424747f..a5145bf1b38 100644 --- a/src/app/services/graphite/graphiteSrv.js +++ b/src/app/services/graphite/graphiteSrv.js @@ -3,13 +3,13 @@ define([ 'underscore', 'jquery', 'config', - 'kbn' + 'kbn', + 'moment' ], -function (angular, _, $, config, kbn) { +function (angular, _, $, config, kbn, moment) { 'use strict'; var module = angular.module('kibana.services'); - var moment = require('moment'); module.service('graphiteSrv', function($http, $q, filterSrv) {