From 7e4ad22e8d45f0a7f1eef7a95ebbad1c57a98d90 Mon Sep 17 00:00:00 2001
From: b_b <bruno@eliaz.fr>
Date: Sun, 7 Jan 2024 20:18:15 +0100
Subject: [PATCH] =?UTF-8?q?fix:=20inclure=20le=20script=20qui=20permet=20l?=
=?UTF-8?q?'=C3=A9dition=20des=20documents=20dans=20une=20modale=20dans=20?=
=?UTF-8?q?toutes=20les=20pages=20du=20priv=C3=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
et l'adapter de façon à ce qu'il cible les éléments de manière plus précise + se passer de la globale pour tester que le script a déjà été initialisé
Fix: #4933 & ref spip/spip!5820
---
javascript/medias_edit.js | 33 ++++++++++---------
paquet.xml | 2 ++
prive/squelettes/contenu/documents.html | 5 +--
.../squelettes/inclure/colonne-documents.html | 5 +--
.../inclure/portfolio-documents.html | 3 --
5 files changed, 21 insertions(+), 27 deletions(-)
diff --git a/javascript/medias_edit.js b/javascript/medias_edit.js
index cc6e1994..a560a3d8 100644
--- a/javascript/medias_edit.js
+++ b/javascript/medias_edit.js
@@ -1,20 +1,21 @@
-function editbox_init(){
- jQuery('a.editbox:not(.nobox)')
- .attr("onclick","").addClass('nobox').click(function(){
- var casedoc = jQuery(this).parents('div.item').eq(0);
- jQuery(casedoc).animateLoading();
- jQuery.modalboxload(parametre_url(parametre_url(jQuery(this).attr('href'),'popin','oui'),'var_zajax','contenu'),{
- onClose: function (dialog) {jQuery(casedoc).ajaxReload();}
+(function(){
+ function editbox_init(){
+ jQuery(':where(.formulaire_editer_logo, #documents_joints, #portfolios) a.editbox:not(.nobox)')
+ .attr("onclick","").addClass('nobox').click(function(){
+ var casedoc = jQuery(this).parents('div.item').eq(0);
+ jQuery(casedoc).animateLoading();
+ jQuery.modalboxload(parametre_url(parametre_url(jQuery(this).attr('href'),'popin','oui'),'var_zajax','contenu'),{
+ onClose: function (dialog) {jQuery(casedoc).ajaxReload();}
+ });
+ return false;
});
- return false;
- });
-}
-var editbox_initialized;
-if (!editbox_initialized){
+ }
if (window.jQuery){
- editbox_initialized = true;
- (function($){if(typeof onAjaxLoad == "function") onAjaxLoad(editbox_init);
+ (function($){
+ if(typeof onAjaxLoad == "function") {
+ onAjaxLoad(editbox_init);
+ }
$(editbox_init);
- })(jQuery);
+ })(jQuery);
}
-}
\ No newline at end of file
+})();
\ No newline at end of file
diff --git a/paquet.xml b/paquet.xml
index b032b398..2c482621 100644
--- a/paquet.xml
+++ b/paquet.xml
@@ -64,4 +64,6 @@
<genie nom="nettoyer_repertoire_upload" periode="86400" />
+ <script source="javascript/medias_edit.js" type="prive" />
+
</paquet>
diff --git a/prive/squelettes/contenu/documents.html b/prive/squelettes/contenu/documents.html
index 7439aad9..d5c84ff1 100644
--- a/prive/squelettes/contenu/documents.html
+++ b/prive/squelettes/contenu/documents.html
@@ -1,5 +1,2 @@
[(#AUTORISER{voir,_documents}|sinon_interdire_acces)]
-<INCLURE{fond=prive/squelettes/inclure/mediatheque-navigation, media, iddoc=doc, ajax, env} />
-<script type="text/javascript">/*<![CDATA[*/
-[(#INCLURE{javascript/medias_edit.js}|compacte{js})]
-/*]]>*/</script>
\ No newline at end of file
+<INCLURE{fond=prive/squelettes/inclure/mediatheque-navigation, media, iddoc=doc, ajax, env} />
\ No newline at end of file
diff --git a/prive/squelettes/inclure/colonne-documents.html b/prive/squelettes/inclure/colonne-documents.html
index 04a70ebf..5da2465c 100644
--- a/prive/squelettes/inclure/colonne-documents.html
+++ b/prive/squelettes/inclure/colonne-documents.html
@@ -11,7 +11,4 @@
#MODELE{document_case,id_document=#ID_DOCUMENT,id_objet,objet,ajax}
</BOUCLE_docslies>
</div>
-</B_docslies>
-<script type="text/javascript">/*<![CDATA[*/
-[(#INCLURE{javascript/medias_edit.js}|compacte{js})]
-/*]]>*/</script>
+</B_docslies>
\ No newline at end of file
diff --git a/prive/squelettes/inclure/portfolio-documents.html b/prive/squelettes/inclure/portfolio-documents.html
index 1c92a84a..dc35b2c0 100644
--- a/prive/squelettes/inclure/portfolio-documents.html
+++ b/prive/squelettes/inclure/portfolio-documents.html
@@ -58,9 +58,6 @@
</B_documents>
<script type="text/javascript">/*<![CDATA[*/
-/* Gestion de la modale */
-[(#INCLURE{javascript/medias_edit.js}|compacte{js})]
-
/* 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();]
--
GitLab