You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ponymail.apache.org by se...@apache.org on 2017/01/18 10:56:22 UTC

incubator-ponymail git commit: ponymail.js creates/displays dates with no timezone - confusing

Repository: incubator-ponymail
Updated Branches:
  refs/heads/master 7f93ce505 -> b3391c52a


ponymail.js creates/displays dates with no timezone - confusing

This fixes #286

Project: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/commit/b3391c52
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/tree/b3391c52
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/diff/b3391c52

Branch: refs/heads/master
Commit: b3391c52a32499c39aae392c5ffed586324bf815
Parents: 7f93ce5
Author: Sebb <se...@apache.org>
Authored: Wed Jan 18 10:56:10 2017 +0000
Committer: Sebb <se...@apache.org>
Committed: Wed Jan 18 10:56:10 2017 +0000

----------------------------------------------------------------------
 CHANGELOG.md                              |  1 +
 site/js/dev/ponymail_email_displays.js    |  4 +-
 site/js/dev/ponymail_email_tools.js       | 30 ++++-----------
 site/js/dev/ponymail_listview_flat.js     |  3 +-
 site/js/dev/ponymail_listview_threaded.js |  3 +-
 site/js/dev/ponymail_listview_tree.js     |  9 ++---
 site/js/dev/ponymail_pagebuilder.js       |  2 +-
 site/js/ponymail.js                       | 51 ++++++++------------------
 8 files changed, 31 insertions(+), 72 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/b3391c52/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index adfe800..8473d63 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -125,6 +125,7 @@
 - default to medium ID generator (#343)
 - scroll/scan is not supported in ES 5.x (#344)
 - GUI does not report maxResult truncation correctly (#335)
+- ponymail.js creates/displays dates with no timezone - confusing (#286)
 
 ## CHANGES in 0.9b:
 

http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/b3391c52/site/js/dev/ponymail_email_displays.js
----------------------------------------------------------------------
diff --git a/site/js/dev/ponymail_email_displays.js b/site/js/dev/ponymail_email_displays.js
index 1267c99..913f453 100644
--- a/site/js/dev/ponymail_email_displays.js
+++ b/site/js/dev/ponymail_email_displays.js
@@ -63,7 +63,6 @@ function displayEmail(json, id, level) {
     var id_sanitised = id.toString().replace(/@<.+>/, "")
     var thread = document.getElementById('thread_' + id_sanitised)
     if (thread) {
-        json.date = formatDate(new Date(json.epoch*1000), true)
         // transform <foo.bar.tld> to foo@bar.tld
         var lid = json.list.replace(/[<>]/g, "").replace(/^([^.]+)\./, "$1@")
         
@@ -99,7 +98,7 @@ function displayEmail(json, id, level) {
         if (prefs.theme && prefs.theme == "social") {
             
             // Date and sender formatting
-            var sdate = new Date(json.epoch*1000).toLocaleString('en-US',  { weekday: 'long', year: 'numeric', month: 'long', day: 'numeric', hour: 'numeric', minute: 'numeric' })
+            var sdate = new Date(json.epoch*1000).toLocaleString('en-US',  { timeZone: 'UTC', weekday: 'long', year: 'numeric', month: 'long', day: 'numeric', hour: 'numeric', minute: 'numeric' })
             var fr = json['from'].replace(/"/g, "").replace(/<.+>/, "").replace(/</g, "&lt;")
             thread.style.background = estyle
             
@@ -232,7 +231,6 @@ function displaySingleEmail(json, id) {
             thread.innerHTML = "<h4>Error: " + json.error + "</h4>"
             return;
         }
-        json.date = new Date(json.epoch*1000).toLocaleString();
         var fields = ['From', 'To', 'Subject', 'Date']
         var fields = ['From', 'To', 'CC', 'Subject', 'Date']
         for (var i in fields) {

http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/b3391c52/site/js/dev/ponymail_email_tools.js
----------------------------------------------------------------------
diff --git a/site/js/dev/ponymail_email_tools.js b/site/js/dev/ponymail_email_tools.js
index 51a4c78..b8148f7 100644
--- a/site/js/dev/ponymail_email_tools.js
+++ b/site/js/dev/ponymail_email_tools.js
@@ -192,30 +192,16 @@ Number.prototype.pad = function(size) {
 }
 
 
-// formatDate: Return a date as YYYY-MM-DD HH:mm
-function formatDate(date, dtz){
-    tz = new Date(date).getTimezoneOffset()
-    ttz = 0
-    var plus = "-"
-    if (tz < 0) {
-        plus = "+"
-        tz = Math.abs(tz)
-    }
-    while (tz >= 60) {
-        tz-= 60;
-        ttz++
-    }
-    ttz = (ttz*100) + tz
-    while (String(ttz).length < 4) ttz = "0" + String(ttz)
-    return (date.getFullYear() + "-" +
-        (date.getMonth()+1).pad(2) + "-" +
-        date.getDate().pad(2) + " " +
-        date.getHours().pad(2) + ":" +
-        date.getMinutes().pad(2)) +
-        (dtz ? " (" + plus + ttz + ")" : "")
+// formatEpoch: Return an epoch value (seconds) as YYYY-MM-DD HH:mm using UTC
+function formatEpochUTC(epoch){
+    var date = new Date(epoch*1000)
+    return (date.getUTCFullYear() + "-" +
+        (date.getUTCMonth()+1).pad(2) + "-" +
+        date.getUTCDate().pad(2) + " " +
+        date.getUTCHours().pad(2) + ":" +
+        date.getUTCMinutes().pad(2))
 }
 
-
 // hex -> base 36 conversion for creating shorter permalinks
 function shortenID(mid) {
     var id1 = parseInt(mid.substr(0,9), 16).toString(36)

http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/b3391c52/site/js/dev/ponymail_listview_flat.js
----------------------------------------------------------------------
diff --git a/site/js/dev/ponymail_listview_flat.js b/site/js/dev/ponymail_listview_flat.js
index 9a93f81..27d66f7 100644
--- a/site/js/dev/ponymail_listview_flat.js
+++ b/site/js/dev/ponymail_listview_flat.js
@@ -107,8 +107,7 @@ function loadList_flat(mjson, limit, start, deep) {
             }
         }
         // Get date and format it to YYYY-MM-DD HH:mm
-        mdate = new Date(eml.epoch * 1000)
-        mdate = formatDate(mdate)
+        mdate = formatEpochUTC(eml.epoch)
         
         // format subject and from to weed out <> tags and <fo...@bar.tld> addresses
         var subject = eml.subject.replace(/</mg, "&lt;")

http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/b3391c52/site/js/dev/ponymail_listview_threaded.js
----------------------------------------------------------------------
diff --git a/site/js/dev/ponymail_listview_threaded.js b/site/js/dev/ponymail_listview_threaded.js
index 9e401bb..457a9ba 100644
--- a/site/js/dev/ponymail_listview_threaded.js
+++ b/site/js/dev/ponymail_listview_threaded.js
@@ -132,9 +132,8 @@ function loadList_threaded(mjson, limit, start, deep) {
         }
         // escape subject
         var subject = eml.subject.replace(/</mg, "&lt;")
-        var mdate = new Date(latest * 1000)
         
-        mdate = formatDate(mdate)
+        var mdate = formatEpochUTC(latest)
         var pds = people > 1 ? "visible" : "hidden"
         
         // style based on view before or not??

http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/b3391c52/site/js/dev/ponymail_listview_tree.js
----------------------------------------------------------------------
diff --git a/site/js/dev/ponymail_listview_tree.js b/site/js/dev/ponymail_listview_tree.js
index a3792ce..87a539f 100644
--- a/site/js/dev/ponymail_listview_tree.js
+++ b/site/js/dev/ponymail_listview_tree.js
@@ -105,9 +105,8 @@ function loadList_treeview(mjson, limit, start, deep) {
             }
         }
         var subject = eml.subject.replace(/</mg, "&lt;")
-        var mdate = new Date(latest * 1000)
         
-        mdate = formatDate(mdate)
+        var mdate = formatEpochUTC(latest)
         var pds = people > 1 ? "visible" : "hidden"
         
         // style based on view before or not??
@@ -308,9 +307,8 @@ function buildTreeview(nesting, list, obj, pbigger) {
             }
         }
         var subject = eml.subject.replace(/</mg, "&lt;")
-        var mdate = new Date(latest * 1000)
         
-        mdate = formatDate(mdate)
+        var mdate = formatEpochUTC(latest)
         var pds = people > 1 ? "visible" : "hidden"
         
         ld = 'default'
@@ -332,8 +330,7 @@ function buildTreeview(nesting, list, obj, pbigger) {
                 eml.subject = eml.subject.substr(0, 75) + "..."
             }
         }
-        mdate = new Date(eml.epoch * 1000)
-        mdate = formatDate(mdate)
+        mdate = formatEpochUTC(eml.epoch)
             
         var subject = eml.subject.replace(/</mg, "&lt;")
         var from = eml.from.replace(/<.*>/, "").length > 0 ? eml.from.replace(/<.*>/, "") : eml.from.replace(/[<>]+/g, "")

http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/b3391c52/site/js/dev/ponymail_pagebuilder.js
----------------------------------------------------------------------
diff --git a/site/js/dev/ponymail_pagebuilder.js b/site/js/dev/ponymail_pagebuilder.js
index b9f3c39..e25e5c8 100644
--- a/site/js/dev/ponymail_pagebuilder.js
+++ b/site/js/dev/ponymail_pagebuilder.js
@@ -105,7 +105,7 @@ function buildCalendar(json) {
 function dailyStats(json) {
     var days = {}
     for (var i in json) {
-        var day = new Date(json[i].epoch * 1000).getDate()
+        var day = new Date(json[i].epoch * 1000).getUTCDate()
         days[day] = days[day] ? (days[day] + 1) : 1
     }
     var stats = []

http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/b3391c52/site/js/ponymail.js
----------------------------------------------------------------------
diff --git a/site/js/ponymail.js b/site/js/ponymail.js
index fea831e..b1e8040 100644
--- a/site/js/ponymail.js
+++ b/site/js/ponymail.js
@@ -1424,7 +1424,6 @@ function displayEmail(json, id, level) {
     var id_sanitised = id.toString().replace(/@<.+>/, "")
     var thread = document.getElementById('thread_' + id_sanitised)
     if (thread) {
-        json.date = formatDate(new Date(json.epoch*1000), true)
         // transform <foo.bar.tld> to foo@bar.tld
         var lid = json.list.replace(/[<>]/g, "").replace(/^([^.]+)\./, "$1@")
         
@@ -1460,7 +1459,7 @@ function displayEmail(json, id, level) {
         if (prefs.theme && prefs.theme == "social") {
             
             // Date and sender formatting
-            var sdate = new Date(json.epoch*1000).toLocaleString('en-US',  { weekday: 'long', year: 'numeric', month: 'long', day: 'numeric', hour: 'numeric', minute: 'numeric' })
+            var sdate = new Date(json.epoch*1000).toLocaleString('en-US',  { timeZone: 'UTC', weekday: 'long', year: 'numeric', month: 'long', day: 'numeric', hour: 'numeric', minute: 'numeric' })
             var fr = json['from'].replace(/"/g, "").replace(/<.+>/, "").replace(/</g, "&lt;")
             thread.style.background = estyle
             
@@ -1593,7 +1592,6 @@ function displaySingleEmail(json, id) {
             thread.innerHTML = "<h4>Error: " + json.error + "</h4>"
             return;
         }
-        json.date = new Date(json.epoch*1000).toLocaleString();
         var fields = ['From', 'To', 'Subject', 'Date']
         var fields = ['From', 'To', 'CC', 'Subject', 'Date']
         for (var i in fields) {
@@ -2064,30 +2062,16 @@ Number.prototype.pad = function(size) {
 }
 
 
-// formatDate: Return a date as YYYY-MM-DD HH:mm
-function formatDate(date, dtz){
-    tz = new Date(date).getTimezoneOffset()
-    ttz = 0
-    var plus = "-"
-    if (tz < 0) {
-        plus = "+"
-        tz = Math.abs(tz)
-    }
-    while (tz >= 60) {
-        tz-= 60;
-        ttz++
-    }
-    ttz = (ttz*100) + tz
-    while (String(ttz).length < 4) ttz = "0" + String(ttz)
-    return (date.getFullYear() + "-" +
-        (date.getMonth()+1).pad(2) + "-" +
-        date.getDate().pad(2) + " " +
-        date.getHours().pad(2) + ":" +
-        date.getMinutes().pad(2)) +
-        (dtz ? " (" + plus + ttz + ")" : "")
+// formatEpoch: Return an epoch value (seconds) as YYYY-MM-DD HH:mm using UTC
+function formatEpochUTC(epoch){
+    var date = new Date(epoch*1000)
+    return (date.getUTCFullYear() + "-" +
+        (date.getUTCMonth()+1).pad(2) + "-" +
+        date.getUTCDate().pad(2) + " " +
+        date.getUTCHours().pad(2) + ":" +
+        date.getUTCMinutes().pad(2))
 }
 
-
 // hex -> base 36 conversion for creating shorter permalinks
 function shortenID(mid) {
     var id1 = parseInt(mid.substr(0,9), 16).toString(36)
@@ -2427,8 +2411,7 @@ function loadList_flat(mjson, limit, start, deep) {
             }
         }
         // Get date and format it to YYYY-MM-DD HH:mm
-        mdate = new Date(eml.epoch * 1000)
-        mdate = formatDate(mdate)
+        mdate = formatEpochUTC(eml.epoch)
         
         // format subject and from to weed out <> tags and <fo...@bar.tld> addresses
         var subject = eml.subject.replace(/</mg, "&lt;")
@@ -2707,9 +2690,8 @@ function loadList_threaded(mjson, limit, start, deep) {
         }
         // escape subject
         var subject = eml.subject.replace(/</mg, "&lt;")
-        var mdate = new Date(latest * 1000)
         
-        mdate = formatDate(mdate)
+        var mdate = formatEpochUTC(latest)
         var pds = people > 1 ? "visible" : "hidden"
         
         // style based on view before or not??
@@ -2963,9 +2945,8 @@ function loadList_treeview(mjson, limit, start, deep) {
             }
         }
         var subject = eml.subject.replace(/</mg, "&lt;")
-        var mdate = new Date(latest * 1000)
         
-        mdate = formatDate(mdate)
+        var mdate = formatEpochUTC(latest)
         var pds = people > 1 ? "visible" : "hidden"
         
         // style based on view before or not??
@@ -3166,9 +3147,8 @@ function buildTreeview(nesting, list, obj, pbigger) {
             }
         }
         var subject = eml.subject.replace(/</mg, "&lt;")
-        var mdate = new Date(latest * 1000)
         
-        mdate = formatDate(mdate)
+        var mdate = formatEpochUTC(latest)
         var pds = people > 1 ? "visible" : "hidden"
         
         ld = 'default'
@@ -3190,8 +3170,7 @@ function buildTreeview(nesting, list, obj, pbigger) {
                 eml.subject = eml.subject.substr(0, 75) + "..."
             }
         }
-        mdate = new Date(eml.epoch * 1000)
-        mdate = formatDate(mdate)
+        mdate = formatEpochUTC(eml.epoch)
             
         var subject = eml.subject.replace(/</mg, "&lt;")
         var from = eml.from.replace(/<.*>/, "").length > 0 ? eml.from.replace(/<.*>/, "") : eml.from.replace(/[<>]+/g, "")
@@ -3722,7 +3701,7 @@ function buildCalendar(json) {
 function dailyStats(json) {
     var days = {}
     for (var i in json) {
-        var day = new Date(json[i].epoch * 1000).getDate()
+        var day = new Date(json[i].epoch * 1000).getUTCDate()
         days[day] = days[day] ? (days[day] + 1) : 1
     }
     var stats = []