From f8bb2df9a6b00c55e3fd2a69522e64bfdbf4bf3d Mon Sep 17 00:00:00 2001
From: Jack31 <jacques@jack31.org>
Date: Fri, 7 Jul 2023 09:11:37 +0200
Subject: [PATCH] chore: retrait des CDATA inutiles, retrait text/javascript
Refs: spip/spip#5667
(cherry picked from commit c148c1e80fd77a057fd71148e07a476317bef4d5)
---
formulaires/illustrer_document.html | 2 +-
formulaires/inc-upload_document.html | 4 ++--
formulaires/methodes_upload/mediatheque.html | 4 ++--
modeles/audio.html | 4 ++--
modeles/video.html | 4 ++--
prive/squelettes/contenu/document_edit.html | 2 +-
prive/squelettes/contenu/documents.html | 2 +-
prive/squelettes/inclure/colonne-documents.html | 2 +-
prive/squelettes/inclure/portfolio-documents.html | 5 +++--
9 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/formulaires/illustrer_document.html b/formulaires/illustrer_document.html
index f660c691..65a8e4ae 100644
--- a/formulaires/illustrer_document.html
+++ b/formulaires/illustrer_document.html
@@ -24,4 +24,4 @@
</div>
</div>
</div></form>]
-</div>
\ No newline at end of file
+</div>
diff --git a/formulaires/inc-upload_document.html b/formulaires/inc-upload_document.html
index 9789a727..18b8415e 100644
--- a/formulaires/inc-upload_document.html
+++ b/formulaires/inc-upload_document.html
@@ -41,7 +41,7 @@
[(#REM) Formulaire pour deballer un zip]
[<div class="editer-groupe"><div class='fieldset deballer_zip'>(#ENV**{erreurs/lister_contenu_archive})</div></div>]
-<script type='text/javascript'>/*<!\[CDATA\[*/
+<script>
if (window.jQuery){
function change_methode(domid,methode){
var id = "#joindre_"+methode+domid;
@@ -56,4 +56,4 @@ function change_methode(domid,methode){
}
jQuery(function(){change_methode('#GET{domid}','#GET{methode}');});
}
-/*\]\]>*/</script>
+</script>
diff --git a/formulaires/methodes_upload/mediatheque.html b/formulaires/methodes_upload/mediatheque.html
index 7eb666f4..e4be7650 100644
--- a/formulaires/methodes_upload/mediatheque.html
+++ b/formulaires/methodes_upload/mediatheque.html
@@ -9,6 +9,6 @@
<!--editer_refdoc_joindre-->
</div>
</div>
-<script type="text/javascript">/*<!\[CDATA\[*/
+<script>
function mediaselect#ENV{domid}(id){jQuery.modalboxclose();jQuery("#refdoc_joindre#ENV{domid}").attr('value','doc'+id).focus();jQuery('#joindre_mediatheque#ENV{domid}>.boutons input').get(0).click();}
-/*\]\]>*/</script>
\ No newline at end of file
+</script>
\ No newline at end of file
diff --git a/modeles/audio.html b/modeles/audio.html
index 13483ace..179f279a 100644
--- a/modeles/audio.html
+++ b/modeles/audio.html
@@ -24,8 +24,8 @@
[autoplay="autoplay"(#ENV{autoplay}|oui)]></audio>
</div>
#GET{legende}
-[<script>/*<!\[CDATA\[*/var mejspath='[(#CHEMIN{lib/mejs/mediaelement-and-player.min.js}|timestamp)]',mejscss='[(#CHEMIN{lib/mejs/mediaelementplayer.min.css}|timestamp)]';
-(#INCLURE{javascript/mejs-init.min.js})/*\]\]>*/</script>]
+[<script> var mejspath='[(#CHEMIN{lib/mejs/mediaelement-and-player.min.js}|timestamp)]',mejscss='[(#CHEMIN{lib/mejs/mediaelementplayer.min.css}|timestamp)]';
+(#INCLURE{javascript/mejs-init.min.js})</script>]
[(#ENV{skin}|oui)[<style>(#INCLURE{#CHEMIN{css/mejs-skin-#ENV{skin}.css}|sinon{#CHEMIN{lib/mejs/mejs-skins.css}}|url_absolue_css})</style>]]
</figure>
</div>
diff --git a/modeles/video.html b/modeles/video.html
index 983698a8..c76edde6 100644
--- a/modeles/video.html
+++ b/modeles/video.html
@@ -44,8 +44,8 @@
</div>
</div>
[(#GET{legende})
-][<script>/*<!\[CDATA\[*/var mejspath='[(#CHEMIN{lib/mejs/mediaelement-and-player.min.js}|timestamp)]',mejscss='[(#CHEMIN{lib/mejs/mediaelementplayer.min.css}|timestamp)]';
-(#INCLURE{javascript/mejs-init.min.js})/*\]\]>*/</script>]
+][<script> var mejspath='[(#CHEMIN{lib/mejs/mediaelement-and-player.min.js}|timestamp)]',mejscss='[(#CHEMIN{lib/mejs/mediaelementplayer.min.css}|timestamp)]';
+(#INCLURE{javascript/mejs-init.min.js})</script>]
[(#ENV{skin}|oui)[<style>(#INCLURE{#CHEMIN{css/mejs-skin-#ENV{skin}.css}|url_absolue_css})</style>]]
</figure>
</div>
diff --git a/prive/squelettes/contenu/document_edit.html b/prive/squelettes/contenu/document_edit.html
index 528938d2..44ecb7e9 100644
--- a/prive/squelettes/contenu/document_edit.html
+++ b/prive/squelettes/contenu/document_edit.html
@@ -17,7 +17,7 @@
#FORMULAIRE_ILLUSTRER_DOCUMENT{#ID_DOCUMENT}
</div>
</div>
-<script type="text/javascript">
+<script>
function reload_chemin(){
if (!jQuery('.formedit').find('.ajax>.reloaded:first').length){
jQuery('.formedit').find('.ajax').eq(0).prepend('<b class="reloaded"></b>');
diff --git a/prive/squelettes/contenu/documents.html b/prive/squelettes/contenu/documents.html
index d5c84ff1..ef010031 100644
--- a/prive/squelettes/contenu/documents.html
+++ b/prive/squelettes/contenu/documents.html
@@ -1,2 +1,2 @@
[(#AUTORISER{voir,_documents}|sinon_interdire_acces)]
-<INCLURE{fond=prive/squelettes/inclure/mediatheque-navigation, media, iddoc=doc, ajax, env} />
\ No newline at end of file
+<INCLURE{fond=prive/squelettes/inclure/mediatheque-navigation, media, iddoc=doc, ajax, env} />
diff --git a/prive/squelettes/inclure/colonne-documents.html b/prive/squelettes/inclure/colonne-documents.html
index cee18f2b..de7c2a41 100644
--- a/prive/squelettes/inclure/colonne-documents.html
+++ b/prive/squelettes/inclure/colonne-documents.html
@@ -12,4 +12,4 @@
</BOUCLE_docslies>
</div>
</B_docslies>
-<!-- not empty -->
\ No newline at end of file
+<!-- not empty -->
diff --git a/prive/squelettes/inclure/portfolio-documents.html b/prive/squelettes/inclure/portfolio-documents.html
index dc35b2c0..66b6b041 100644
--- a/prive/squelettes/inclure/portfolio-documents.html
+++ b/prive/squelettes/inclure/portfolio-documents.html
@@ -57,12 +57,13 @@
#SET{nbdocs,#GET{nbdocs}|plus{#GRAND_TOTAL}}
</B_documents>
-<script type="text/javascript">/*<![CDATA[*/
+<script>
+
/* Sur la page d'une rubrique, recharger la boîte d'info en cas de rechargement ajax */
[(#OBJET|=={rubrique}|et{#CONST{_AJAX}}|et{#GET{nbdocs}|=={1}}|oui)
if (window.jQuery) jQuery('#navigation .box.info').ajaxReload();]
/* Gestion des différents modes d'affichages, du tri des documents, et des rechargements ajax */
[(#INCLURE{fond=javascript/gestion_listes_documents.js}|compacte{js})]
-/*]]>*/</script>
+</script>
</div>
--
GitLab