X-Git-Url: http://git.euphorik.ch/?p=euphorik.git;a=blobdiff_plain;f=js%2FpageMinichat%2Fmessage.js;h=417f33030946e7d93bd10bab08229f2c6ad11334;hp=c77ac587e066743a58e1cc7d8722d5ea72866fee;hb=351623b2a00432ae5b690476c68b8fb05cc8dd03;hpb=f2eb4c4ec53b164804c0c7441830372358ce74e6

diff --git a/js/pageMinichat/message.js b/js/pageMinichat/message.js
index c77ac58..417f330 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;
 };
@@ -112,7 +111,9 @@ euphorik.Message.prototype.getConversation = function(messages) {
   * Aucun callback n'est affecté.
   */
 euphorik.Message.prototype.XHTML = function(messagePair, pre) {
-   messagePair = messagePair || true;
+   if (messagePair === undefined) {
+      messagePair =  true;
+   }
    pre = pre || "";
    
    thisMessage = this;
@@ -143,9 +144,11 @@ euphorik.Message.prototype.XHTML = function(messagePair, pre) {
          (this.systeme ? " systeme" : "") +
          (this.ekMaster ? " ekMaster" + this.degreeOstentatoire : "") +
       "\">" +
-         "<div class=\"outilsMess\"><div class=\"extraire\"></div><div class=\"extraireCompletement\"></div></div><span class=\"entete\">" +
-         "<span class=\"dateComplete\">[<span class=\"date\">" + this.date + "</span>]</span>" +
-         "<span class=\"pseudo\"><span class=\"id\" style=\"display: none\">" + this.auteurId + "</span class=\"ident\">" + identifiant + "</span></span><span class=\"delimitationEntete\"></span>" +
+         "<span class=\"entete\">" +
+            "<span class=\"dateComplete\">[<span class=\"date\">" + this.date + "</span>]</span>" +
+            "<span class=\"pseudo\"><span class=\"id\" style=\"display: none\">" + this.auteurId + "</span><span class=\"ident\">" + identifiant + "</span></span>" +
+         "</span>" + 
+         "<span class=\"delimitationEntete\"></span>" +
          XHTMLrepondA +
          "<span class=\"contenu\">" + this.formateur.traitementComplet(this.contenu, this.pseudo) + "</span>" +
       "</div>";