projects
/
euphorik.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MOD avancement dans l'extraction d'une conversation entière
[euphorik.git]
/
js
/
pageMinichat.js
diff --git
a/js/pageMinichat.js
b/js/pageMinichat.js
index
50c6c21
..
ec745f3
100755
(executable)
--- a/
js/pageMinichat.js
+++ b/
js/pageMinichat.js
@@
-580,7
+580,7
@@
Conversation.prototype.flush = function(funClickOuvrirConv)
(this.messages[i].systeme ? " systeme" : "") +
(this.messages[i].ekMaster ? " ekMaster" : "") +
"\">" +
(this.messages[i].systeme ? " systeme" : "") +
(this.messages[i].ekMaster ? " ekMaster" : "") +
"\">" +
- "<div class=\"
extraire\"
></div><span class=\"entete\">" +
+ "<div class=\"
outilsMess\"><div class=\"extraire\"></div><div class=\"extraireCompletement\"></div
></div><span class=\"entete\">" +
"<span class=\"dateComplete\">[<span class=\"date\">" + message.date + "</span>]</span>" +
"<span class=\"pseudo\"><span class=\"id\" style=\"display: none\">" + message.auteurId + "</span class=\"ident\">" + identifiant + "</span></span><span class=\"delimitationEntete\"></span>" +
XHTMLrepondA +
"<span class=\"dateComplete\">[<span class=\"date\">" + message.date + "</span>]</span>" +
"<span class=\"pseudo\"><span class=\"id\" style=\"display: none\">" + message.auteurId + "</span class=\"ident\">" + identifiant + "</span></span><span class=\"delimitationEntete\"></span>" +
XHTMLrepondA +
@@
-604,7
+604,8
@@
Conversation.prototype.flush = function(funClickOuvrirConv)
}
)
}
)
- thisConversation.util.infoBulle("Extraction de la conversation", $(".extraire", this))
+ thisConversation.util.infoBulle("Extraction de la conversation à partir de ce message", $(".extraire", this))
+ thisConversation.util.infoBulle("Extraction de la conversation complète", $(".extraireCompletement", this))
// l'id du message
var idMess36 = $(this).attr("id").substr(4)
// l'id du message
var idMess36 = $(this).attr("id").substr(4)
@@
-732,16
+733,18
@@
Conversation.prototype.afficherConversation = function(id)
{
jq.removeClass("cache")
switch (statut)
{
jq.removeClass("cache")
switch (statut)
- {
+ {
\r
+ // "repondu" et "reponse" sont prioritaitres à "proprietaire"
\r
+ // contrairement à la vue normale (sans mise en évidence d'une conversation)
\r
+ case 3 :
\r
+ jq.addClass("repondu")
\r
+ break;
\r
+ case 2 :
\r
+ jq.addClass("reponse")
\r
+ break;
case 1 :
jq.addClass("proprietaire")
break;
case 1 :
jq.addClass("proprietaire")
break;
- case 2 :
- jq.addClass("reponse")
- break;
- case 3 :
- jq.addClass("repondu")
- break;
}
}
}
}
}
}
@@
-770,6
+773,7
@@
function Messages(client, formateur, util)
this.util = util
this.conversations = new Array() // les conversations, la première représente la conversation principale
this.util = util
this.conversations = new Array() // les conversations, la première représente la conversation principale
+
this.nouvelleConversation(0)
this.trollIdCourant = 0
this.nouvelleConversation(0)
this.trollIdCourant = 0
@@
-797,10
+801,17
@@
Messages.prototype.getJSONrafraichirMessages = function()
Messages.prototype.getJSONConversations = function()
{
Messages.prototype.getJSONConversations = function()
{
- var clientConv = this.client.getJSONConversations()
- for (var i = 1; i < this.conversations.length; i++)
+ var clientConv = []
+
+ for (var i = 0; i < this.client.conversations.length; i++)
{
{
- clientConv[i-1]["last_message_id"] = this.conversations[i].idDernierMessageAffiche
+ clientConv.push(
+ {
+ root : this.client.conversations[i].root,
+ page : this.client.conversations[i].page,
+ last_message_id : this.conversations[i + 1] == undefined ? 0 : this.conversations[i + 1].idDernierMessageAffiche
+ }
+ )
}
return clientConv
}
}
return clientConv
}
@@
-883,7
+894,8
@@
Messages.prototype.nouvelleConversation = function(num, funFermer, funLien)
{
var thisMessages = this
{
var thisMessages = this
- this.conversations[num] = new Conversation(num, this.util, this.formateur, this.client)
+ this.conversations[num] = new Conversation(num, this.util, this.formateur, this.client)
+
if (funFermer != undefined)
this.conversations[num].eventFermer(funFermer)
if (funLien != undefined)
if (funFermer != undefined)
this.conversations[num].eventFermer(funFermer)
if (funLien != undefined)