moparisthebest/kaiwa
1
0
Fork 0
mirror of https://github.com/moparisthebest/kaiwa synced 2024-08-13 17:03:51 -04:00
Code Issues Releases Wiki Activity

Display time of each message

Browse Source
This commit is contained in:
Sébastien Hut 2015-04-04 16:47:01 +02:00 committed by Sébastien Hut
parent b5b07d07b8
commit 80f1efe5f3
8 changed files with 99 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
clientapp/models/message.js
View File

@ -126,9 +126,9 @@ var Message = module.exports = HumanModel.define({
cache: false,
fn: function () {
if (this.type === 'groupchat') {
return templates.includes.mucBareMessage({message: this});
return templates.includes.mucBareMessage({message: this, messageDate: Date.create(this.timestamp), hasParent: false});
} else {
return templates.includes.bareMessage({message: this});
return templates.includes.bareMessage({message: this, messageDate: Date.create(this.timestamp), hasParent: false});
}
}
},
@ -137,9 +137,9 @@ var Message = module.exports = HumanModel.define({
cache: false,
fn: function () {
if (this.type === 'groupchat') {
return templates.includes.mucWrappedMessage({message: this});
return templates.includes.mucWrappedMessage({message: this, messageDate: Date.create(this.timestamp), hasParent: true});
} else {
return templates.includes.wrappedMessage({message: this});
return templates.includes.wrappedMessage({message: this, messageDate: Date.create(this.timestamp), hasParent: true});
}
}
},

60
clientapp/templates.js
View File

@ -31,13 +31,22 @@ exports.head = function anonymous(locals) {
exports.includes.bareMessage = function anonymous(locals) {
var buf = [];
with (locals || {}) {
var messageClasses = message.classList;
if (hasParent) {
messageClasses += " first";
}
buf.push("<div" + jade.attrs({
id: "chat" + message.cid,
"class": "message" + " " + message.classList
"class": "message" + " " + messageClasses
}, {
"class": true,
id: true
}) + '><p class="body">' + ((jade.interp = message.processedBody) == null ? "" : jade.interp) + "</p>");
}) + "><div" + jade.attrs({
title: messageDate.format("{Dow}, {MM}/{dd}/{yyyy} - {h}:{mm} {Tt}"),
"class": "date"
}, {
title: true
}) + ">" + jade.escape((jade.interp = messageDate.format("{h}:{mm} {tt}")) == null ? "" : jade.interp) + '</div><p class="body">' + ((jade.interp = message.processedBody) == null ? "" : jade.interp) + "</p>");
var urls = message.urls;
buf.push('<section class="embeds">');
(function() {
@ -238,13 +247,22 @@ exports.includes.messageGroup = function anonymous(locals) {
exports.includes.mucBareMessage = function anonymous(locals) {
var buf = [];
with (locals || {}) {
var messageClasses = message.classList;
if (hasParent) {
messageClasses += " first";
}
buf.push("<div" + jade.attrs({
id: "chat" + message.cid,
"class": "message" + " " + message.classList
"class": "message" + " " + messageClasses
}, {
"class": true,
id: true
}) + '><p class="body">' + ((jade.interp = message.processedBody) == null ? "" : jade.interp) + "</p>");
}) + "><div" + jade.attrs({
title: messageDate.format("{Dow}, {MM}/{dd}/{yyyy} - {h}:{mm} {Tt}"),
"class": "date"
}, {
title: true
}) + ">" + jade.escape((jade.interp = messageDate.format("{h}:{mm} {tt}")) == null ? "" : jade.interp) + '</div><p class="body">' + ((jade.interp = message.processedBody) == null ? "" : jade.interp) + "</p>");
var urls = message.urls;
buf.push('<section class="embeds">');
(function() {
@ -320,7 +338,6 @@ exports.includes.mucRosterItem = function anonymous(locals) {
exports.includes.mucWrappedMessage = function anonymous(locals) {
var buf = [];
with (locals || {}) {
var messageDate = Date.create(message.timestamp);
buf.push('<li><div class="sender"><a href="#" class="messageAvatar"><img' + jade.attrs({
src: message.sender.getAvatar(message.from.full),
alt: message.from.resource,
@ -334,13 +351,23 @@ exports.includes.mucWrappedMessage = function anonymous(locals) {
"class": "date"
}, {
title: true
}) + ">" + jade.escape((jade.interp = messageDate.format("{h}:{mm} {tt}")) == null ? "" : jade.interp) + "</div></div><div" + jade.attrs({
}) + ">" + jade.escape((jade.interp = messageDate.format("{h}:{mm} {tt}")) == null ? "" : jade.interp) + "</div></div>");
var messageClasses = message.classList;
if (hasParent) {
messageClasses += " first";
}
buf.push("<div" + jade.attrs({
id: "chat" + message.cid,
"class": "message" + " " + message.classList
"class": "message" + " " + messageClasses
}, {
"class": true,
id: true
}) + '><p class="body">' + ((jade.interp = message.processedBody) == null ? "" : jade.interp) + "</p>");
}) + "><div" + jade.attrs({
title: messageDate.format("{Dow}, {MM}/{dd}/{yyyy} - {h}:{mm} {Tt}"),
"class": "date"
}, {
title: true
}) + ">" + jade.escape((jade.interp = messageDate.format("{h}:{mm} {tt}")) == null ? "" : jade.interp) + '</div><p class="body">' + ((jade.interp = message.processedBody) == null ? "" : jade.interp) + "</p>");
var urls = message.urls;
buf.push('<section class="embeds">');
(function() {
@ -398,7 +425,6 @@ exports.includes.mucWrappedMessage = function anonymous(locals) {
exports.includes.wrappedMessage = function anonymous(locals) {
var buf = [];
with (locals || {}) {
var messageDate = Date.create(message.timestamp);
buf.push('<li><div class="sender"><a href="#" class="messageAvatar"><img' + jade.attrs({
src: message.sender.avatar,
alt: message.sender.displayName,
@ -412,13 +438,23 @@ exports.includes.wrappedMessage = function anonymous(locals) {
"class": "date"
}, {
title: true
}) + ">" + jade.escape((jade.interp = messageDate.format("{h}:{mm} {tt}")) == null ? "" : jade.interp) + "</div></div><div" + jade.attrs({
}) + ">" + jade.escape((jade.interp = messageDate.format("{h}:{mm} {tt}")) == null ? "" : jade.interp) + "</div></div>");
var messageClasses = message.classList;
if (hasParent) {
messageClasses += " first";
}
buf.push("<div" + jade.attrs({
id: "chat" + message.cid,
"class": "message" + " " + message.classList
"class": "message" + " " + messageClasses
}, {
"class": true,
id: true
}) + '><p class="body">' + ((jade.interp = message.processedBody) == null ? "" : jade.interp) + "</p>");
}) + "><div" + jade.attrs({
title: messageDate.format("{Dow}, {MM}/{dd}/{yyyy} - {h}:{mm} {Tt}"),
"class": "date"
}, {
title: true
}) + ">" + jade.escape((jade.interp = messageDate.format("{h}:{mm} {tt}")) == null ? "" : jade.interp) + '</div><p class="body">' + ((jade.interp = message.processedBody) == null ? "" : jade.interp) + "</p>");
var urls = message.urls;
buf.push('<section class="embeds">');
(function() {

7
clientapp/templates/includes/bareMessage.jade
View File

@ -1,4 +1,9 @@
.message(id='chat'+message.cid, class=message.classList)
- var messageClasses = message.classList
if hasParent
- messageClasses += ' first'
.message(id='chat'+message.cid, class=messageClasses)
.date(title=messageDate.format('{Dow}, {MM}/{dd}/{yyyy} - {h}:{mm} {Tt}')) #{messageDate.format('{h}:{mm} {tt}')}
p.body !{message.processedBody}
- var urls = message.urls
section.embeds

7
clientapp/templates/includes/mucBareMessage.jade
View File

@ -1,4 +1,9 @@
.message(id='chat'+message.cid, class=message.classList)
- var messageClasses = message.classList
if hasParent
- messageClasses += ' first'
.message(id='chat'+message.cid, class=messageClasses)
.date(title=messageDate.format('{Dow}, {MM}/{dd}/{yyyy} - {h}:{mm} {Tt}')) #{messageDate.format('{h}:{mm} {tt}')}
p.body !{message.processedBody}
- var urls = message.urls
section.embeds

1
clientapp/templates/includes/mucWrappedMessage.jade
View File

@ -1,4 +1,3 @@
- var messageDate = Date.create(message.timestamp)
li
.sender
a.messageAvatar(href='#')

1
clientapp/templates/includes/wrappedMessage.jade
View File

@ -1,4 +1,3 @@
- var messageDate = Date.create(message.timestamp)
li
.sender
a.messageAvatar(href='#')

17
public/css/otalk.css
View File

@ -1391,6 +1391,9 @@ button.secondary:hover:not(:disabled) {
-webkit-box-sizing: border-box;
box-sizing: border-box;
}
.messages .message:hover:not(.first) .date {
visibility: visible;
}
.messages .message:not(.mine) {
color: #555459;
}
@ -1414,9 +1417,23 @@ button.secondary:hover:not(:disabled) {
font-style: normal;
color: #88d5f7;
}
.messages .message .date {
display: inline-block;
color: #babbbf;
font-size: 12px;
width: 60px;
line-height: 22px;
text-transform: uppercase;
cursor: pointer;
position: relative;
left: -50px;
visibility: hidden;
}
.messages .message .body {
display: inline;
word-break: break-word;
position: relative;
left: -60px;
}
.messages .message .body .mention {
color: #ec008c;

18
public/css/pages/chat.styl
View File

@ -415,6 +415,10 @@
width: 100%
borderbox()
&:hover
&:not(.first) .date
visibility: visible
&:not(.mine)
color: $gray-dark
@ -438,9 +442,23 @@
font-style: normal
color: $blue-light
.date
display: inline-block
color: $gray-light
font-size: $font-size-small
width: 60px
line-height: 22px
text-transform: uppercase
cursor: pointer
position: relative
left: -50px
visibility: hidden
.body
display: inline
word-break: break-word
position: relative
left: -60px
.mention
color: $pink