From 7203835bce6f94b6afcc7403694145c829a4f833 Mon Sep 17 00:00:00 2001 From: Greg Burri Date: Fri, 1 Aug 2008 11:02:07 +0000 Subject: [PATCH] =?utf8?q?ADD=20type=20mime=20application/xhtml-xml=20pour?= =?utf8?q?=20tout=20ce=20qui=20n'est=20pas=20IE=20FIX=20correction=20d'htm?= =?utf8?q?l=20mal=20form=C3=A9=20dans=20les=20js?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- index.yaws | 9 +++++++++ js/euphorik.js | 7 ++++--- js/pageMinichat/conversation.js | 2 +- js/pageMinichat/message.js | 9 ++++++--- js/pageMinichat/pageMinichat.js | 4 ++-- js/pageProfile.js | 2 +- 6 files changed, 23 insertions(+), 10 deletions(-) diff --git a/index.yaws b/index.yaws index 9d31ae4..47595bb 100755 --- a/index.yaws +++ b/index.yaws @@ -1,6 +1,15 @@ + + out(A) -> + {header, {content_type, + case string:str((A#arg.headers)#headers.user_agent, "MSIE") of + 0 -> "application/xhtml+xml"; + _ -> "text/html" + end + }}. + diff --git a/js/euphorik.js b/js/euphorik.js index dfcefd4..777a036 100755 --- a/js/euphorik.js +++ b/js/euphorik.js @@ -15,8 +15,8 @@ // // You should have received a copy of the GNU General Public License // along with Euphorik. If not, see . - -/*jslint laxbreak:true */ + +/*jslint laxbreak:true */ // tout euphorik est contenu dans cet objet var euphorik = {}; @@ -56,9 +56,10 @@ $(document).ready( $("#menu .register").click(function(){ pages.afficherPage("register"); }); $("#menu .about").click(function(){ pages.afficherPage("about"); }); + // TODO : simplifier et pouvoir créer des liens par exemple : Conditions d'utilisation $("#footer .conditions").click(function(){ pages.afficherPage("conditions_utilisation"); }); - + pages.ajouterPage(new euphorik.PageMinichat(client, formateur, util), true); pages.ajouterPage(new euphorik.PageAdmin(client, formateur, util)); pages.ajouterPage(new euphorik.PageProfile(client, formateur, util)); diff --git a/js/pageMinichat/conversation.js b/js/pageMinichat/conversation.js index 238976b..5a10c5a 100644 --- a/js/pageMinichat/conversation.js +++ b/js/pageMinichat/conversation.js @@ -250,7 +250,7 @@ euphorik.Conversation.prototype.flush = function() { messagePair = !messagePair; } }); - + var DOM = $(XHTML); // pour chaque nouveau message au niveau du document on lui assigne ses événements diff --git a/js/pageMinichat/message.js b/js/pageMinichat/message.js index a3d4d32..ba15ddc 100644 --- a/js/pageMinichat/message.js +++ b/js/pageMinichat/message.js @@ -144,9 +144,12 @@ euphorik.Message.prototype.XHTML = function(messagePair, pre) { (this.systeme ? " systeme" : "") + (this.ekMaster ? " ekMaster" + this.degreeOstentatoire : "") + "\">" + - "
" + - "[" + this.date + "]" + - "" + this.auteurId + "" + identifiant + "" + + "
"+ + "" + + "[" + this.date + "]" + + "" + this.auteurId + "" + identifiant + "" + + "" + + "" + XHTMLrepondA + "" + this.formateur.traitementComplet(this.contenu, this.pseudo) + "" + ""; diff --git a/js/pageMinichat/pageMinichat.js b/js/pageMinichat/pageMinichat.js index 792f64a..da6ba74 100755 --- a/js/pageMinichat/pageMinichat.js +++ b/js/pageMinichat/pageMinichat.js @@ -64,7 +64,7 @@ euphorik.PageMinichat.prototype.classes = function() { euphorik.PageMinichat.prototype.charger = function() { thisPage = this; - + $("#posterMessage input.pseudo").val(this.client.pseudo); // cet appel ne doit pas être fait avant l'appel à 'charger' @@ -73,7 +73,7 @@ euphorik.PageMinichat.prototype.charger = function() { this.chargerConversationsFragment(); this.conversations.rafraichirMessages(true); - + this.util.setCaretToEnd($("form#posterMessage input.message")[0]); // les outils de bannissement (uniquement pour les ekMaster) diff --git a/js/pageProfile.js b/js/pageProfile.js index b272400..d772317 100755 --- a/js/pageProfile.js +++ b/js/pageProfile.js @@ -172,7 +172,7 @@ euphorik.PageProfile.prototype.getHTML = function() { ' ' : '') + ' ' + ' ' + - ' ' + + ' ' + ' ' + ' ' + ''; -- 2.45.2