diff --git a/static/js/chat_socket_functions/update_messenger.js b/static/js/chat_socket_functions/update_messenger.js index abbdfc2..128e31f 100644 --- a/static/js/chat_socket_functions/update_messenger.js +++ b/static/js/chat_socket_functions/update_messenger.js @@ -4,7 +4,9 @@ function update_chat_html (data,msg_cont) { if (msg_cont !== null){ if (msg_cont.dataset['curReceiver'] === ""){ document.querySelector(".fotter-chat") - msg_cont.innerHTML = data.chat_html + if (msg_cont.dataset['curReceiver'] === data['sender'].toString() || msg_cont.dataset['curReceiver'] === data['receiver'].toString()) { + msg_cont.innerHTML = data.chat_html + } } else { // что бы не выводился левый чат if (msg_cont.dataset['curReceiver'] === data['sender'].toString() || msg_cont.dataset['curReceiver'] === data['receiver'].toString()) { diff --git a/static/js/chat_sockets.js b/static/js/chat_sockets.js index 1a287ce..ab2949b 100644 --- a/static/js/chat_sockets.js +++ b/static/js/chat_sockets.js @@ -1,7 +1,7 @@ function sendMessageSocket (data) { - if (chatSocket.readyState !== 1 || chatSocket.readyState !== 0){ + if (chatSocket.readyState !== 1 && chatSocket.readyState !== 0){ init_ws() } @@ -70,7 +70,9 @@ function wsReceiveData (e) { } else { if (data.chat_html){ if (msg_cont){ - msg_cont.innerHTML = data.chat_html + if (msg_cont.dataset['curReceiver'] === data['sender'].toString() || msg_cont.dataset['curReceiver'] === data['receiver'].toString()) { + msg_cont.innerHTML = data.chat_html + } } else { let error_msg_cont = "msg_cont is not defined" console.log(error_msg_cont) @@ -78,7 +80,7 @@ function wsReceiveData (e) { } else if (data.support_chat_html){ let cont_mes_ins = document.querySelector(".info_profile") if (cont_mes_ins){ - cont_mes_ins.innerHTML = data.chat_html + cont_mes_ins.innerHTML = data.support_chat_html } else { let error_cont_mes_ins = "cont_mes_ins is not defined" console.log(error_cont_mes_ins)