Cadoles/ninegate
21
0
Fork 0
Code Issues 29 Pull Requests Projects 1 Releases Wiki Activity

commit

Browse Source
This commit is contained in:
afornerot
2019-07-19 16:51:11 +02:00
parent bf1c7299b1
commit 030fd9a119
17 changed files with 401 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/ninegate-1.0/src/Cadoles/WebsocketBundle/Resources/views/Chat/client.html.twig
View File

@ -26,6 +26,7 @@
.msgavatar {
float:left;
height:40px;
text-align: center;
}
.msgdiv {
float:left;
@ -52,7 +53,9 @@
<div id='message-{{message.id}}' class='message row'>
<div class='msgavatar'>
<img id='user_avatar_img' src='/{{ alias }}/uploads/avatar/{{message.user.avatar}}' class='avatar'><br>
<i class='delmessage fa fa-trash fa-fw' data-id='{{message.id}}' style='cursor: pointer;'></i>
{% if fgmanager or message.user == app.user %}
<i class='delmessage fa fa-trash fa-fw' data-id='{{message.id}}' style='cursor: pointer;'></i>
{% endif %}
</div>
<div class='msgdiv'>
<div class='msgtitle'>
@ -87,11 +90,11 @@
session.call("websocket/rpc/update_connection_data", {"userkey": "{{userkey}}" }).then(
function (result)
{
console.log("RPC Valid!", result);
//console.log("RPC Valid!", result);
},
function (error, desc)
{
console.log("RPC Error", error, desc);
//console.log("RPC Error", error, desc);
}
);
@ -101,7 +104,7 @@
html ="<div id='message-"+payload.msg.id+"' class='message row'>";
html+="<div class='msgavatar'>";
html+="<img id='user_avatar_img' src='/{{ alias }}/uploads/avatar/"+payload.msg.avatar+"' class='avatar'><br>";
if(payload.msg.userid=={{app.user.id}}) {
if(payload.msg.userid=={{app.user.id}} || '{{ fgmanager }}'=='1') {
html+="<i class='delmessage fa fa-trash fa-fw' data-id='"+payload.msg.id+"' style='cursor: pointer;'></i>";
}
html+="</div>";
@ -111,10 +114,8 @@
html+="</div>";
html+="</div>";
$(".mychat").prepend(html);
console.log("Received message by "+payload.msg.userid+" = ",payload.msg);
//console.log("Received message by "+payload.msg.userid+" = ",payload.msg);
}
if(payload.log) {
@ -136,14 +137,18 @@
event={type: "add", message: data};
session.publish("websocket/channel/{{groupid}}", event);
CKEDITOR.instances["chat_message"].setData('');
event={type: "add", group:{{groupid}}};
parent.parent.counter(event);
}
});
$(document).on('click', '.delmessage', function(){
console.log("suppression");
id=$(this).data("id");
event={type: "del", id: id};
session.publish("websocket/channel/{{groupid}}", event);
});
})
{% endif %}