From d332635a4eaea80d6729cb8e231c5d6554846b70 Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Sun, 6 Oct 2013 00:17:13 -0400 Subject: [PATCH] Fix message time display --- index.html | 2 +- js/websockets.js | 4 ++-- js/weechat-protocol.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/index.html b/index.html index e0880c0..6594bc9 100644 --- a/index.html +++ b/index.html @@ -50,7 +50,7 @@ {{ content.full_name }}
- {{ bufferline.timestamp | date: 'h:mm:ss'}} + {{ bufferline.date | date: 'H:mm:ss'}} {{ part.text }} diff --git a/js/websockets.js b/js/websockets.js index 29933f3..d89748a 100644 --- a/js/websockets.js +++ b/js/websockets.js @@ -224,7 +224,7 @@ weechat.factory('handlers', ['$rootScope', 'colors', 'pluginManager', function($ var buffer = message['objects'][0]['content'][0]['buffer']; - var timestamp = parseInt(message['objects'][0]['content'][0]['date']) * 1e3; + var date = message['objects'][0]['content'][0]['date']; var text = colors.parse(message['objects'][0]['content'][0]['message']); var content = parseLineAddedTextElements(message); var additionalContent = pluginManager.contentForMessage(text[0]['text']); @@ -232,7 +232,7 @@ weechat.factory('handlers', ['$rootScope', 'colors', 'pluginManager', function($ return { metadata: additionalContent, content: content, - timestamp: timestamp, + date: date, buffer: buffer } diff --git a/js/weechat-protocol.js b/js/weechat-protocol.js index dd4ad5a..362763e 100644 --- a/js/weechat-protocol.js +++ b/js/weechat-protocol.js @@ -455,7 +455,7 @@ WeeChatProtocol.prototype = { _getTime: function() { var str = this._getStrNumber(); - return new Date(parseInt(str)); + return new Date(parseInt(str) * 1000); }, /**