From: Chris Porter Date: Sun, 19 Oct 2008 01:13:09 +0000 (+0100) Subject: Fix idle time display. X-Git-Url: https://jfr.im/git/irc/quakenet/qwebirc.git/commitdiff_plain/8408e8345f9d8e22f894b0b3f93be88e61cb2888 Fix idle time display. --- diff --git a/js/irc/irclib.js b/js/irc/irclib.js index 1bd3db0..4f178b2 100644 --- a/js/irc/irclib.js +++ b/js/irc/irclib.js @@ -55,16 +55,12 @@ String.prototype.hostToHost = function() { } qwebirc.irc.IRCTimestamp = function(d) { - function pad(x) { - x = "" + x; - if(x.length == 1) - return "0" + x; - return x - } - - return "[" + pad(d.getHours()) + ":" + pad(d.getMinutes()) + "]"; + return "[" + qwebirc.util.pad(d.getHours()) + ":" + qwebirc.util.pad(d.getMinutes()) + "]"; } qwebirc.irc.IRCDate = function(d) { + var pad = qwebirc.util.pad; + + alert(qwebirc.util.DaysOfWeek[d.getDay()]); return qwebirc.util.DaysOfWeek[d.getDay()] + " " + qwebirc.util.MonthsOfYear[d.getMonth()] + " " + pad(d.getDate()) + " " + pad(d.getHours()) + ":" + pad(d.getMinutes()) + ":" + pad(d.getSeconds()) + " " + d.getFullYear(); } diff --git a/js/jslib.js b/js/jslib.js index 72ce15c..dd828df 100644 --- a/js/jslib.js +++ b/js/jslib.js @@ -107,9 +107,16 @@ qwebirc.util.NBSPCreate = function(text, element) { qwebirc.util.longtoduration = function(l) { var seconds = l % 60; - var minutes = l / 60; - var hours = minutes / 60; - var days = hours / 24; + var minutes = Math.round(l / 60); + var hours = Math.round(minutes / 60); + var days = Math.round(hours / 24); return days + " days " + hours + " hours " + minutes + " minutes " + seconds + " seconds"; } + +qwebirc.util.pad = function(x) { + x = "" + x; + if(x.length == 1) + return "0" + x; + return x +}