From: Greg Burri Date: Sat, 26 Jul 2008 14:40:30 +0000 (+0000) Subject: FIX bug dans la mise en évidence X-Git-Tag: 1.1.0~44 X-Git-Url: http://git.euphorik.ch/index.cgi?a=commitdiff_plain;h=956dc2acd6aee480b5daa4def16346f9bab80056;p=euphorik.git FIX bug dans la mise en évidence --- diff --git a/js/pageMinichat/conversation.js b/js/pageMinichat/conversation.js index 20343f9..3948629 100644 --- a/js/pageMinichat/conversation.js +++ b/js/pageMinichat/conversation.js @@ -410,7 +410,7 @@ euphorik.Conversation.prototype.afficherConversation = function(id) { function() { var jq = $(this); var statut = mess[thisConversation.idMessageFromString(jq.attr("id"))]; - if (!statut) { + if (statut === undefined) { jq.addClass("cache"); } else { jq.removeClass("cache"); diff --git a/js/pageMinichat/message.js b/js/pageMinichat/message.js index c77ac58..67ba7e6 100644 --- a/js/pageMinichat/message.js +++ b/js/pageMinichat/message.js @@ -82,27 +82,26 @@ euphorik.Message.prototype.getConversation = function(messages) { // les messages faisant partie de la conversation var messagesEnEvidence = {}; - messagesEnEvidence[this.id] = 1; // parcours en profondeur - var f = function(m, premierNiveau, ensemble, evidence) { - objectEach(m[ensemble], function(id) { + var f = function(ids, premierNiveau, ensemble, evidence) { + objectEach(ids, function(id) { if (!messagesEnEvidence[id] || premierNiveau) { var message = messages.messagesParId[id]; if (message) { messagesEnEvidence[id] = premierNiveau ? evidence : (message.auteurId === thisMessage.auteurId ? 1 : 0); - f(message, false, ensemble, evidence); + f(message[ensemble], false, ensemble, evidence); } } }); }; // remonte le temps - f(this, true, "estReponduPar", 2); + f(this.estReponduPar, true, "estReponduPar", 2); // descent le temps - f(this, true, "repondA", 3); + f(this.repondA, true, "repondA", 3); return messagesEnEvidence; }; diff --git a/styles/1/img/fleche_proprietaire.png b/styles/1/img/fleche_proprietaire.png index 38845e2..3f17c3c 100644 Binary files a/styles/1/img/fleche_proprietaire.png and b/styles/1/img/fleche_proprietaire.png differ diff --git a/styles/1/pageMinichat.css b/styles/1/pageMinichat.css index 71f6a08..6f386ce 100755 --- a/styles/1/pageMinichat.css +++ b/styles/1/pageMinichat.css @@ -244,7 +244,7 @@ background-image: url(img/fleche_repondu.png); } #page.minichat div.message.proprietaire .entete { - background-color: #13920f + background-color: #350a0a } #page.minichat div.message.proprietaire .delimitationEntete, #page.minichat div.message.proprietaire .repondA {