X-Git-Url: http://git.euphorik.ch/?p=euphorik.git;a=blobdiff_plain;f=js%2Fchat%2Fmessage.js;h=51d84b9cf8898e387790cb6b27cc6a641bbd0753;hp=c24be1dd1aa12c83510d2dfa4bf13493c53a7b8b;hb=5dc140390551c133ac5525725a86854ca69679af;hpb=e49a1c483f1751f129c0766d1061b3da44b60581 diff --git a/js/chat/message.js b/js/chat/message.js index c24be1d..51d84b9 100644 --- a/js/chat/message.js +++ b/js/chat/message.js @@ -16,11 +16,9 @@ // You should have received a copy of the GNU General Public License // along with Euphorik. If not, see . -euphorik.Reponse = function(id, pseudo, login) { +euphorik.Reponse = function(id, nick, login) { this.id = id; - this.pseudo = pseudo; - this.login = login; - this.pseudo = pseudo || ""; + this.nick = nick || ""; this.login = login || ""; }; @@ -35,7 +33,7 @@ euphorik.Message = function(client, formater, element) { this.auteurId = element.user_id; this.racineId = element.root; this.date = element.date; - this.pseudo = element.nick; + this.nick = element.nick; this.login = element.login; this.contenu = element.content; @@ -120,9 +118,9 @@ euphorik.Message.prototype.XHTML = function(messagePair, pre) { // construit l'identifiant de la personne var identifiant = - 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) + "(" + this.formater.traitementComplet(this.login) +")" ); + this.client.nickFormat === "nick" || this.login === "" ? this.formater.completeProcessing(this.nick) : + (this.client.nickFormat === "login" ? this.formater.completeProcessing(this.login) : + this.formater.completeProcessing(this.nick) + "(" + this.formater.completeProcessing(this.login) +")" ); var XHTMLrepondA = ""; var debut = true; @@ -130,7 +128,7 @@ euphorik.Message.prototype.XHTML = function(messagePair, pre) { if (!debut) { XHTMLrepondA += ", "; } - XHTMLrepondA += thisMessage.formater.traitementComplet(rep.pseudo); + XHTMLrepondA += thisMessage.formater.completeProcessing(rep.nick); debut = false; }); if (XHTMLrepondA) { @@ -146,10 +144,10 @@ euphorik.Message.prototype.XHTML = function(messagePair, pre) { "\">" + "" + "[" + this.date + "]" + - "" + this.auteurId + "" + identifiant + "" + + "" + this.auteurId + "" + identifiant + "" + "" + "" + XHTMLrepondA + - "" + this.formater.traitementComplet(this.contenu, this.pseudo) + "" + + "" + this.formater.completeProcessing(this.contenu, this.nick) + "" + ""; };