X-Git-Url: http://git.euphorik.ch/?p=euphorik.git;a=blobdiff_plain;f=js%2FpageAdmin.js;h=608a7ec1b95c9351177980640f687fb32ab22877;hp=9ce1620fe7b4ffe974bacbec8b97d1c63a64d138;hb=5dc140390551c133ac5525725a86854ca69679af;hpb=09608ab29e1c39ea51b51a5f8669dcde36efb306

diff --git a/js/pageAdmin.js b/js/pageAdmin.js
index 9ce1620..608a7ec 100644
--- a/js/pageAdmin.js
+++ b/js/pageAdmin.js
@@ -22,16 +22,16 @@
 
 
 euphorik.PageAdmin = function(client, formater, util, communication) {
-   this.nom = "admin";
+   this.name = "admin";
    
    this.client = client;
-   this.formater = formateur;
+   this.formater = formater;
    this.util = util;
    this.communication = communication;
    
-   this.comet = new Comet("admin", euphorik.conf.versionProtocole);
+   this.comet = this.communication.createCometConnection("admin");
    
-   // le timer qui rappelle periodiquement le rafraichissement des IP bannies
+   // a timer which will periodically refresh the banned IP list
    this.timeoutIDmajIPs = null;
 };
 
@@ -99,7 +99,7 @@ euphorik.PageAdmin.prototype.posterTroll = function() {
    
    content = content.trim();
    if (content === "") {
-      this.util.messageDialogue("Le troll est vide");
+      this.util.messageDialog("Le troll est vide");
       return;
    }
 
@@ -134,8 +134,8 @@ euphorik.PageAdmin.prototype.majIPs = function() {
                '</span>|';
             ip.users.each(function(j, user) {
                XHTML += (j > 0 ? ", " : "") +
-                  '<span class="pseudo">' + thisPageAdmin.formater.traitementComplet(user.nick) + '</span>' +
-                  (user.login === "" ? "" : '<span class="login">(' + thisPageAdmin.formater.traitementComplet(user.login) + ')</span>');
+                  '<span class="nick">' + thisPageAdmin.formater.completeProcessing(user.nick) + '</span>' +
+                  (user.login === "" ? "" : '<span class="login">(' + thisPageAdmin.formater.completeProcessing(user.login) + ')</span>');
             });
             XHTML += '<span class="deban">débannir</span></div>';
          });
@@ -150,7 +150,7 @@ euphorik.PageAdmin.prototype.majIPs = function() {
             var ip = $(".ip", this).html();
             $(".deban", this).click(
                function() {
-                  thisPageAdmin.util.messageDialogue("Êtes-vous sur de vouloir débannir l'IP ''" + ip + "'' ?", euphorik.Util.messageType.question,
+                  thisPageAdmin.util.messageDialog("Êtes-vous sur de vouloir débannir l'IP ''" + ip + "'' ?", euphorik.Util.messageType.question,
                      {"Oui" : function() {
                            thisPageAdmin.deban(ip);
                         },
@@ -195,7 +195,7 @@ euphorik.PageAdmin.prototype.waitEvent = function() {
          "banned_ips_refresh" : function(data){ thisPageAdmin.majIPs(); },
          "error" :
             function(data) {
-               thisTrolls.util.messageDialogue(data.error_message);
+               thisTrolls.util.messageDialog(data.error_message);
             }
       }
    );
@@ -234,8 +234,8 @@ euphorik.Trolls.prototype.ajouterTrollEvent = function(data) {
       
       XHTML +=
          '<div id="troll' + trollId + '" class="troll">' +
-         '<span class="content">' + thisTrolls.formater.traitementComplet(troll.content, troll.author) + '</span>' +
-         '<span class="author"> - ' + thisTrolls.formater.traitementComplet(troll.author) + '</span>' +
+         '<span class="content">' + thisTrolls.formater.completeProcessing(troll.content, troll.author) + '</span>' +
+         '<span class="author"> - ' + thisTrolls.formater.completeProcessing(troll.author) + '</span>' +
          (trollData.author_id === thisTrolls.client.id ? '<span class="editTroll">éditer</span><span class="delTroll">Supprimer</span>' : '') +
          '</div>';
    });
@@ -257,7 +257,7 @@ euphorik.Trolls.prototype.ajouterTrollEvent = function(data) {
          
          $(".delTroll", this).click(
             function() {
-               thisTrolls.util.messageDialogue(
+               thisTrolls.util.messageDialog(
                   "Êtes-vous sur de vouloir supprimer le troll \"" + thisTrolls.trolls[id].content + "\" ?",
                   euphorik.Util.messageType.question,
                   {
@@ -305,7 +305,7 @@ euphorik.Trolls.prototype.ajouterTrollEvent = function(data) {
 
 euphorik.Trolls.prototype.modifierTrollEvent = function(data) {
    var thisTrolls = this;
-   $("#trolls #troll" + data.troll_id + " .content").html(thisTrolls.formater.traitementComplet(data.content, thisTrolls.trolls[data.troll_id].author));
+   $("#trolls #troll" + data.troll_id + " .content").html(thisTrolls.formater.completeProcessing(data.content, thisTrolls.trolls[data.troll_id].author));
    $("#trolls #troll" + data.troll_id + " a[@rel*=lightbox]").lightBox();
    thisTrolls.trolls[data.troll_id].content = data.content;
 };