public/mailtrain
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

use moment to detect timezones

Browse source
This commit is contained in:
Andris Reinman 2016-04-29 19:13:51 +03:00
parent ae8a79ea07
commit 6e514e1ccc
11 changed files with 74 additions and 142 deletions
Download patch file Download diff file Expand all files Collapse all files

10
routes/lists.js
View file

@ -18,7 +18,7 @@ let uploads = multer({
});
let csvparse = require('csv-parse');
let fs = require('fs');
let tzlist = require('../lib/tz').list;
let moment = require('moment-timezone');
router.all('/*', (req, res, next) => {
if (!req.user) {
@ -279,14 +279,14 @@ router.get('/subscription/:id/add', passport.csrfProtection, (req, res) => {
data.customFields = fields.getRow(fieldList, data, false, true);
data.useEditor = true;
data.timezones = Object.keys(tzlist).map(tz => {
data.timezones = moment.tz.names().map(tz => {
let selected = false;
if (tz.toLowerCase().trim() === (data.tz || 'UTC').toLowerCase().trim()) {
selected = true;
}
return {
key: tz,
value: tzlist[tz],
value: tz,
selected
};
});
@ -322,7 +322,7 @@ router.get('/subscription/:id/edit/:cid', passport.csrfProtection, (req, res) =>
subscription.isSubscribed = subscription.status === 1;
let tzfound = false;
subscription.timezones = Object.keys(tzlist).map(tz => {
subscription.timezones = moment.tz.names().map(tz => {
let selected = false;
if (tz.toLowerCase().trim() === (subscription.tz || '').toLowerCase().trim()) {
selected = true;
@ -330,7 +330,7 @@ router.get('/subscription/:id/edit/:cid', passport.csrfProtection, (req, res) =>
}
return {
key: tz,
value: tzlist[tz],
value: tz,
selected
};
});