diff --git a/chat/templates/chat/chat_allusers.html b/chat/templates/chat/chat_allusers.html index 1edd0ff..973f16c 100644 --- a/chat/templates/chat/chat_allusers.html +++ b/chat/templates/chat/chat_allusers.html @@ -4,7 +4,6 @@ z-index: 999; height: 100%; width: 100%; - border-radius: 50%; } .icon-container { width: 50px; @@ -69,6 +68,7 @@ { $("#dynamicchatwindow_content").html(data); $("#dynamicchatwindow").show(); + localStorage.setItem("basechatid", userid); } }); diff --git a/chat/templates/chat/chat_content.html b/chat/templates/chat/chat_content.html index 942bb3b..766d0d1 100644 --- a/chat/templates/chat/chat_content.html +++ b/chat/templates/chat/chat_content.html @@ -153,11 +153,12 @@ $(document).ready(function(){ }) - + sending = true; function sendNewMessage() { - if($("#message").val().length > 0) + if($("#message").val().length > 0 && sending) { + sending = false; $.ajax( { type: "GET", @@ -173,7 +174,8 @@ $(document).ready(function(){ $("#message").val(""); chatwebsocket.send("load__{{user.pk}}__privatechat_{{roomdata.creator.pk}}_{{roomdata.chatmember_single.pk}}"); chatwebsocket.send("stoptyping__{{user.pk}}__privatechat_{{roomdata.creator.pk}}_{{roomdata.chatmember_single.pk}}"); - } + sending = true; + } }); } } @@ -181,7 +183,7 @@ $(document).ready(function(){ $(document).on('keypress',function(e) { if(e.which == 13) { - if($("#message").val().length > 0){ + if($("#message").val().length > 0 && sending){ sendNewMessage(); } } diff --git a/chat/templates/chat/chat_content_basechat.html b/chat/templates/chat/chat_content_basechat.html index 9b23693..db01b59 100644 --- a/chat/templates/chat/chat_content_basechat.html +++ b/chat/templates/chat/chat_content_basechat.html @@ -1,9 +1,9 @@ {% load counter_tag %} @@ -65,7 +71,7 @@ {% if message.author == request.user %}