FIX#64

[euphorik.git] / js / pageMinichat / message.js

diff --git a/js/pageMinichat/message.js b/js/pageMinichat/message.js
index c77ac58..417f330 100644 (file)
--- a/js/pageMinichat/message.js
+++ b/js/pageMinichat/message.js
@@ -82,27 +82,26 @@ euphorik.Message.prototype.getConversation = function(messages) {
 \r
    // les messages faisant partie de la conversation\r
    var messagesEnEvidence = {};\r
-   \r
    messagesEnEvidence[this.id] = 1;\r
    \r
    // parcours en profondeur\r
-   var f = function(m, premierNiveau, ensemble, evidence) {\r
-      objectEach(m[ensemble], function(id) {\r
+   var f = function(ids, premierNiveau, ensemble, evidence) {\r
+      objectEach(ids, function(id) {\r
          if (!messagesEnEvidence[id] || premierNiveau) {\r
             var message = messages.messagesParId[id];\r
             if (message) {\r
                messagesEnEvidence[id] = premierNiveau ? evidence : (message.auteurId === thisMessage.auteurId ? 1 : 0);\r
-               f(message, false, ensemble, evidence);\r
+               f(message[ensemble], false, ensemble, evidence);\r
             }\r
          }\r
       });\r
    };\r
    \r
    // remonte le temps\r
-   f(this, true, "estReponduPar", 2);\r
+   f(this.estReponduPar, true, "estReponduPar", 2);\r
    \r
    // descent le temps\r
-   f(this, true, "repondA", 3);       \r
+   f(this.repondA, true, "repondA", 3);       \r
    \r
    return messagesEnEvidence;\r
 };\r
@@ -112,7 +111,9 @@ euphorik.Message.prototype.getConversation = function(messages) {
   * Aucun callback n'est affecté.\r
   */\r
 euphorik.Message.prototype.XHTML = function(messagePair, pre) {\r
-   messagePair = messagePair || true;\r
+   if (messagePair === undefined) {\r
+      messagePair =  true;\r
+   }\r
    pre = pre || "";\r
    \r
    thisMessage = this;\r
@@ -143,9 +144,11 @@ euphorik.Message.prototype.XHTML = function(messagePair, pre) {
          (this.systeme ? " systeme" : "") +\r
          (this.ekMaster ? " ekMaster" + this.degreeOstentatoire : "") +\r
       "\">" +\r
-         "<div class=\"outilsMess\"><div class=\"extraire\"></div><div class=\"extraireCompletement\"></div></div><span class=\"entete\">" +\r
-         "<span class=\"dateComplete\">[<span class=\"date\">" + this.date + "</span>]</span>" +\r
-         "<span class=\"pseudo\"><span class=\"id\" style=\"display: none\">" + this.auteurId + "</span class=\"ident\">" + identifiant + "</span></span><span class=\"delimitationEntete\"></span>" +\r
+         "<span class=\"entete\">" +\r
+            "<span class=\"dateComplete\">[<span class=\"date\">" + this.date + "</span>]</span>" +\r
+            "<span class=\"pseudo\"><span class=\"id\" style=\"display: none\">" + this.auteurId + "</span><span class=\"ident\">" + identifiant + "</span></span>" +\r
+         "</span>" + \r
+         "<span class=\"delimitationEntete\"></span>" +\r
          XHTMLrepondA +\r
          "<span class=\"contenu\">" + this.formateur.traitementComplet(this.contenu, this.pseudo) + "</span>" +\r
       "</div>";\r