X-Git-Url: http://git.euphorik.ch/?p=euphorik.git;a=blobdiff_plain;f=js%2FpageProfile.js;h=d77231750ba52ecfea66874937de1eda7b770772;hp=eaae93bea3f495b4698ab8cdce24ab5d3b937dfb;hb=972919ab7f5651cd721eb6eec75f7150fdeaf347;hpb=30d42cfc83fbf3ebf24dec3e750257b3f174f290

diff --git a/js/pageProfile.js b/js/pageProfile.js
index eaae93b..d772317 100755
--- a/js/pageProfile.js
+++ b/js/pageProfile.js
@@ -16,158 +16,164 @@
 // You should have received a copy of the GNU General Public License
 // along with Euphorik.  If not, see <http://www.gnu.org/licenses/>.
 
-function PageProfile(client, formateur, util)
-{
-   this.nom = "profile"
+euphorik.PageProfile = function(client, formateur, util) {
+   this.nom = "profile";
    
-   this.client = client
-   this.formateur = formateur
-   this.util = util
-}
+   this.client = client;
+   this.formateur = formateur;
+   this.util = util;
+};
 
-PageProfile.prototype.contenu = function()
-{
+euphorik.PageProfile.prototype.contenu = function() {
    // pourquoi ?
-   return ""
-}
+   return "";
+};
 
-PageProfile.prototype.charger = function()
-{
-   $("#page").html(this.getHTML())
+euphorik.PageProfile.prototype.charger = function() {
+   $("#page").html(this.getHTML());
    
    // en fonction du statut
-   if (this.client.authentifie())
-      this.chargerProfile()
-   else
-      this.chargerLogin()
+   if (this.client.authentifie()) {
+      this.chargerProfile();
+   } else {
+      this.chargerLogin();
+   }
       
-   $("#page form#profile").submit(function(){return false})
-}
+   $("#page form#profile").submit(function(){ return false; });
+};
 
-PageProfile.prototype.chargerProfile = function()
-{ 
-   var thisPage = this
+euphorik.PageProfile.prototype.chargerProfile = function() { 
+   var thisPage = this;
    
-   $("form#profile input.login").val(this.client.login)
-   $("form#profile input.pseudo").val(this.client.pseudo)
-   $("form#profile input.email").val(this.client.email)
-   $("form#profile input#viewTooltips").attr("checked", this.client.viewTooltips)
-   $("form#profile input#viewTimes").attr("checked", this.client.viewTimes)
+   $("form#profile input.login").val(this.client.login);
+   $("form#profile input.pseudo").val(this.client.pseudo);
+   $("form#profile input.email").val(this.client.email);
+   $("form#profile input#viewTooltips").attr("checked", this.client.viewTooltips);
+   $("form#profile input#viewTimes").attr("checked", this.client.viewTimes);
    
-   $("form#profile select#degreeOstentatoire option").removeAttr("selected")
-   $("form#profile select#degreeOstentatoire option[value=" + this.client.ostentatiousMaster + "]").attr("selected", "selected")
+   $("form#profile select#chatOrder option").removeAttr("selected");
+   $("form#profile select#chatOrder option[value=" + this.client.chatOrder + "]").attr("selected", "selected");
    
-   $("form#profile select#affichagePseudo option").removeAttr("selected")
-   $("form#profile select#affichagePseudo option[value=" + this.client.nickFormat + "]").attr("selected", "selected")
+   $("form#profile select#affichagePseudo option").removeAttr("selected");
+   $("form#profile select#affichagePseudo option[value=" + this.client.nickFormat + "]").attr("selected", "selected");
+    
+   if (this.client.ostentatiousMaster) {
+       $("form#profile select#degreeOstentatoire option").removeAttr("selected");
+       $("form#profile select#degreeOstentatoire option[value=" + this.client.ostentatiousMaster + "]").attr("selected", "selected");
+   }
 
    $("form#profile button").click(
-      function()
-      {
-         thisPage.client.pseudo = thisPage.formateur.filtrerInputPseudo($("form#profile input.pseudo").val())
-         thisPage.client.email = $("form#profile input.email").val()
-         thisPage.client.nickFormat = $("form#profile select#affichagePseudo option:selected").attr("value") 
-         thisPage.client.ostentatiousMaster = $("form#profile select#degreeOstentatoire option:selected").attr("value") 
-         thisPage.client.viewTooltips = $("form#profile input#viewTooltips").attr("checked")
-         thisPage.client.viewTimes = $("form#profile input#viewTimes").attr("checked")
+      function() {
+         thisPage.client.pseudo = thisPage.formateur.filtrerInputPseudo($("form#profile input.pseudo").val());
+         thisPage.client.email = $("form#profile input.email").val();
+         thisPage.client.chatOrder = $("form#profile select#chatOrder option:selected").attr("value");
+         thisPage.client.nickFormat = $("form#profile select#affichagePseudo option:selected").attr("value");
+         if (thisPage.client.ekMaster) {
+            thisPage.client.ostentatiousMaster = $("form#profile select#degreeOstentatoire option:selected").attr("value");
+         }
+         thisPage.client.viewTooltips = $("form#profile input#viewTooltips").attr("checked");
+         thisPage.client.viewTimes = $("form#profile input#viewTimes").attr("checked");
          
-         var password = $("form#profile input.password").val()
-         var passwordRe = $("form#profile input.passwordRe").val()  
-         if (password != "" || passwordRe != "")
-         {
-            if (password != passwordRe)
-            {            
-               thisPage.util.messageDialogue("Les mots de passes ne correspondent pas")
-               return
+         var password = $("form#profile input.password").val();
+         var passwordRe = $("form#profile input.passwordRe").val();
+         if (password !== "" || passwordRe !== "") {
+            if (password !== passwordRe) {            
+               thisPage.util.messageDialogue("Les mots de passes ne correspondent pas");
+               return;
             }
-            thisPage.client.password = thisPage.util.md5(password)
+            thisPage.client.password = thisPage.util.md5(password);
          }
          
-         if(!thisPage.client.flush())
-            thisPage.util.messageDialogue("Impossible de mettre à jour votre profile, causes inconnues", messageType.erreur)
-         else
-         {
-            thisPage.util.messageDialogue("Votre profile a été mis à jour")
-            thisPage.pages.afficherPage("minichat")
+         if(!thisPage.client.flush()) {
+            thisPage.util.messageDialogue("Impossible de mettre à jour votre profile, causes inconnues", euphorik.Util.messageType.erreur);
+         } else { 
+            thisPage.util.messageDialogue("Votre profile a été mis à jour");
+            thisPage.pages.afficherPage("minichat");
          }
       }
-   )
-}
+   );
+};
 
-PageProfile.prototype.chargerLogin = function()
-{   
-   var thisPage = this
+euphorik.PageProfile.prototype.chargerLogin = function() {   
+   var thisPage = this;
 
    $("#page form#profile button").click(
-      function()
-      {
-         if(thisPage.client.connexionLogin($("form#profile input.login").val(), thisPage.util.md5($("form#profile input.password").val())))
-         {
+      function() {
+         if(thisPage.client.connexionLogin($("form#profile input.login").val(), thisPage.util.md5($("form#profile input.password").val()))) {
             // TODO afficher un message "ok"
-            thisPage.pages.afficherPage("minichat")
+            thisPage.pages.afficherPage("minichat");
          }
       }
-   )
-}
-
-PageProfile.prototype.getHTML = function()
-{
-return '\
-<form action="" id="profile" >\
- <table>\
-  <tr>\
-   <td>login</td>\
-   <td><input class="login" type="text" size="20" maxlength="20" ' + (this.client.authentifie() ? 'readonly="readonly"' : '') + ' /></td>\
-  </tr>\
-  <tr>\
-   <td>password</td>\
-   <td><input class="password" type="password" size="20" maxlength="20"/></td>\
-  </tr>' + 
-  (this.client.authentifie() ? '\
-  <tr>\
-   <td>password re</td>\
-   <td><input class="passwordRe" type="password" size="20" maxlength="20"/></td>\
-  </tr>\
-  <tr>\
-   <td>pseudo</td>\
-   <td><input class="pseudo" type="text" size="40" maxlength="20"/></td>\
-  </tr>\
-  <tr>\
-   <td>e-mail</td>\
-   <td><input class="email" type="text" size="40" maxlength="100"/></td>\
-  </tr>\
-  <tr>' +
-   (this.client.ekMaster ? '<td>Degrée d\'ostentation</td>\
-   <td>\
-    <select id="degreeOstentatoire">\
-     <option value="invisible">Nul</option>\
-     <option value="light">Faible</option>\
-     <option value="heavy">Élevé</option>\
-    </select>\
-   </td>' : '') +
-  '</tr>\
-  <tr>\
-   <td>Affichage des identifiants</td>\
-   <td>\
-    <select id="affichagePseudo">\
-     <option value="nick">Pseudo</option>\
-     <option value="login">Login</option>\
-     <option value="nick_login">Pseudo(Login)</option>\
-    </select>\
-   </td>\
-  </tr>\
-  <tr>\
-   <td>Afficher les infos bulles</td>\
-   <td><input type="checkbox" id="viewTooltips" /></td>\
-  </tr>\
-  <tr>\
-   <td>Afficher les dates</td>\
-   <td><input type="checkbox" id="viewTimes" /></td>\
-  </tr>' : '') + '\
-  <tr>\
-   <td></td>\
-   <td><button>Valider</button>\
-  </tr>\
- </table>\
-</form>' 
-}
+   );
+};
 
+euphorik.PageProfile.prototype.getHTML = function() {
+   return '<form action="" id="profile" >' +
+      ' <table>' +
+      '  <tr>' +
+      '   <td>login</td>' +
+      '   <td><input class="login" type="text" size="20" maxlength="20" ' + (this.client.authentifie() ? 'readonly="readonly"' : '') + ' /></td>' +
+      (this.client.authentifie() ? '' : '   <td>(sensible à la <a href="http://fr.wikipedia.org/wiki/Casse_(informatique)">casse</a>)</td>') +
+      '  </tr>' +
+      '  <tr>' +
+      '   <td>password</td>' +
+      '   <td><input class="password" type="password" size="20" maxlength="20"/></td>' +
+      '  </tr>' + 
+      (this.client.authentifie() ? '' +
+         '  <tr>' +
+         '   <td>password re</td>' +
+         '   <td><input class="passwordRe" type="password" size="20" maxlength="20"/></td>' +
+         '  </tr>' +
+         '  <tr>' +
+         '   <td>pseudo</td>' +
+         '   <td><input class="pseudo" type="text" size="40" maxlength="20"/></td>' +
+         '  </tr>' +
+         '  <tr>' +
+         '   <td>e-mail</td>' +
+         '   <td><input class="email" type="text" size="40" maxlength="100"/></td>' +
+         '  </tr>' +
+         '  <tr>' +
+         '   <td>Ordre des messages</td>' +
+         '   <td>' +
+         '    <select id="chatOrder">' +
+         '     <option value="chrono">Chronologique</option>' +
+         '     <option value="reverse">Anti-chronologique</option>' +
+         '    </select>' +
+         '   </td>' +
+         '  </tr>' +
+         '  <tr>' +
+            (this.client.ekMaster ? '' +
+            '   <td>Degrée d\'ostentation</td>' +
+            '   <td>' +
+            '    <select id="degreeOstentatoire">' +
+            '     <option value="invisible">Nul</option>' +
+            '     <option value="light">Faible</option>' +
+            '     <option value="heavy">Élevé</option>' +
+            '    </select>' +
+            '   </td>' : '') +
+         ' </tr>' +
+         '  <tr>' +
+         '   <td>Affichage des identifiants</td>' +
+         '   <td>' +
+         '    <select id="affichagePseudo">' +
+         '     <option value="nick">Pseudo</option>' +
+         '     <option value="login">Login</option>' +
+         '     <option value="nick_login">Pseudo(Login)</option>' +
+         '    </select>' +
+         '   </td>' +
+         '  </tr>' +
+         '  <tr>' +
+         '   <td>Afficher les infos bulles</td>' +
+         '   <td><input type="checkbox" id="viewTooltips" /></td>' +
+         '  </tr>' +
+         '  <tr>' +
+         '   <td>Afficher les dates</td>' +
+         '   <td><input type="checkbox" id="viewTimes" /></td>' +
+         '  </tr>' : '') +
+      '  <tr>' +
+      '   <td></td>' +
+      '   <td><button>Valider</button></td>' +
+      '  </tr>' +
+      ' </table>' +
+      '</form>';
+};