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

diff --git a/js/pageMinichat/message.js b/js/pageMinichat/message.js
index c77ac58..c24be1d 100644
--- a/js/pageMinichat/message.js
+++ b/js/pageMinichat/message.js
@@ -27,9 +27,9 @@ euphorik.Reponse = function(id, pseudo, login) {
 /**
   * Représente un message.
   */
-euphorik.Message = function(client, formateur, element) {
+euphorik.Message = function(client, formater, element) {
    this.client = client;
-   this.formateur = formateur;
+   this.formater = formater;
    
    this.id = element.id;
    this.auteurId = element.user_id;
@@ -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,16 +111,18 @@ 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;
       
    // construit l'identifiant de la personne
    var identifiant = 
-      this.client.nickFormat === "nick" || this.login === "" ? this.formateur.traitementComplet(this.pseudo) : 
-      (this.client.nickFormat === "login" ? this.formateur.traitementComplet(this.login) : 
-      this.formateur.traitementComplet(this.pseudo) + "<span class=\"login\">(" + this.formateur.traitementComplet(this.login) +")</span>" );
+      this.client.nickFormat === "nick" || this.login === "" ? this.formater.traitementComplet(this.pseudo) : 
+      (this.client.nickFormat === "login" ? this.formater.traitementComplet(this.login) : 
+      this.formater.traitementComplet(this.pseudo) + "<span class=\"login\">(" + this.formater.traitementComplet(this.login) +")</span>" );
 
    var XHTMLrepondA = "";
    var debut = true;
@@ -129,7 +130,7 @@ euphorik.Message.prototype.XHTML = function(messagePair, pre) {
       if (!debut) {
          XHTMLrepondA += ", ";
       }
-      XHTMLrepondA += thisMessage.formateur.traitementComplet(rep.pseudo);
+      XHTMLrepondA += thisMessage.formater.traitementComplet(rep.pseudo);
       debut = false;
    });
    if (XHTMLrepondA) {
@@ -143,10 +144,12 @@ 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>" +
+         "<span class=\"contenu\">" + this.formater.traitementComplet(this.contenu, this.pseudo) + "</span>" +
       "</div>";
 };