projects
/
euphorik.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove the weekly troll.
[euphorik.git]
/
js
/
chat
/
message.js
diff --git
a/js/chat/message.js
b/js/chat/message.js
index
c24be1d
..
b3e5f12
100644
(file)
--- a/
js/chat/message.js
+++ b/
js/chat/message.js
@@
-15,12
+15,10
@@
//
\r
// You should have received a copy of the GNU General Public License
\r
// along with Euphorik. If not, see <http://www.gnu.org/licenses/>.
\r
//
\r
// You should have received a copy of the GNU General Public License
\r
// along with Euphorik. If not, see <http://www.gnu.org/licenses/>.
\r
-
\r
-euphorik.Reponse = function(id,
pseudo
, login) {
\r
+
\r
+euphorik.Reponse = function(id,
nick
, login) {
\r
this.id = id;
\r
this.id = id;
\r
- this.pseudo = pseudo;
\r
- this.login = login;
\r
- this.pseudo = pseudo || "";
\r
+ this.nick = nick || "";
\r
this.login = login || "";
\r
};
\r
\r
this.login = login || "";
\r
};
\r
\r
@@
-30,19
+28,19
@@
euphorik.Reponse = function(id, pseudo, login) {
euphorik.Message = function(client, formater, element) {
\r
this.client = client;
\r
this.formater = formater;
\r
euphorik.Message = function(client, formater, element) {
\r
this.client = client;
\r
this.formater = formater;
\r
-
\r
+
\r
this.id = element.id;
\r
this.auteurId = element.user_id;
\r
this.racineId = element.root;
\r
this.date = element.date;
\r
this.id = element.id;
\r
this.auteurId = element.user_id;
\r
this.racineId = element.root;
\r
this.date = element.date;
\r
- this.
pseudo
= element.nick;
\r
+ this.
nick
= element.nick;
\r
this.login = element.login;
\r
this.contenu = element.content;
\r
this.login = element.login;
\r
this.contenu = element.content;
\r
-
\r
+
\r
// l'ensemble des id des messages qui reponde à ce message, exemple : {45:true, 32:true} (le 'true' ne sert à rien ^_^)
\r
// mis à jour au fur à mesure que des messages sont ajoutés aux conversations
\r
this.estReponduPar = {};
\r
// l'ensemble des id des messages qui reponde à ce message, exemple : {45:true, 32:true} (le 'true' ne sert à rien ^_^)
\r
// mis à jour au fur à mesure que des messages sont ajoutés aux conversations
\r
this.estReponduPar = {};
\r
-
\r
+
\r
this.appartientAuClient = element.owner;
\r
this.clientARepondu = element.answered;
\r
this.estUneReponse = element.is_a_reply;
\r
this.appartientAuClient = element.owner;
\r
this.clientARepondu = element.answered;
\r
this.estUneReponse = element.is_a_reply;
\r
@@
-65,7
+63,7
@@
euphorik.Message.prototype.getId = function(pre) {
euphorik.Message.prototype.setRepondA = function(repondAJSON) {
\r
var thisMessage = this;
\r
this.repondA = {};
\r
euphorik.Message.prototype.setRepondA = function(repondAJSON) {
\r
var thisMessage = this;
\r
this.repondA = {};
\r
-
\r
+
\r
repondAJSON.each(function(i, reponse) {
\r
thisMessage.repondA[reponse.id] = new euphorik.Reponse(reponse.id, reponse.nick, reponse.login);
\r
});
\r
repondAJSON.each(function(i, reponse) {
\r
thisMessage.repondA[reponse.id] = new euphorik.Reponse(reponse.id, reponse.nick, reponse.login);
\r
});
\r
@@
-83,7
+81,7
@@
euphorik.Message.prototype.getConversation = function(messages) {
// les messages faisant partie de la conversation
\r
var messagesEnEvidence = {};
\r
messagesEnEvidence[this.id] = 1;
\r
// les messages faisant partie de la conversation
\r
var messagesEnEvidence = {};
\r
messagesEnEvidence[this.id] = 1;
\r
-
\r
+
\r
// parcours en profondeur
\r
var f = function(ids, premierNiveau, ensemble, evidence) {
\r
objectEach(ids, function(id) {
\r
// parcours en profondeur
\r
var f = function(ids, premierNiveau, ensemble, evidence) {
\r
objectEach(ids, function(id) {
\r
@@
-96,13
+94,13
@@
euphorik.Message.prototype.getConversation = function(messages) {
}
\r
});
\r
};
\r
}
\r
});
\r
};
\r
-
\r
+
\r
// remonte le temps
\r
f(this.estReponduPar, true, "estReponduPar", 2);
\r
// remonte le temps
\r
f(this.estReponduPar, true, "estReponduPar", 2);
\r
-
\r
+
\r
// descent le temps
\r
// descent le temps
\r
- f(this.repondA, true, "repondA", 3);
\r
-
\r
+ f(this.repondA, true, "repondA", 3);
\r
+
\r
return messagesEnEvidence;
\r
};
\r
\r
return messagesEnEvidence;
\r
};
\r
\r
@@
-115,14
+113,14
@@
euphorik.Message.prototype.XHTML = function(messagePair, pre) {
messagePair = true;
\r
}
\r
pre = pre || "";
\r
messagePair = true;
\r
}
\r
pre = pre || "";
\r
-
\r
+
\r
thisMessage = this;
\r
thisMessage = this;
\r
-
\r
+
\r
// construit l'identifiant de la personne
\r
// construit l'identifiant de la personne
\r
- var identifiant =
\r
- this.client.nickFormat === "nick" || this.login === "" ? this.formater.
traitementComplet(this.pseudo) :
\r
- (this.client.nickFormat === "login" ? this.formater.
traitementComplet(this.login) :
\r
- this.formater.
traitementComplet(this.pseudo) + "<span class=\"login\">(" + this.formater.traitementComplet
(this.login) +")</span>" );
\r
+ var identifiant =
\r
+ this.client.nickFormat === "nick" || this.login === "" ? this.formater.
completeProcessing(this.nick) :
\r
+ (this.client.nickFormat === "login" ? this.formater.
completeProcessing(this.login) :
\r
+ this.formater.
completeProcessing(this.nick) + "<span class=\"login\">(" + this.formater.completeProcessing
(this.login) +")</span>" );
\r
\r
var XHTMLrepondA = "";
\r
var debut = true;
\r
\r
var XHTMLrepondA = "";
\r
var debut = true;
\r
@@
-130,13
+128,13
@@
euphorik.Message.prototype.XHTML = function(messagePair, pre) {
if (!debut) {
\r
XHTMLrepondA += ", ";
\r
}
\r
if (!debut) {
\r
XHTMLrepondA += ", ";
\r
}
\r
- XHTMLrepondA += thisMessage.formater.
traitementComplet(rep.pseudo
);
\r
+ XHTMLrepondA += thisMessage.formater.
completeProcessing(rep.nick
);
\r
debut = false;
\r
});
\r
if (XHTMLrepondA) {
\r
XHTMLrepondA = "<span class=\"repondA\">" + XHTMLrepondA + "</span><span class=\"delimitationRepondA\"></span>";
\r
}
\r
debut = false;
\r
});
\r
if (XHTMLrepondA) {
\r
XHTMLrepondA = "<span class=\"repondA\">" + XHTMLrepondA + "</span><span class=\"delimitationRepondA\"></span>";
\r
}
\r
-
\r
+
\r
return "<div id=\"" + this.getId(pre) + "\" class=\"" + (messagePair ? "messagePair" : "messageImpair") + " message" +
\r
(this.appartientAuClient ? " proprietaire" : "") +
\r
(this.clientARepondu ? " repondu" : "") +
\r
return "<div id=\"" + this.getId(pre) + "\" class=\"" + (messagePair ? "messagePair" : "messageImpair") + " message" +
\r
(this.appartientAuClient ? " proprietaire" : "") +
\r
(this.clientARepondu ? " repondu" : "") +
\r
@@
-146,10
+144,10
@@
euphorik.Message.prototype.XHTML = function(messagePair, pre) {
"\">" +
\r
"<span class=\"entete\">" +
\r
"<span class=\"dateComplete\">[<span class=\"date\">" + this.date + "</span>]</span>" +
\r
"\">" +
\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=\"
nick
\"><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=\"delimitationEntete\"></span>" +
\r
XHTMLrepondA +
\r
- "<span class=\"contenu\">" + this.formater.
traitementComplet(this.contenu, this.pseudo
) + "</span>" +
\r
+ "<span class=\"contenu\">" + this.formater.
completeProcessing(this.contenu, this.nick
) + "</span>" +
\r
"</div>";
\r
};
\r
"</div>";
\r
};
\r