X-Git-Url: http://git.euphorik.ch/?a=blobdiff_plain;f=js%2FpageMinichat.js;h=3e3055430bbfd0a169f9d463f0343c8e93d4e7cc;hb=0b34258466c58a805a2cbfe7ef134385b26fed94;hp=ec00d7b36d345e8d538f71878c81469f4bbf8972;hpb=35838780dce22af9f2dc80af9149a30a0433de0a;p=euphorik.git

diff --git a/js/pageMinichat.js b/js/pageMinichat.js
index ec00d7b..3e30554 100755
--- a/js/pageMinichat.js
+++ b/js/pageMinichat.js
@@ -155,13 +155,17 @@ PageMinichat.prototype.envoyerMessage = function(pseudo, message)
          url : "request", 
          type: "POST",
          data : this.util.jsonVersAction(this.getJSONMessage(pseudo, message, repondA)),
-         dataType : "json",
+         dataType : "json",
+         beforeSend : function(xmlHttpRequest)
+         {
+            xmlHttpRequest.setRequestHeader("X-Requested-With", "")
+         },
          success : function(data, textStatus)
          {
             ;;; dumpObj(data)
          
             if(data["reply"] == "ok")
-            {
+            {  
                jQuery("form input.message").val("")
                         
                // met à jour la classe des messages auquel repond celui ci (c'est un peu de la triche)
@@ -409,20 +413,29 @@ Conversation.prototype.flush = function(funClickExtract, funClickLienConv)
    var idDernierMessageAffiche = jQuery("#conversations #" + this.getId() + " div:first").attr("id")
    idDernierMessageAffiche = (idDernierMessageAffiche == undefined ? 0 : parseInt(idDernierMessageAffiche, 36))
       
+   // est-ce que le prochain message est pair ? (permet d'alterner le style des messages)
+   var messagePair = (idDernierMessageAffiche == 0 ? true :
+      (jQuery("#conversations #" + this.getId() + " div:first").attr("class").search("messagePair") == -1)
+   )
+      
    // construction de l'XHTML des messages
    var XHTML = ""
    for (var i = this.messages.length - 1; i >= 0; i--)
       if (this.messages[i].id > idDernierMessageAffiche)
       {
          var message = this.messages[i]
+         
          var XHTMLrepondA = ""
          for (var id in message.repondA)
             XHTMLrepondA += this.formateur.traitementComplet(message.repondA[id].pseudo) + "> "
          XHTMLrepondA = "<span class=\"repondA\">" + XHTMLrepondA + "</span>"
          
          XHTML += 
-            "<div id=\"" + message.id.toString(36) + "\" class=\"" + (message.id % 2 == 0 ? "messagePair" : "messageImpair") + " message" +
-               (this.messages[i].appartientAuClient ? " proprietaire" : "")  + (this.messages[i].clientARepondu ? " repondu" : "") + (this.messages[i].estUneReponse ? " reponse" : "") + (this.messages[i].systeme ? " systeme" : "") +
+            "<div id=\"" + message.id.toString(36) + "\" class=\"" + (messagePair ? "messagePair" : "messageImpair") + " message" +
+               (this.messages[i].appartientAuClient ? " proprietaire" : "")  +
+               (this.messages[i].clientARepondu ? " repondu" : "") +
+               (this.messages[i].estUneReponse ? " reponse" : "") +
+               (this.messages[i].systeme ? " systeme" : "") +
             "\">" +
                "<div class=\"extraire\">&gt;</div>" +
                "[<span class=\"date\">" + message.date + "</span>]" +
@@ -430,6 +443,8 @@ Conversation.prototype.flush = function(funClickExtract, funClickLienConv)
                XHTMLrepondA +
                "<span class=\"contenu\">" + (message.systeme ? this.formateur.remplacerBalisesHTML(message.contenu) : this.formateur.traitementComplet(message.contenu, message.pseudo)) + "</span>" +
             "</div>"
+            
+         messagePair = !messagePair
       }
       
    jQuery("#conversations #" + this.getId()).prepend(XHTML)
@@ -626,7 +641,7 @@ Messages.prototype.ajouterMessage = function(element, numConversation)
          {
                thisPage.util.replaceSelection(
                   jQuery("form input.message")[0],
-                  "{" + thisMessages.client.conversations[num-1].racine + "}"
+                  "{" + thisMessages.client.conversations[num-1].root + "}"
                )
          }
       )