mirror of
https://github.com/pierre42100/ComunicWeb
synced 2024-11-22 12:09:21 +00:00
Added date to conversations
This commit is contained in:
parent
df26ed4d38
commit
998e500154
@ -80,6 +80,14 @@
|
|||||||
/**
|
/**
|
||||||
* Conversations messages
|
* Conversations messages
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#conversationsElem .date-conversation-message {
|
||||||
|
margin-top: 2px;
|
||||||
|
text-align: center;
|
||||||
|
font-size: 70%;
|
||||||
|
font-style: italic;
|
||||||
|
}
|
||||||
|
|
||||||
#conversationsElem .conversation-msg-image {
|
#conversationsElem .conversation-msg-image {
|
||||||
height: 50px;
|
height: 50px;
|
||||||
}
|
}
|
||||||
|
@ -814,11 +814,17 @@ ComunicWeb.components.conversations.chatWindows = {
|
|||||||
class: "direct-chat-info clearfix"
|
class: "direct-chat-info clearfix"
|
||||||
});
|
});
|
||||||
|
|
||||||
|
//Add top information
|
||||||
|
var topInfosElem = createElem2({
|
||||||
|
appendTo: messageHeader,
|
||||||
|
type: "div",
|
||||||
|
class: "direct-chat-name pull-" + (userIsPoster ? "right" : "left"),
|
||||||
|
});
|
||||||
|
|
||||||
//Add user name
|
//Add user name
|
||||||
var usernameElem = createElem2({
|
var usernameElem = createElem2({
|
||||||
appendTo: messageHeader,
|
appendTo: topInfosElem,
|
||||||
type: "span",
|
type: "span",
|
||||||
class: "direct-chat-name pull-" + (userIsPoster ? "right" : "left"),
|
|
||||||
innerHTML: "Loading",
|
innerHTML: "Loading",
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -887,6 +893,14 @@ ComunicWeb.components.conversations.chatWindows = {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//Add date
|
||||||
|
var dateElem = createElem2({
|
||||||
|
appendTo: messageContainer,
|
||||||
|
type: "div",
|
||||||
|
class: "date-conversation-message",
|
||||||
|
innerHTML: ComunicWeb.common.date.timeDiffToStr(message.time_insert)
|
||||||
|
});
|
||||||
|
|
||||||
//Parse emojies in text message
|
//Parse emojies in text message
|
||||||
ComunicWeb.components.emoji.parser.parse({
|
ComunicWeb.components.emoji.parser.parse({
|
||||||
element: textMessage,
|
element: textMessage,
|
||||||
@ -897,6 +911,8 @@ ComunicWeb.components.conversations.chatWindows = {
|
|||||||
userID: message.ID_user,
|
userID: message.ID_user,
|
||||||
rootElem: messageContainer,
|
rootElem: messageContainer,
|
||||||
userNameElem: usernameElem,
|
userNameElem: usernameElem,
|
||||||
|
dateElem: dateElem,
|
||||||
|
time_insert: message.time_insert,
|
||||||
messageTargetElem: messageTargetElem,
|
messageTargetElem: messageTargetElem,
|
||||||
accountImage: userAccountImage
|
accountImage: userAccountImage
|
||||||
};
|
};
|
||||||
@ -928,6 +944,11 @@ ComunicWeb.components.conversations.chatWindows = {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
//Check the difference of time between the two messages
|
||||||
|
if(conv.messages[num].time_insert - conv.messages[num - 1].time_insert < 3600
|
||||||
|
|| conv.messages[num].dateElem.innerHTML == conv.messages[num - 1].dateElem.innerHTML)
|
||||||
|
conv.messages[num].dateElem.style.display = "none";
|
||||||
}
|
}
|
||||||
|
|
||||||
},
|
},
|
||||||
|
Loading…
Reference in New Issue
Block a user