From b32f23d7f02dbed48254fdca10611d61c4ebaf73 Mon Sep 17 00:00:00 2001 From: Brad Davidson Date: Fri, 20 Jan 2017 00:28:53 -0800 Subject: [PATCH] moment-timezone is a replacement for moment, not an add-on. Don't require both. Doing it this way does not make any of the TZ functionality available to moment. Fixes: ``` TypeError: display_timestamp.tz is not a function at addParsedTimestamp (logtrail.bundle.js?v=14588:1) at updateEventView (logtrail.bundle.js?v=14588:1) at logtrail.bundle.js?v=14588:1 at processQueue (commons.bundle.js?v=14588:38) at commons.bundle.js?v=14588:38 at Scope.$eval (commons.bundle.js?v=14588:39) at Scope.$digest (commons.bundle.js?v=14588:39) at Scope.$apply (commons.bundle.js?v=14588:39) at done (commons.bundle.js?v=14588:37) at completeRequest (commons.bundle.js?v=14588:37) ``` --- public/app.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/public/app.js b/public/app.js index d41bf66..0ad80bb 100644 --- a/public/app.js +++ b/public/app.js @@ -3,8 +3,7 @@ var routes = require('ui/routes'); var modules = require('ui/modules'); var angular = require('angular'); var sugarDate = require('sugar-date'); -var moment = require('moment'); -var momentTimezone = require('moment-timezone'); +var moment = require('moment-timezone'); require('plugins/logtrail/css/main.css');