From 4a6c575807a90370c0069b688026b10102e1ce10 Mon Sep 17 00:00:00 2001 From: Ummon Date: Sat, 13 Apr 2019 20:01:33 +0200 Subject: [PATCH] 'formater' -> 'formatter' --- doc/server_architecture.svg | 2 +- index.yaws | 3 +-- js/chat/commandes.js | 6 +++--- js/chat/conversation.js | 4 ++-- js/chat/conversations.js | 6 +++--- js/chat/message.js | 14 ++++++------- js/euphorik.js | 20 +++++++++---------- js/formatter.js | 14 ++++++------- js/pageAbout.js | 6 +++--- js/pageAdmin.js | 8 ++++---- js/pageMinichat.js | 14 ++++++------- js/pageProfile.js | 6 +++--- js/pageRegister.js | 4 ++-- js/util.js | 10 +++++----- modules/erl/euphorik_bd.erl | 2 +- modules/erl/euphorik_bd_admin.erl | 3 +-- modules/erl/euphorik_common.erl | 2 +- modules/erl/euphorik_daemon.erl | 5 ++--- .../erl/euphorik_minichat_conversation.erl | 4 ++-- modules/erl/euphorik_protocole.erl | 2 +- modules/erl/euphorik_requests.erl | 2 +- 21 files changed, 67 insertions(+), 70 deletions(-) diff --git a/doc/server_architecture.svg b/doc/server_architecture.svg index 8a00377..c6002b4 100644 --- a/doc/server_architecture.svg +++ b/doc/server_architecture.svg @@ -532,7 +532,7 @@ y="359.74429" x="77.082535" id="tspan2541" - sodipodi:role="line">formater + sodipodi:role="line">formatter - + @@ -71,7 +71,6 @@ out(A) -> Est_ek_master = euphorik_bd:is_ek_master_from_cookie(yaws_api:find_cookie_val("cookie", A)), {ehtml, {'div', [{id, "logo"}] ++ if Est_ek_master -> [{class, "ekMaster"}]; true -> [] end}}. - diff --git a/js/chat/commandes.js b/js/chat/commandes.js index 871e22b..cbf522d 100644 --- a/js/chat/commandes.js +++ b/js/chat/commandes.js @@ -27,20 +27,20 @@ * /nick * Modifie le nick courant */ -euphorik.Commandes = function(client, pageMinichat, util, formater) { +euphorik.Commandes = function(client, pageMinichat, util, formatter) { var thisCommandes = this; this.client = client; this.pageMinichat = pageMinichat; this.util = util; - this.formater = formater; + this.formatter = formatter; // construction du texte d'aide (liste des commandes) de manière statique this.texteAide = "

Commandes

    "; objectEach( euphorik.Commandes.liste, function(name, commande) { - thisCommandes.texteAide += "
  • " + thisCommandes.formater.completeProcessing(commande.usage) + " : " + thisCommandes.formater.completeProcessing(commande.description) + "
  • "; + thisCommandes.texteAide += "
  • " + thisCommandes.formatter.completeProcessing(commande.usage) + " : " + thisCommandes.formatter.completeProcessing(commande.description) + "
  • "; } ); this.texteAide += "
"; diff --git a/js/chat/conversation.js b/js/chat/conversation.js index 8c11752..4deb11c 100644 --- a/js/chat/conversation.js +++ b/js/chat/conversation.js @@ -35,7 +35,7 @@ euphorik.Conversation = function(conversations, num) { this.id = Math.floor(Math.random() * 1000000).toString(36); this.util = this.conversations.util; - this.formater = this.conversations.formater; + this.formatter = this.conversations.formatter; this.client = this.conversations.client; this.idDernierMessageAffiche = 0; @@ -107,7 +107,7 @@ euphorik.Conversation.prototype.getMessageReduit = function() { * @racine un message représentant la racine de la conversation, vaut undefined pour la conversation générale */ euphorik.Conversation.prototype.setRacine = function(racineElement) { - this.racine = new euphorik.Message(this.client, this.formater, racineElement); + this.racine = new euphorik.Message(this.client, this.formatter, racineElement); }; /** diff --git a/js/chat/conversations.js b/js/chat/conversations.js index ea7e742..05da80e 100644 --- a/js/chat/conversations.js +++ b/js/chat/conversations.js @@ -21,9 +21,9 @@ /** * Représente l'ensemble des conversations affichés. */ -euphorik.Conversations = function(client, formater, util, communication, fragment) { +euphorik.Conversations = function(client, formatter, util, communication, fragment) { this.client = client; - this.formater = formater; + this.formatter = formatter; this.util = util; this.fragment = fragment; @@ -247,7 +247,7 @@ euphorik.Conversations.prototype.ajouterMessage = function(element, numConversat var message = new euphorik.Message( this.client, - this.formater, + this.formatter, element ); diff --git a/js/chat/message.js b/js/chat/message.js index b3e5f12..e7439c9 100644 --- a/js/chat/message.js +++ b/js/chat/message.js @@ -25,9 +25,9 @@ euphorik.Reponse = function(id, nick, login) { /** * Représente un message. */ -euphorik.Message = function(client, formater, element) { +euphorik.Message = function(client, formatter, element) { this.client = client; - this.formater = formater; + this.formatter = formatter; this.id = element.id; this.auteurId = element.user_id; @@ -118,9 +118,9 @@ euphorik.Message.prototype.XHTML = function(messagePair, pre) { // construit l'identifiant de la personne var identifiant = - this.client.nickFormat === "nick" || this.login === "" ? this.formater.completeProcessing(this.nick) : - (this.client.nickFormat === "login" ? this.formater.completeProcessing(this.login) : - this.formater.completeProcessing(this.nick) + "(" + this.formater.completeProcessing(this.login) +")" ); + this.client.nickFormat === "nick" || this.login === "" ? this.formatter.completeProcessing(this.nick) : + (this.client.nickFormat === "login" ? this.formatter.completeProcessing(this.login) : + this.formatter.completeProcessing(this.nick) + "(" + this.formatter.completeProcessing(this.login) +")" ); var XHTMLrepondA = ""; var debut = true; @@ -128,7 +128,7 @@ euphorik.Message.prototype.XHTML = function(messagePair, pre) { if (!debut) { XHTMLrepondA += ", "; } - XHTMLrepondA += thisMessage.formater.completeProcessing(rep.nick); + XHTMLrepondA += thisMessage.formatter.completeProcessing(rep.nick); debut = false; }); if (XHTMLrepondA) { @@ -148,6 +148,6 @@ euphorik.Message.prototype.XHTML = function(messagePair, pre) { "" + "" + XHTMLrepondA + - "" + this.formater.completeProcessing(this.contenu, this.nick) + "" + + "" + this.formatter.completeProcessing(this.contenu, this.nick) + "" + ""; }; diff --git a/js/euphorik.js b/js/euphorik.js index e3bd720..cac44c8 100755 --- a/js/euphorik.js +++ b/js/euphorik.js @@ -17,7 +17,7 @@ // along with Euphorik. If not, see . /*jslint laxbreak:true */ - + // all euphorik is contained in this object var euphorik = {}; @@ -25,8 +25,8 @@ var euphorik = {}; $(document).ready( function() { var fragment = new Fragment(); - var formater = new euphorik.Formater(); - var util = new euphorik.Util(formater); + var formatter = new euphorik.Formatter(); + var util = new euphorik.Util(formatter); var communication = new euphorik.Communication( function(data) { util.messageDialog(data.error_message); }, function() { util.showWaitBar(); }, @@ -61,16 +61,16 @@ $(document).ready( $("#menu .register").click(function(){ pages.displayPage("register"); }); $("#menu .about").click(function(){ pages.displayPage("about"); }); - // TODO : simplification : such link[1] should be created and automatically open the right page without - // explicitly add a page. + // TODO : simplification : such link[1] should be created and automatically open the right page without + // explicitly add a page. // [1] : Terms of use $("#footer .termsOfUse").click(function(){ pages.displayPage("terms_of_use"); }); - pages.addPage(new euphorik.PageMinichat(client, formater, util, communication), true); - pages.addPage(new euphorik.PageAdmin(client, formater, util, communication)); - pages.addPage(new euphorik.PageProfile(client, formater, util)); - pages.addPage(new euphorik.PageRegister(client, formater, util)); - pages.addPage(new euphorik.PageAbout(client, formater, util, communication)); + pages.addPage(new euphorik.PageMinichat(client, formatter, util, communication), true); + pages.addPage(new euphorik.PageAdmin(client, formatter, util, communication)); + pages.addPage(new euphorik.PageProfile(client, formatter, util)); + pages.addPage(new euphorik.PageRegister(client, formatter, util)); + pages.addPage(new euphorik.PageAbout(client, formatter, util, communication)); pages.addPage("terms_of_use"); pages.displayPage(); // display the default page diff --git a/js/formatter.js b/js/formatter.js index 8c3bf05..b1227f0 100644 --- a/js/formatter.js +++ b/js/formatter.js @@ -52,7 +52,7 @@ euphorik.Formatter.prototype.getSmilesHTML = function() { }; /** - * Complete fomratting process applied to a text. + * Complete formatting process applied to a text. * - Remove HTML markups * - Substitutes wiki syntax with HTML * - Replaces URL with 'a' tag @@ -99,14 +99,14 @@ euphorik.Formatter.prototype.remplacerBalisesHTML = function(m) { }; euphorik.Formatter.prototype.traiterURL = function(m, nick) { - var thisFormater = this; + var thisFormatter = this; var traitementUrl = function(url) { // si ya pas de protocole on rajoute "http://" - if (!thisFormater.regexTestIfProtocolExists.test(url)) { + if (!thisFormatter.regexTestIfProtocolExists.test(url)) { url = "http://" + url; } - var extension = thisFormater.getShort(url); - return "[" + extension[0] + "]"; + var extension = thisFormatter.getShort(url); + return "[" + extension[0] + "]"; }; return m.replace(this.regexUrl, traitementUrl); }; @@ -174,9 +174,9 @@ euphorik.Formatter.prototype.supprimerSmiles = function(m) { * TODO : trouver un moyen pour que les smiles puissent être conservés */ euphorik.Formatter.prototype.traiterPourFenetreLightBox = function(M, urlCourante) { - var thisFormater = this; + var thisFormatter = this; var traitementUrl = function(url) { - return "[" + thisFormater.getShort(url)[0] + (urlCourante === url ? "*" : "") + "]"; + return "[" + thisFormatter.getShort(url)[0] + (urlCourante === url ? "*" : "") + "]"; }; return this.remplacerBalisesHTML(this.supprimerSmiles(M)).replace(this.regexUrl, traitementUrl); diff --git a/js/pageAbout.js b/js/pageAbout.js index 9a72139..e5da1cb 100644 --- a/js/pageAbout.js +++ b/js/pageAbout.js @@ -16,12 +16,12 @@ // You should have received a copy of the GNU General Public License // along with Euphorik. If not, see . -euphorik.PageAbout = function(client, formater, util, communication) { +euphorik.PageAbout = function(client, formatter, util, communication) { this.name = "about"; this.client = client; - this.formater = formater; - this.util = util; + this.formatter = formatter; + this.util = util; this.communication = communication; }; diff --git a/js/pageAdmin.js b/js/pageAdmin.js index fe464b8..6b1819d 100644 --- a/js/pageAdmin.js +++ b/js/pageAdmin.js @@ -21,11 +21,11 @@ /*jslint laxbreak:true */ -euphorik.PageAdmin = function(client, formater, util, communication) { +euphorik.PageAdmin = function(client, formatter, util, communication) { this.name = "admin"; this.client = client; - this.formater = formater; + this.formatter = formatter; this.util = util; this.communication = communication; @@ -87,8 +87,8 @@ euphorik.PageAdmin.prototype.majIPs = function() { '|'; ip.users.each(function(j, user) { XHTML += (j > 0 ? ", " : "") + - '' + thisPageAdmin.formater.completeProcessing(user.nick) + '' + - (user.login === "" ? "" : ''); + '' + thisPageAdmin.formatter.completeProcessing(user.nick) + '' + + (user.login === "" ? "" : ''); }); XHTML += 'débannir'; }); diff --git a/js/pageMinichat.js b/js/pageMinichat.js index 13f3375..4068222 100755 --- a/js/pageMinichat.js +++ b/js/pageMinichat.js @@ -18,14 +18,14 @@ /*jslint laxbreak:true */ -euphorik.PageMinichat = function(client, formater, util, communication) { +euphorik.PageMinichat = function(client, formatter, util, communication) { this.name = "minichat"; this.client = client; - this.formater = formater; + this.formatter = formatter; this.util = util; this.communication = communication; - this.commandes = new euphorik.Commandes(this.client, this, this.util, this.formater); + this.commandes = new euphorik.Commandes(this.client, this, this.util, this.formatter); // permet d'éviter d'envoyer plusieurs messages simultanément en pressant // rapidement sur "enter" par exemple @@ -65,7 +65,7 @@ euphorik.PageMinichat.prototype.charger = function() { $("#posterMessage input.nick").val(this.client.nick); // cet appel ne doit pas être fait avant l'appel à 'charger' - this.conversations = new euphorik.Conversations(this.client, this.formater, this.util, this.communication, this.fragment); + this.conversations = new euphorik.Conversations(this.client, this.formatter, this.util, this.communication, this.fragment); this.chargerConversationsFragment(); @@ -118,12 +118,12 @@ euphorik.PageMinichat.prototype.charger = function() { // $("body").append('
'); // affichage des smiles - $("#smiles").append(this.formater.getSmilesHTML()).children().each( + $("#smiles").append(this.formatter.getSmilesHTML()).children().each( function(i) { var opacityBase = $(this).css("opacity"); $(this).click( function() { - thisPage.util.replaceSelection($("form#posterMessage input.message")[0], thisPage.formater.smiles[$(this).attr("class")][0].source.replace(/\\/g, "")); + thisPage.util.replaceSelection($("form#posterMessage input.message")[0], thisPage.formatter.smiles[$(this).attr("class")][0].source.replace(/\\/g, "")); } ).hover( function() { $(this).animate({opacity: 1}, 200); }, @@ -227,7 +227,7 @@ euphorik.PageMinichat.prototype.envoyerMessage = function(message) { var nick = $("form#posterMessage input.nick").val(); // (un nick vide est autorisé) - nick = this.formater.formatNick(nick); + nick = this.formatter.formatNick(nick); if (nick === euphorik.conf.defaultNick) { this.util.messageDialog("Choose a nickname"); diff --git a/js/pageProfile.js b/js/pageProfile.js index c5ea5df..1a474d7 100755 --- a/js/pageProfile.js +++ b/js/pageProfile.js @@ -16,11 +16,11 @@ // You should have received a copy of the GNU General Public License // along with Euphorik. If not, see . -euphorik.PageProfile = function(client, formater, util) { +euphorik.PageProfile = function(client, formatter, util) { this.name = "profile"; this.client = client; - this.formater = formater; + this.formatter = formatter; this.util = util; }; @@ -64,7 +64,7 @@ euphorik.PageProfile.prototype.chargerProfile = function() { $("form#profile button").click( function() { - thisPage.client.nick = thisPage.formater.formatNick($("form#profile input.nick").val()); + thisPage.client.nick = thisPage.formatter.formatNick($("form#profile input.nick").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"); diff --git a/js/pageRegister.js b/js/pageRegister.js index 09d3631..56be885 100755 --- a/js/pageRegister.js +++ b/js/pageRegister.js @@ -16,11 +16,11 @@ // You should have received a copy of the GNU General Public License // along with Euphorik. If not, see . -euphorik.PageRegister = function(client, formater, util) { +euphorik.PageRegister = function(client, formatter, util) { this.name = "register"; this.client = client; - this.formater = formater; + this.formatter = formatter; this.util = util; }; diff --git a/js/util.js b/js/util.js index 5feacb5..39f89b0 100644 --- a/js/util.js +++ b/js/util.js @@ -23,16 +23,16 @@ * - Print a message box to display some information for the user. * - Set a tooltip for a HTML element. * - Some text manipulation for input area. - * @formater An object for string format + * @formatter An object for string format */ -euphorik.Util = function (formater) { +euphorik.Util = function (formatter) { $("#info .close").click(function() { $("#info").slideUp(50); }); $("body").append('
').append('

'); - this.formater = formater; + this.formatter = formatter; this.bulleActive = true; }; @@ -43,7 +43,7 @@ euphorik.Util.messageType = {informatif: 0, question: 1, erreur: 2}; * @message [String] The message. * @type [euphorik.Util.messageType] The message type like 'information' or 'error'. Default is messageType.informatif. * @buttons An object where the properties are the labels and the values are functions which will be executed when a button is clicked. - * @format [bool] The message should be formated. (see 'formater.js') + * @format [bool] The message should be formated. (see 'formatter.js') * @time The time while the message is displayed. -1 for infinity. */ euphorik.Util.prototype.messageDialog = function(message, type, buttons, format, time) { @@ -59,7 +59,7 @@ euphorik.Util.prototype.messageDialog = function(message, type, buttons, format, var close = function() { $("#info").slideUp(100); }; close(); - $("#info .message").html(!thisUtil.formater || !format ? message : thisUtil.formater.completeProcessing(message)); + $("#info .message").html(!thisUtil.formatter || !format ? message : thisUtil.formatter.completeProcessing(message)); switch(type) { case euphorik.Util.messageType.informatif : $("#info #icone").attr("class", "information"); break; diff --git a/modules/erl/euphorik_bd.erl b/modules/erl/euphorik_bd.erl index 6c3485d..0933645 100755 --- a/modules/erl/euphorik_bd.erl +++ b/modules/erl/euphorik_bd.erl @@ -19,10 +19,10 @@ % Ce module permet de gérer les données persistantes lié au site d'euphorik.ch. % Il permet d'ajouter des message, de demande les messages sur une page donnée, etc.. % Ce module utilise une base mnesia. -% @author G.Burri -module(euphorik_bd). +-author("Greg Burri "). -export([ % texte : get_texte/1, diff --git a/modules/erl/euphorik_bd_admin.erl b/modules/erl/euphorik_bd_admin.erl index 31be4b4..132b238 100644 --- a/modules/erl/euphorik_bd_admin.erl +++ b/modules/erl/euphorik_bd_admin.erl @@ -21,11 +21,10 @@ % - Mise à jour de la BD % - Backup et restauration % - Copie de la BD à partir d'un autre noeud -% -% @author G.Burri -module(euphorik_bd_admin). +-author("Greg Burri "). -export([ version_bd/0, create/0, diff --git a/modules/erl/euphorik_common.erl b/modules/erl/euphorik_common.erl index e516322..b016a0f 100644 --- a/modules/erl/euphorik_common.erl +++ b/modules/erl/euphorik_common.erl @@ -17,10 +17,10 @@ % along with Euphorik. If not, see . % % Module with some useful stuffs. -% @author G.Burri -module(euphorik_common). +-author("Greg Burri "). -export([ ceiling/1, delta_date_ms/2, diff --git a/modules/erl/euphorik_daemon.erl b/modules/erl/euphorik_daemon.erl index b802bbe..190458e 100755 --- a/modules/erl/euphorik_daemon.erl +++ b/modules/erl/euphorik_daemon.erl @@ -18,11 +18,10 @@ % % Module tournant en background s'occupant periodiquement de certaines tâches : % - rechargement des modules lors d'une mise en production -% Date : 05.11.2007 -% @author G.Burri -module(euphorik_daemon). +-author("Greg Burri "). -export([start/1, reload_euphorik/0, loop/0]). -include("../include/euphorik_defines.hrl"). @@ -35,7 +34,7 @@ start(_A) -> loop() -> receive - switch -> % permet de substituer le code du process par un nouveau code, voir reload_euphorik + switch -> % To reload a new code, see 'reload_euphorik/0'. euphorik_daemon:loop() end. diff --git a/modules/erl/euphorik_minichat_conversation.erl b/modules/erl/euphorik_minichat_conversation.erl index 156eaac..2d546f1 100755 --- a/modules/erl/euphorik_minichat_conversation.erl +++ b/modules/erl/euphorik_minichat_conversation.erl @@ -19,7 +19,6 @@ % Ce module permet la gestion des conversations du minichat d'euphorik. % Un message (enfant) peut répondre à des messages (ses parents). % Un message (parent) peut avoir plusieurs réponses (enfants) -% @author G.Burri % % Les conversation se compose d'une liste de tuple comprenant la conversation, du premier message de la conversation, % et d'un booleen indiquant s'il y a encore des messages @@ -34,6 +33,7 @@ -module(euphorik_minichat_conversation). +-author("Greg Burri "). -export([ conversations/4 ]). @@ -190,7 +190,7 @@ conversation(R, N, D, P) -> % @spec conversation([integer()], [integer()], [integer()]) -> {[int()], [int()]} conversation(Conv, [M | Reste], X) -> Est_deja_traite = any(fun(E) -> E =:= M end, Conv), - if Est_deja_traite -> + if Est_deja_traite -> conversation(Conv, Reste, X); true -> Enfants = euphorik_bd:enfants_id(M), diff --git a/modules/erl/euphorik_protocole.erl b/modules/erl/euphorik_protocole.erl index ad80c27..518d22d 100755 --- a/modules/erl/euphorik_protocole.erl +++ b/modules/erl/euphorik_protocole.erl @@ -18,10 +18,10 @@ % % Ce module gére les différents messages envoyés par le client (javascript) via AJAX. % Les messages donnés ainsi que les réponses sont au format JSON. -% @author G.Burri -module(euphorik_protocole). +-author("Greg Burri "). -export([ register/2, login/2, diff --git a/modules/erl/euphorik_requests.erl b/modules/erl/euphorik_requests.erl index 8ee67a5..69a5597 100755 --- a/modules/erl/euphorik_requests.erl +++ b/modules/erl/euphorik_requests.erl @@ -19,10 +19,10 @@ % This module responds to JSON requests via 'AJAX'. % It's defined as an Yaws 'appmods' with the url '/request'. % For instance in debug mode 'http://localhost:8090/request' will call the out/1 function. -% @author G.Burri -module(euphorik_requests). +-author("Greg Burri "). -export([out/1]). -include_lib("yaws_api.hrl"). -include("../include/euphorik_defines.hrl"). -- 2.45.2