From 04365c4f05a1a2098f7fac772faf9ecf2c731f8c Mon Sep 17 00:00:00 2001
From: Marijn Jansen <marijn@jansen.onl>
Date: Wed, 1 Feb 2017 12:24:59 +0100
Subject: [PATCH] Fixed chat in safari

---
 website/public/js/chat.js      | 21 ++++++++++-----------
 website/public/styles/chat.css |  5 ++++-
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/website/public/js/chat.js b/website/public/js/chat.js
index 1d70834..e332324 100644
--- a/website/public/js/chat.js
+++ b/website/public/js/chat.js
@@ -47,8 +47,9 @@ function addMessages(messages) {
     var messagesText = "";
     for(var i in messages) {
         // 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();
+        console.log(thisDate);
         var type;
         thisDate.setHours(0,0,0,0);
 
@@ -58,17 +59,15 @@ function addMessages(messages) {
             type = "chat-message-other";
         }
         if (i == 0) {
-            if (thisDate > previousDate) {
-                previousDate = thisDate;
-                messagesText += '\
-                    <div class="day-message"> \
-                        <div class="day-message-content">\
-                        ' + days[thisDate.getDay()] + " " + thisDate.getDate() + " " + months[thisDate.getMonth()] + " " + thisDate.getFullYear() + '\
-                        </div> \
-                    </div>';
-            }
+            previousDate = thisDate;
+            messagesText += '\
+                <div class="day-message"> \
+                    <div class="day-message-content">\
+                    ' + days[thisDate.getDay()] + " " + thisDate.getDate() + " " + months[thisDate.getMonth()] + " " + thisDate.getFullYear() + '\
+                    </div> \
+                </div>';
             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">\
                     ' + thisTime + '\
                     </div></div></div>';
diff --git a/website/public/styles/chat.css b/website/public/styles/chat.css
index cb0f19f..23f8dce 100644
--- a/website/public/styles/chat.css
+++ b/website/public/styles/chat.css
@@ -22,6 +22,7 @@ body {
     height: calc(100% - 100px);
 
     display: inline-block;
+    float: left;
 
     overflow-y: auto;
 }
@@ -31,12 +32,14 @@ body {
     overflow-y: auto;
     overflow-x: hidden;
 
-    width: calc(100% - 256px - 75px);
+    width: calc(100% - 256px - 85px);
     height: calc(100% - 80px);
+    margin-right: 10px;
 
     padding: 10px;
 
     display: inline-block;
+    float: right;
 
     word-wrap: break-word;
 }