X-Git-Url: http://git.euphorik.ch/?a=blobdiff_plain;f=js%2FpageMinichat.js;h=883d1da40be38439959bd2a96f1cf4c05f6d8743;hb=443f5b4f6ae102317e75582e33404a61507c5aac;hp=d6a4bf08f556843985077df04103c81b6ae592e6;hpb=531c70729709cd97024eb1c2ff3ed836db9f550e;p=euphorik.git

diff --git a/js/pageMinichat.js b/js/pageMinichat.js
index d6a4bf0..883d1da 100755
--- a/js/pageMinichat.js
+++ b/js/pageMinichat.js
@@ -19,8 +19,8 @@ PageMinichat.prototype.contenu = function()
 <form method="post" action="">\
    <p>\
       <input class="captcha" name="captcha" type="text" size="8" maxlength="8"></input>\
-      <input class="pseudo" name="pseudo" type="text" size="12" maxlength="50" value="&lt;nick&gt;"></input>\
-      <input class="message" name="message" type="text" size="80" maxlength="500" value=""></input>\
+      <input class="pseudo" name="pseudo" type="text" maxlength="50" value="&lt;nick&gt;"></input>\
+      <input class="message" name="message" type="text" maxlength="500" value=""></input>\
       <button class="smiles"></button>\
       <button class="return"></button>\
    </p>\
@@ -97,9 +97,12 @@ PageMinichat.prototype.charger = function()
    $("form button.smiles").hover(
       function(e)
       {
-         var offset = $(e.target).offset()
-         alert($("$smiles").width())
-         $("#smiles").css("top", offset.top).css("left", offset.left).show()
+         var position = $(e.target).offset()
+         // le décalage pour ne pas dépasser à droite (10 correspond à la marge pour éviter de coller le bord)
+         var decalage = $("body").width() - $("#smiles").width() - position.left - 10
+         decalage = decalage > 0 ? 0 : decalage
+         
+         $("#smiles").css("top", position.top).css("left", position.left + decalage).show()
       },
       function(e){}
    )
@@ -489,10 +492,10 @@ Conversation.prototype.flush = function(funClickOuvrirConv)
       if (this.messages[i].id > this.idDernierMessageAffiche)
       {      
          var message = this.messages[i]
-         
+        
          // construit l'identifiant de la personne
          var identifiant = 
-            this.client.nickFormat == "nick" ? this.formateur.traitementComplet(message.pseudo) : 
+            this.client.nickFormat == "nick" || message.login == "" ? this.formateur.traitementComplet(message.pseudo) : 
             (this.client.nickFormat == "login" ? this.formateur.traitementComplet(message.login) : 
             this.formateur.traitementComplet(message.pseudo) + "<span class=\"login\">(" + this.formateur.traitementComplet(message.login) +")</span>" )