projects
/
euphorik.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
FIX plein de bugs introduits avec la Grand Restructuration
[euphorik.git]
/
js
/
pageMinichat
/
conversations.js
diff --git
a/js/pageMinichat/conversations.js
b/js/pageMinichat/conversations.js
index
d5a40e6
..
277726d
100644
(file)
--- a/
js/pageMinichat/conversations.js
+++ b/
js/pageMinichat/conversations.js
@@
-57,12
+57,12
@@
euphorik.Conversations.prototype.toggleMessageRepond = function(mess) {
};
\r
\r
/**
\r
};
\r
\r
/**
\r
- * Enlève tous les messages auquel l'utilisateur souhaite répond.
\r
+ * Enlève tous les messages auquel l'utilisateur souhaite répond
re
.
\r
*/
\r
euphorik.Conversations.prototype.enleverMessagesRepond = function() {
\r
var thisConversations = this;
\r
\r
*/
\r
euphorik.Conversations.prototype.enleverMessagesRepond = function() {
\r
var thisConversations = this;
\r
\r
- objectEach(function(messId, mess) {
\r
+ objectEach(
this.messagesRepond,
function(messId, mess) {
\r
thisConversations.enleverMessageRepond(mess);
\r
});
\r
\r
thisConversations.enleverMessageRepond(mess);
\r
});
\r
\r
@@
-93,12
+93,12
@@
euphorik.Conversations.prototype.ajouterMessageRepond = function(mess) {
var mess2;
\r
for (mess2 in this.messagesRepond) {
\r
if (this.messagesRepond.hasOwnProperty(mess2)) {
\r
var mess2;
\r
for (mess2 in this.messagesRepond) {
\r
if (this.messagesRepond.hasOwnProperty(mess2)) {
\r
+ mess2 = this.messagesRepond[mess2];
\r
break;
\r
}
\r
}
\r
break;
\r
}
\r
}
\r
- mess2 = this.messagesRepond[mess2];
\r
\r
\r
- if (
!
mess2 && mess2.racineId !== mess.racineId) {
\r
+ if (mess2 && mess2.racineId !== mess.racineId) {
\r
this.util.messageDialogue("Impossible de répondre à deux messages ne faisant pas partie de la même conversation");
\r
return;
\r
}
\r
this.util.messageDialogue("Impossible de répondre à deux messages ne faisant pas partie de la même conversation");
\r
return;
\r
}
\r
@@
-156,7
+156,7
@@
euphorik.Conversations.prototype.rafraichireNombreMessagesRepond = function() {
*/
\r
euphorik.Conversations.prototype.afficherMessagesRepondConversations = function() {
\r
var expr = "";
\r
*/
\r
euphorik.Conversations.prototype.afficherMessagesRepondConversations = function() {
\r
var expr = "";
\r
- objectEach(function(messId, mess) {
\r
+ objectEach(
this.messagesRepond,
function(messId, mess) {
\r
expr += "#" + mess.getId() + ",";
\r
});
\r
$(expr).addClass("repondEnEvidence");
\r
expr += "#" + mess.getId() + ",";
\r
});
\r
$(expr).addClass("repondEnEvidence");
\r
@@
-182,13
+182,14
@@
euphorik.Conversations.prototype.getJSONrafraichirMessages = function() {
};
\r
\r
euphorik.Conversations.prototype.getJSONConversations = function() {
\r
};
\r
\r
euphorik.Conversations.prototype.getJSONConversations = function() {
\r
+ var thisConversations = this
\r
var clientConv = [];
\r
\r
this.client.conversations.each(function(i, conv) {
\r
clientConv.push({
\r
root : conv.root,
\r
page : conv.page,
\r
var clientConv = [];
\r
\r
this.client.conversations.each(function(i, conv) {
\r
clientConv.push({
\r
root : conv.root,
\r
page : conv.page,
\r
- last_message_id : this
.conversations[i + 1] ? thi
s.conversations[i + 1].idDernierMessageAffiche : 0
\r
+ last_message_id : this
Conversations.conversations[i + 1] ? thisConversation
s.conversations[i + 1].idDernierMessageAffiche : 0
\r
});
\r
});
\r
return clientConv;
\r
});
\r
});
\r
return clientConv;
\r