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

diff --git a/js/pageMinichat.js b/js/pageMinichat.js
index d940421..0ba6dc6 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 <http://www.gnu.org/licenses/>.
  
 function PageMinichat(client, formateur, util)
 {
@@ -46,7 +62,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" />' +
@@ -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")
             {
@@ -505,7 +514,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 +523,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 +540,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 +560,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 +597,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 +608,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 +641,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 +653,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 +726,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)
@@ -840,8 +849,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 +923,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