X-Git-Url: http://git.euphorik.ch/?a=blobdiff_plain;ds=inline;f=js%2FpageMinichat.js;h=8adcd87a1a60ae16fdb1ad3c358bf1be74ae8022;hb=e97e239aa43c3c4094436c1a41a43b0d069c605b;hp=541c98081d50e78302367c77c3ba70065bc4211b;hpb=934ab32cd6fac44f6b3ebedef69ce1ccd0b8701b;p=euphorik.git
diff --git a/js/pageMinichat.js b/js/pageMinichat.js
index 541c980..8adcd87 100755
--- a/js/pageMinichat.js
+++ b/js/pageMinichat.js
@@ -1,4 +1,20 @@
-// coding: utf-8
+// coding: utf-8
+// Copyright 2008 Grégory Burri
+//
+// This file is part of Euphorik.
+//
+// Euphorik is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Euphorik is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Euphorik. If not, see .
function PageMinichat(client, formateur, util)
{
@@ -226,14 +242,7 @@ PageMinichat.prototype.envoyerMessage = function(pseudo, message)
// met à jour la classe des messages auquel repond celui ci (c'est un peu de la triche)
for (var i = 0; i < repondA.length; i++)
- {
$("#conversations div#" + repondA[i]).addClass("repondu")
- /* Ca sert à rien, TODO : tester/virer
- for (var c = 0; c < thisPageMinichat.messages.conversations.length; c++)
- for (var m = 0; m < thisPageMinichat.messages.conversations[c].messages.length; m++)
- thisPageMinichat.messages.conversations[c].messages[m].clientARepondu = true
- */
- }
}
else if (data["reply"] == "error")
{
@@ -514,24 +523,25 @@ Conversation.prototype.flush = function(funClickOuvrirConv)
"\">" +
"
" +
"[" + message.date + "]" +
- "" + message.auteurId + "" + identifiant + ":" +
+ "" + message.auteurId + "" + identifiant + ":" +
XHTMLrepondA +
- "" + (message.systeme ? this.formateur.remplacerBalisesHTML(message.contenu) : this.formateur.traitementComplet(message.contenu, message.pseudo)) + "" +
+ "" + this.formateur.traitementComplet(message.contenu, message.pseudo) + "" +
""
messagePair = !messagePair
}
- $("#conversations #" + this.getId()).prepend(XHTML)
-
// enlève les messages exedentaires
var nbMessagesAffiche = $("#conversations #" + this.getId() + " .message").size()
if (nbMessagesAffiche > this.nbMessageMax)
$("#conversations #" + this.getId() + " .message").slice(this.nbMessageMax, nbMessagesAffiche).empty()
-
- // ajoute les événements liés à chaque nouveau message
- $("#conversations #" + this.getId() + " .message").filter(function(){return parseInt($(this).attr("id").substr(4), 36) > thisConversation.idDernierMessageAffiche}).each(
+
+
+ //.filter(function(){ return parseInt($(this).attr("id").substr(4), 36) > thisConversation.idDernierMessageAffiche })
+
+ var DOM = $(XHTML)
+ DOM.each(
function()
{
$(".lienConv", this).click(
@@ -599,7 +609,7 @@ Conversation.prototype.flush = function(funClickOuvrirConv)
var valCourant = $("input.message").val()
if (valCourant == undefined) valCourant = ""
- var tag = $(".pseudo", this).text() + "{" + idMess + "}" + ">"
+ var tag = $(".pseudo span.ident", this).text() + "{" + idMess + "}" + ">"
if (valCourant.indexOf(tag, 0) == -1)
$("input.message").val(tag + " " + valCourant)
thisConversation.util.setCaretToEnd($("form input.message")[0])
@@ -619,6 +629,7 @@ Conversation.prototype.flush = function(funClickOuvrirConv)
)
}
)
+ DOM.prependTo("#conversations #" + this.getId())
if (this.messages.length > 0)
this.idDernierMessageAffiche = this.messages[this.messages.length-1].id
@@ -840,8 +851,9 @@ Messages.prototype.supprimerConversation = function(num)
* Ajuste la largeur des conversations en fonction de leur nombre. modifie l'attribut CSS 'width'.
*/
Messages.prototype.ajusterLargeurConversations = function()
-{
- $("#conversations .conversation").css("width", 100 / this.conversations.length + "%")
+{
+ // le "- 0.01" evite que IE se chie dessus lamentablement et affiche les conversations les unes au dessus des autres
+ $("#conversations .conversation").css("width", (100 / this.conversations.length) - 0.01 + "%")
}
/**
@@ -913,7 +925,13 @@ Messages.prototype.rafraichirMessages = function(vider)
{
case "new_troll" :
thisMessages.trollIdCourant = data["troll_id"]
- $("#trollCourant .troll").html(thisMessages.formateur.traitementComplet(data["content"]))
+ $("#trollCourant .troll").html(thisMessages.formateur.traitementComplet(data["content"])).unbind().click(
+ function()
+ {
+ thisMessages.ouvrirConversation(data["message_id"])
+ }
+ )
+
$("#trollCourant .troll a[@rel*=lightbox]").lightBox()
break