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