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

Merge branch 'master' into dist/envole/6/master

This commit is contained in:
Arnaud Fornerot 2019-10-18 14:10:19 +02:00
parent f0ae7eb4f4 7c50db02fd
commit 2262bebcda
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -236,7 +236,7 @@
var session; var session;
var dateoptions = {weekday: "long", year: "numeric", month: "long", day: "numeric", hour: "2-digit", minute: "2-digit" }; var dateoptions = {weekday: "long", year: "numeric", month: "long", day: "numeric", hour: "2-digit", minute: "2-digit" };
var timer; var timer;
var delayRetry=5000; var delayRetry=500;
var isdeco=false; var isdeco=false;
var tosend=false; var tosend=false;
var tosendmail=false; var tosendmail=false;
@ -443,7 +443,6 @@
$.each(datas, function(i,data) { $.each(datas, function(i,data) {
// Le message a-t-il été déposé durant la déconnexion ? // Le message a-t-il été déposé durant la déconnexion ?
if(!$("#message-"+data.id).length) { if(!$("#message-"+data.id).length) {
console.log("regen message");
html ="<div id='message-"+data.id+"' class='message row'>"; html ="<div id='message-"+data.id+"' class='message row'>";
html+="<div class='msgavatar'>"; html+="<div class='msgavatar'>";
html+="<img id='user_avatar_img' src='/{{ alias }}/uploads/avatar/"+data.useravatar+"' class='avatar'><br>"; html+="<img id='user_avatar_img' src='/{{ alias }}/uploads/avatar/"+data.useravatar+"' class='avatar'><br>";