Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-08 15:05:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

chat will use timeago

Browse Source
This commit is contained in:
barisusakli
2014-03-24 15:58:02 -04:00
parent 17dd113a94
commit 0c744a947e
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
public/src/modules/chat.js
View File

@@ -235,12 +235,12 @@ define(['taskbar', 'string', 'sounds'], function(taskbar, S, sounds) {
module.appendChatMessage = function(chatModal, message, timestamp) { module.appendChatMessage = function(chatModal, message, timestamp) {
var chatContent = chatModal.find('#chat-content'); var chatContent = chatModal.find('#chat-content');
var date = new Date(parseInt(timestamp, 10)); var time = '<span class="chat-timestamp pull-right timeago" title="' + utils.toISOString(timestamp) + '"></span> ';
message = $('<li>' + S(message + time).stripTags('p').s + '</li>');
var prefix = '<span class="chat-timestamp">' + date.toLocaleTimeString() + '</span> ';
message = $('<li>' + S(prefix + message).stripTags('p').s + '</li>');
message.find('img:not(".chat-user-image")').addClass('img-responsive'); message.find('img:not(".chat-user-image")').addClass('img-responsive');
message.find('span.timeago').timeago();
chatContent.append(message); chatContent.append(message);
scrollToBottom(chatContent); scrollToBottom(chatContent);

6
src/controllers/index.js
View File

@@ -52,8 +52,12 @@ Controllers.home = function(req, res, next) {
next(null); next(null);
}, },
categories: function (next) { categories: function (next) {
var uid = (req.user) ? req.user.uid : 0; var uid = req.user ? req.user.uid : 0;
categories.getAllCategories(uid, function (err, data) { categories.getAllCategories(uid, function (err, data) {
if (err) {
return next(err);
}
data.categories = data.categories.filter(function (category) { data.categories = data.categories.filter(function (category) {
return !category.disabled; return !category.disabled;
}); });