X-Git-Url: http://git.euphorik.ch/?a=blobdiff_plain;f=js%2FpageAdmin.js;h=fd1ddd46c665860ade0012916b574499afa5a3ac;hb=8bec0dac79e750d0040de8a009c6ae864479642e;hp=9be3ca13fa199c2373f7105e87bac7344f9211d4;hpb=3ea00589df90388456e8587b1bebdeab0f7e99fa;p=euphorik.git

diff --git a/js/pageAdmin.js b/js/pageAdmin.js
index 9be3ca1..fd1ddd4 100644
--- a/js/pageAdmin.js
+++ b/js/pageAdmin.js
@@ -208,14 +208,16 @@ Trolls.prototype.rafraichirTrolls = function()
                         {
                            $("span", troll).css("display", "none")
                            $(troll).append(
-                              '<form><p><input class="content" type="text" size="50" maxlength="500" value="' + $(".content", troll).html() + '"></input><button class="modifier">modifier</button><button class="annuler">annuler</button></p></form>'
+                              '<form><p><input class="content" type="text" size="50" maxlength="500" value="' +
+                              $(".contentPasFormate", troll).html() +
+                              '"></input><span class="modifier">modifier</span><span class="annuler">annuler</span></p></form>'
                            )
                            var virerLeFormulaire = function()
                            {
                               $("form", troll).remove()
-                              $("span", troll).css("display", "inline")
+                              $('span', troll).css("display", "inline")
                            }
-                           $("button.modifier", troll).click(
+                           $("span.modifier", troll).click(
                               function()
                               {
                                  var content = $("form input.content", troll).val()
@@ -223,7 +225,7 @@ Trolls.prototype.rafraichirTrolls = function()
                                  thisTrolls.modifier(id, content)
                               }
                            )
-                           $("button.annuler", troll).click( virerLeFormulaire )
+                           $("span.annuler", troll).click( virerLeFormulaire )
                            $("form", troll).submit(function(){ return false})
                         }  
                      )
@@ -234,7 +236,8 @@ Trolls.prototype.rafraichirTrolls = function()
                   thisTrolls.dernierTroll = data["trolls"][data["trolls"].length - 1]["troll_id"]
                break
             case "troll_modified" :
-               $("#trolls #troll" + data["troll_id"] + " .content").html(data["content"])
+               $("#trolls #troll" + data["troll_id"] + " .content").html(thisTrolls.formateur.traitementComplet(data["content"], $("#trolls #troll" + data["troll_id"] + " .author").html()))
+               $("#trolls #troll" + data["troll_id"] + " .contentPasFormat").html(data["content"])
                break
             case "troll_deleted" :
                $("#trolls #troll"+data["troll_id"]).remove()