X-Git-Url: http://git.euphorik.ch/?p=euphorik.git;a=blobdiff_plain;f=js%2FpageMinichat.js;h=8dc7b00216401507ba5140f345836a5cdcc06dff;hp=574dedd667229918491435e16e49d21cf84660d1;hb=e2fc8a1a3dd118b714a2ea55daf1829fa1b98649;hpb=30d42cfc83fbf3ebf24dec3e750257b3f174f290 diff --git a/js/pageMinichat.js b/js/pageMinichat.js index 574dedd..8dc7b00 100755 --- a/js/pageMinichat.js +++ b/js/pageMinichat.js @@ -98,7 +98,7 @@ PageMinichat.prototype.charger = function() { var opacityBase = $(this).css("opacity") $(this).click( - function(event) + function() { thisPage.util.replaceSelection($("form#posterMessage input.message")[0], thisPage.formateur.smiles[$(this).attr("class")][0].source.replace(/\\/g, "")) } @@ -355,21 +355,24 @@ Message.prototype.getConversation = function(messages) if (messages.messages[i].repondA.hasOwnProperty(this.id)) messagesEnEvidence[messages.messages[i].id] = 2 - var premierNiveau = true - var f = function(tabIds) + // parcours en + var f = function(tabIds, premierNiveau) { for(var id in tabIds) { + // si le message (id) a déjà été traité + if (messagesEnEvidence[id] != undefined && !premierNiveau) + continue + var message = messages.messagesParId[id] if (message != undefined) { messagesEnEvidence[id] = premierNiveau ? 3 : (message.auteurId == thisMessage.auteurId ? 1 : 0) - premierNiveau = false - f (message.repondA) + f (message.repondA, false) } } } - f(this.repondA) + f(this.repondA, true) return messagesEnEvidence }