From 74842f17b11a3b68f5d829cf5c9bc0207e1dcd9b Mon Sep 17 00:00:00 2001
From: dewitast <dewitast20@gmail.com>
Date: Thu, 8 Feb 2018 08:18:34 +0700
Subject: [PATCH] merge with module
---
.../view/frontend/templates/messaging.phtml | 53 ++++++++++++-------
.../Messaging/view/frontend/web/css/chat.css | 12 ++++-
2 files changed, 43 insertions(+), 22 deletions(-)
diff --git a/app/code/Magento/Messaging/view/frontend/templates/messaging.phtml b/app/code/Magento/Messaging/view/frontend/templates/messaging.phtml
index ffb2f8fae89..322023aedfe 100644
--- a/app/code/Magento/Messaging/view/frontend/templates/messaging.phtml
+++ b/app/code/Magento/Messaging/view/frontend/templates/messaging.phtml
@@ -21,31 +21,44 @@
console.log("startListening");
myFirebase.on("child_added", function(snapshot) {
var chatrooms = snapshot.val();
+
+ if ((chatrooms.sender=="person1")||(chatrooms.receiver=="person1")){
+ var chatlist = document.getElementById("chatlist");
+ //Kalo usernamenya sama, hapus yang sebelumnya
+ for (i = 0; i < chatlist.childElementCount; i++) {
+ var username = chatlist.childNodes[i].childNodes[0].childNodes[0].innerText;
+ if ((username==chatrooms.sender)||(username==chatrooms.receiver)){
+ chatlist.removeChild(chatlist.childNodes[i]);
+ }
+ }
- if (chatrooms.sender=="person1"){
- console.log("yeay");
- var chatroom_item = document.createElement("div");
- chatroom_item.classList.add("chatroom-item");
+ var chatroom_item = document.createElement("div");
+ chatroom_item.classList.add('chatroom-item');
- var chatroom_username = document.createElement("div");
- chatroom_username.classList.add("chatroom-username");
+ var chatroom_username = document.createElement("div");
+ chatroom_username.classList.add('chatroom-username');
- var chatroom_lastmessage = document.createElement("div");
- chatroom_lastmessage.classList.add("chatroom-lastmessage");
+ var chatroom_lastmessage = document.createElement("div");
+ chatroom_lastmessage.classList.add('chatroom-lastmessage');
- var chatroom_username_span = document.createElement("span");
- chatroom_username_span.textContent = chatrooms.receiver;
- chatroom_username.appendChild(chatroom_username_span);
- var chatroom_lastmessage_span = document.createElement("span");
- chatroom_lastmessage_span.textContent = chatrooms.message;
- chatroom_lastmessage.appendChild(chatroom_lastmessage_span);
+ var chatroom_username_span = document.createElement("span");
+ if (chatrooms.sender=="person1") {
+ chatroom_username_span.textContent = chatrooms.receiver;
+ } else {
+ chatroom_username_span.textContent = chatrooms.sender;
+ }
+
+ chatroom_username.appendChild(chatroom_username_span);
+ var chatroom_lastmessage_span = document.createElement("span");
+ chatroom_lastmessage_span.textContent = chatrooms.message;
+ chatroom_lastmessage.appendChild(chatroom_lastmessage_span);
- chatroom_item.appendChild(chatroom_username);
- chatroom_item.appendChild(chatroom_lastmessage);
- var chatlist = document.getElementById("chatlist");
-
- chatlist.appendChild(chatroom_item);
- }
+ chatroom_item.appendChild(chatroom_username);
+ chatroom_item.appendChild(chatroom_lastmessage);
+
+
+ chatlist.insertBefore(chatroom_item, chatlist.childNodes[0]);
+ }
});
}
diff --git a/app/code/Magento/Messaging/view/frontend/web/css/chat.css b/app/code/Magento/Messaging/view/frontend/web/css/chat.css
index d8637994973..0c5b4ad9a69 100644
--- a/app/code/Magento/Messaging/view/frontend/web/css/chat.css
+++ b/app/code/Magento/Messaging/view/frontend/web/css/chat.css
@@ -8,9 +8,10 @@ body {
margin: 25px;
width: 500px;
height: 600px;
+ /*height: 200px;*/
border: 1px solid black;
font-family: Helvetica;
- position: relative;
+ /*position: relative;*/
}
.chat-title {
@@ -27,7 +28,14 @@ body {
.chat-box {
background: rgb(243, 248, 255);
height:452px;
- padding-bottom: 50px;
+ /*padding-bottom: 50px;*/
+ /* height: auto; */
+ overflow: auto;
+}
+.chat-list {
+ background: rgb(243, 248, 255);
+ height:505px;
+ /*padding-bottom: 50px;*/
/* height: auto; */
overflow: auto;
}
--
GitLab