diff --git a/javascript/medias_edit.js b/javascript/medias_edit.js index cc6e1994a804ba721aadd88c1fa010df73cab315..a560a3d84efc69ebafd6e8c14e71960042ae6d22 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 b032b398d3fc64c6038c8c30b3ae352c12592904..2c482621f47295e550e9991191938485fac0ebf3 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 7439aad9fc949a8206f88c75a37e851e41bbbd61..d5c84ff1feeae1ae2845faf721a4ff5e8dc485f2 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 04a70ebfe83a9f1568e0768fa6bdacae15ee1d5b..5da2465c73122038ddcffb1856b97fe81a926eba 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 1c92a84a06840f8a3cd92c705d0e6163c069aff9..dc35b2c0f1775d5c3db7727bdb2e79fce3ba7ed7 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();]