MyHyvesBookPlus/WebDB
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Merge branch 'safari-chat' into 'master'

Browse Source 
Fixed chat in safari

See merge request !166
This commit was merged in pull request #170.
This commit is contained in:
Lars van Hijfte
2017-02-01 12:29:52 +01:00
parent 152d72d3d8 04365c4f05
commit fcd58857c0
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
website/public/js/chat.js
View File

@@ -47,8 +47,9 @@ function addMessages(messages) {
var messagesText = ""; var messagesText = "";
for(var i in messages) { for(var i in messages) {
// Initialize message variables // Initialize message variables
var thisDate = new Date(messages[i].creationdate); var thisDate = new Date(messages[i].creationdate.replace(/ /,"T"));
var thisTime = thisDate.getHours() + ":" + thisDate.getMinutes(); var thisTime = thisDate.getHours() + ":" + thisDate.getMinutes();
console.log(thisDate);
var type; var type;
thisDate.setHours(0,0,0,0); thisDate.setHours(0,0,0,0);
@@ -58,17 +59,15 @@ function addMessages(messages) {
type = "chat-message-other"; type = "chat-message-other";
} }
if (i == 0) { if (i == 0) {
if (thisDate > previousDate) { previousDate = thisDate;
previousDate = thisDate; messagesText += '\
messagesText += '\ <div class="day-message"> \
<div class="day-message"> \ <div class="day-message-content">\
<div class="day-message-content">\ ' + days[thisDate.getDay()] + " " + thisDate.getDate() + " " + months[thisDate.getMonth()] + " " + thisDate.getFullYear() + '\
' + days[thisDate.getDay()] + " " + thisDate.getDate() + " " + months[thisDate.getMonth()] + " " + thisDate.getFullYear() + '\ </div> \
</div> \ </div>';
</div>';
}
messagesText += '<div class="chat-message"><div class="' + type + '">'; messagesText += '<div class="chat-message"><div class="' + type + '">';
} else if (type != previousType || thisTime != previousTime || thisDate > previousDate) { } else if (type != previousType || thisTime != previousTime || thisDate.getTime() > previousDate.getTime()) {
messagesText += '<div class="chat-time">\ messagesText += '<div class="chat-time">\
' + thisTime + '\ ' + thisTime + '\
</div></div></div>'; </div></div></div>';

5
website/public/styles/chat.css
View File

@@ -22,6 +22,7 @@ body {
height: calc(100% - 100px); height: calc(100% - 100px);
display: inline-block; display: inline-block;
float: left;
overflow-y: auto; overflow-y: auto;
} }
@@ -31,12 +32,14 @@ body {
overflow-y: auto; overflow-y: auto;
overflow-x: hidden; overflow-x: hidden;
width: calc(100% - 256px - 75px); width: calc(100% - 256px - 85px);
height: calc(100% - 80px); height: calc(100% - 80px);
margin-right: 10px;
padding: 10px; padding: 10px;
display: inline-block; display: inline-block;
float: right;
word-wrap: break-word; word-wrap: break-word;
} }