reorganisation des scripts en un seul. Mais il semble qu'il y a un bug js sur...

reorganisation des scripts en un seul. Mais il semble qu'il y a un bug js sur la page mediatheque, au retour de l'upload d'un doc. A debug

.gitattributes

@@ -60,6 +60,7 @@ inc/marquer_doublons_doc.php -text
 inc/renseigner_document.php -text
 inc/vignette.php -text
 javascript/jquery.MultiFile.js -text
+javascript/medias_edit.js -text
 lang/medias_ar.php -text
 lang/medias_de.php -text
 lang/medias_en.php -text

formulaires/inc-upload_document.html

@@ -134,6 +134,7 @@
 ][<ul><li class='fieldset deballer_zip'>(#ENV**{erreurs}|table_valeur{lister_contenu_archive})</li></ul>]
 
 <script type='text/javascript'>/*<!#EVAL{chr(91)}CDATA#EVAL{chr(91)}*/
+if (window.jQuery){
 function change_methode(methode){
 	var id = "#joindre_"+methode+"#GET{domid}";
 	if (jQuery(id).is(':hidden')) {
@@ -144,4 +145,5 @@ function change_methode(methode){
 	jQuery("#defaultsubmit#GET{domid}").html('').append(jQuery(id).find('.boutons').eq(-1).find('input').clone(true));
 }
 jQuery(function(){change_methode('#GET{methode}');});
+}
 /*#EVAL{chr(93)}[(#EVAL{chr(93)})]>*/</script>

javascript/medias_edit.js

+if (typeof window.editbox_init=="undefined"){
+	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(jQuery(this).attr('href'),'var_zajax','contenu'),{
+				onClose: function (dialog) {jQuery(casedoc).ajaxReload();}
+			});
+			return false;
+		});
+	}
+	if (window.jQuery)
+	(function($){if(typeof onAjaxLoad == "function") onAjaxLoad(editbox_init);
+		$(editbox_init);
+	 })(jQuery);
+}
+if (typeof multifile!="undefined" && typeof jQuery.MultiFile=="undefined"){
+jQuery.getScript(multifile,function(){
+	jQuery.MultiFile();
+	onAjaxLoad(function(){jQuery.MultiFile();});
+});
+}

prive/contenu/portfolio_document.html

@@ -11,9 +11,3 @@
 [
 (#INCLURE{fond=prive/squelettes/inclure/ajouter-documents}{env}{ajax})
 ]
-[<script type="text/javascript" src='(#CHEMIN{javascript/jquery.MultiFile.js})'></script>
-<script type='text/javascript'>
-jQuery.MultiFile();
-onAjaxLoad(function(){jQuery.MultiFile();});
-</script>
-]

prive/editer/colonne_document.html

 <div class='ajax'>
 #FORMULAIRE_JOINDRE_DOCUMENT{new,#ENV{id_objet},#ENV{objet}}
 </div>
-<INCLURE{fond=prive/squelettes/inclure/colonne-documents,env,ajax=documents}>
-[<script type="text/javascript" src='(#CHEMIN{javascript/jquery.MultiFile.js})'></script>
+<INCLURE{fond=prive/squelettes/inclure/colonne-documents,env,ajax=documents}>
\ No newline at end of file
-<script type='text/javascript'>
-jQuery.MultiFile();
-onAjaxLoad(function(){jQuery.MultiFile();});
-</script>
-]

prive/squelettes/contenu/mediatheque.html

 [(#AUTORISER{administrer,mediatheque}|sinon_interdire_acces)]
 #FORMULAIRE_RECHERCHE_ECRIRE{#URL_ECRIRE{mediatheque}}
 <div class='nettoyeur'></div>
-[(#ENV{editable,' '}|oui)
 <INCLURE{fond=prive/squelettes/inclure/mediatheque-navigation}{media}{ajax}{env}>
-[<script type="text/javascript" src='(#CHEMIN{javascript/jquery.MultiFile.js})'></script>]
-<script type='text/javascript'>
-jQuery.MultiFile();
-onAjaxLoad(function(){jQuery.MultiFile();});
-</script>
+<script type="text/javascript">/*<![CDATA[*/
+var multifile='[(#CHEMIN{javascript/jquery.Multifile.js}|texte_script)]';
+[(#INCLURE{javascript/medias_edit.js}|compacte{js})]
+/*]]>*/</script>
\ No newline at end of file
-]
\ No newline at end of file

prive/squelettes/inclure/colonne-documents.html

@@ -10,20 +10,7 @@
 	#MODELE{document_case,id_document=#ID_DOCUMENT,id_objet,objet,ajax}
 </BOUCLE_docslies>
 </div>
-<script type="text/javascript">
-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(jQuery(this).attr('href'),'var_zajax','contenu'),{
-			onClose: function (dialog) {jQuery(casedoc).ajaxReload();}
-		});
-		return false;
-	});
-}
-if (window.jQuery)
-(function($){if(typeof onAjaxLoad == "function") onAjaxLoad(editbox_init);
-	$(editbox_init);
- })(jQuery);
-</script>
+<script type="text/javascript">/*<![CDATA[*/
+var multifile='[(#CHEMIN{javascript/jquery.Multifile.js}|texte_script)]';
+[(#INCLURE{javascript/medias_edit.js}|compacte{js})]
+/*]]>*/</script>

prive/squelettes/inclure/portfolio-documents.html

@@ -42,21 +42,8 @@
 </div>
 </B_documents>
 
-<script type="text/javascript">
-	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(jQuery(this).attr('href'),'var_zajax','contenu'),{
-				onClose: function (dialog) {jQuery(casedoc).ajaxReload();}
-			});
-			return false;
-		});
-	}
-if (window.jQuery)
-(function($){if(typeof onAjaxLoad == "function") onAjaxLoad(editbox_init);
-	$(editbox_init);
- })(jQuery);
-</script>
+<script type="text/javascript">/*<![CDATA[*/
+var multifile='[(#CHEMIN{javascript/jquery.Multifile.js}|texte_script)]';
+[(#INCLURE{javascript/medias_edit.js}|compacte{js})]
+/*]]>*/</script>
 </div>
\ No newline at end of file