X-Git-Url: http://git.euphorik.ch/?a=blobdiff_plain;f=js%2FpageMinichat.js;h=e006f3c01194cf7c91034c441c80b9c13a80ae0b;hb=327c3bd99f586f3cf3af55f9adb10a71eb78cdd4;hp=d940421ffc6d4053be91206b9eaae3168f168109;hpb=d5325d38a2655d2368aa576d6390cb766ce6cc06;p=euphorik.git

diff --git a/js/pageMinichat.js b/js/pageMinichat.js
index d940421..e006f3c 100755
--- a/js/pageMinichat.js
+++ b/js/pageMinichat.js
@@ -46,7 +46,7 @@ PageMinichat.prototype.charger = function()
    {    
       $("body").append(
          '<div id="outilsBan">' +
-         '<form><p><input id="raison" name="raison" type="text" size="10" maxlength="200"></input></p></form>' +
+         '<form action=""><p><input id="raison" name="raison" type="text" size="10" maxlength="200"></input></p></form>' +
          '<img id="ban" src="img/ban.gif" alt="Ban de 3 jours" />' +
          '<img id="kick" src="img/kick.gif" alt="Ban de 15min" />' +
          '<img id="slap" src="img/slap.gif" alt="Avertissement" />' +
@@ -505,7 +505,7 @@ Conversation.prototype.flush = function(funClickOuvrirConv)
          XHTMLrepondA = "<span class=\"repondA\">" + XHTMLrepondA + "</span>"
          
          XHTML += 
-            "<div id=\"" + message.id.toString(36) + "\" class=\"" + (messagePair ? "messagePair" : "messageImpair") + " message" +
+            "<div id=\"mess" + message.id.toString(36) + "\" class=\"" + (messagePair ? "messagePair" : "messageImpair") + " message" +
                (this.messages[i].appartientAuClient ? " proprietaire" : "")  +
                (this.messages[i].clientARepondu ? " repondu" : "") +
                (this.messages[i].estUneReponse ? " reponse" : "") +
@@ -514,9 +514,9 @@ Conversation.prototype.flush = function(funClickOuvrirConv)
             "\">" +
                "<div class=\"extraire\">&gt;</div>" +
                "[<span class=\"date\">" + message.date + "</span>]" +
-               "<span class=\"pseudo\" id=\"user" + message.auteurId + "\">" + identifiant + "</span>:" +
+               "<span class=\"pseudo\"><span class=\"id\" style=\"display: none\">" + message.auteurId + "</span class=\"ident\">" + identifiant + "</span>:" +
                XHTMLrepondA +
-               "<span class=\"contenu\">" + (message.systeme ? this.formateur.remplacerBalisesHTML(message.contenu) : this.formateur.traitementComplet(message.contenu, message.pseudo)) + "</span>" +
+               "<span class=\"contenu\">" + this.formateur.traitementComplet(message.contenu, message.pseudo) + "</span>" +
             "</div>"
             
          messagePair = !messagePair
@@ -531,7 +531,7 @@ Conversation.prototype.flush = function(funClickOuvrirConv)
       $("#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"), 36) > thisConversation.idDernierMessageAffiche}).each(
+   $("#conversations #" + this.getId() + " .message").filter(function(){ return parseInt($(this).attr("id").substr(4), 36) > thisConversation.idDernierMessageAffiche }).each(
       function()
       {
          $(".lienConv", this).click(
@@ -551,7 +551,7 @@ Conversation.prototype.flush = function(funClickOuvrirConv)
             $(".pseudo", this).hover(
                function(e)
                {     
-                  var userId =  parseInt($(this).attr("id").substr(4))
+                  var userId =  parseInt($(".id", this).text())
                   var element = $(this)
                   var h = element.height()
                   var offset = element.offset()
@@ -588,7 +588,7 @@ Conversation.prototype.flush = function(funClickOuvrirConv)
                if ($(event.target).is("a")) return
                
                // l'id du message
-               var idMess = $(this).attr("id")
+               var idMess = $(this).attr("id").substr(4)
                
                // extraction d'une conversation
                if ($(event.target).is(".extraire"))
@@ -599,7 +599,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])
@@ -632,7 +632,7 @@ Conversation.prototype.flush = function(funClickOuvrirConv)
 Conversation.prototype.afficherConversation = function(element)
 {
    // cherche le message selectionné
-   var id = parseInt($(element).attr("id"), 36)
+   var id = parseInt($(element).attr("id").substr(4), 36)
    
    var message = this.messagesParId[id]
    if (message == undefined) return
@@ -644,7 +644,7 @@ Conversation.prototype.afficherConversation = function(element)
       function()
       {
          var jq = $(this)
-         if (!mess.hasOwnProperty(parseInt(jq.attr("id"), 36)))
+         if (!mess.hasOwnProperty(parseInt(jq.attr("id").substr(4), 36)))
             jq.addClass("cache")
          else         
             jq.removeClass("cache")
@@ -717,8 +717,8 @@ Messages.prototype.getJSONConversations = function()
   */
 Messages.prototype.ajouterMessages = function(elements, numConversation)
 {
-   if (elements["messages"].length == 0 && typeof(this.conversations[numConversation]) == "undefined")
-      return false
+   if (elements["messages"].length == 0)
+      return this.conversations[numConversation] != undefined
 
    for (var i = 0; i < elements["messages"].length; i++)
       this.ajouterMessage(elements["messages"][i], numConversation)