diff --git a/static/css/styles(boris).css b/static/css/styles(boris).css index e11913b..d1d826d 100644 --- a/static/css/styles(boris).css +++ b/static/css/styles(boris).css @@ -326,9 +326,15 @@ width: 100%; /*transform: rotate(180deg);*/ overflow-y: auto; - -webkit-transform: scaleY(-1); + transform: scaleY(-1); } + +/*.container-messages::-webkit-scrollbar{*/ +/* transform: rotate(360deg);*/ +/*}*/ + + .footer-chat{ width: calc(100% - 40px); height: 60px; @@ -471,7 +477,7 @@ } .insert_users{ - min-height: 440px; + /*min-height: 440px;*/ } /*messgae*/ @@ -490,7 +496,7 @@ display: block; /* transform: rotate(180deg); */ /* transform: scaleY(-1); */ - -webkit-transform: scaleY(-1); + transform: scaleY(-1); } .container-message_support_chat.right{ @@ -498,7 +504,7 @@ display: block; /* transform: rotate(180deg); */ /* transform: scaleY(-1); */ - -webkit-transform: scaleY(-1); + transform: scaleY(-1); } .block_avatar_message{ diff --git a/static/js/user_profile(boris).js b/static/js/user_profile(boris).js index e065ddf..c39847e 100644 --- a/static/js/user_profile(boris).js +++ b/static/js/user_profile(boris).js @@ -189,36 +189,40 @@ function sendMessage(id_ticket,sender,receiver){ let text = document.querySelector(".enter-message-inp").value - - let data = { - 'ticket_id': id_ticket, - 'sender': sender, - 'receiver': receiver, - 'text': text + if (text.length === 0){ + // } - - - $.ajax({ - headers: { "X-CSRFToken": $('input[name=csrfmiddlewaretoken]').val() }, - url: '/ru/messages/send_msg/', - type: "POST", - // async: true, - cache: false, - processData: false, - contentType: false, - // enctype: 'json', - data: JSON.stringify(data), - success: function(data){ - - document.querySelector(".info_profile").innerHTML = data.html; - - }, - error: function (data){ - - document.querySelector(".info_profile").innerHTML = data.responseJSON.html; - + else { + let data = { + 'ticket_id': id_ticket, + 'sender': sender, + 'receiver': receiver, + 'text': text } - }); + + + $.ajax({ + headers: { "X-CSRFToken": $('input[name=csrfmiddlewaretoken]').val() }, + url: '/ru/messages/send_msg/', + type: "POST", + // async: true, + cache: false, + processData: false, + contentType: false, + // enctype: 'json', + data: JSON.stringify(data), + success: function(data){ + + document.querySelector(".info_profile").innerHTML = data.html; + + }, + error: function (data){ + + document.querySelector(".info_profile").innerHTML = data.responseJSON.html; + + } + }); + } } function openTicket (ticket_id){ @@ -247,4 +251,21 @@ function openTicket (ticket_id){ } }); +} + +function sendMessageEnter (e,id_ticket,sender,receiver){ + if (e.keyCode === 13){ + sendMessage(id_ticket,sender,receiver) + } + else { + // + } +} + +function revertScroll (el,e) { + // let scrollPosition = el.scrollTop; + // window.scrollTo({ + // top: scrollPosition - el.clientHeight, + // behavior: 'smooth' + // }); } \ No newline at end of file diff --git a/templates/blocks/profile/b_support_chat.html b/templates/blocks/profile/b_support_chat.html index c160265..e2e4ba2 100644 --- a/templates/blocks/profile/b_support_chat.html +++ b/templates/blocks/profile/b_support_chat.html @@ -28,7 +28,7 @@ {% endif %} -
+
{% if not messages %} {% with text=ticket.text modifiedDT=ticket.modifiedDT %} {% include "widgets/w_message.html" %} @@ -45,7 +45,7 @@ {% if user.is_staff or ticket.manager %}