diff --git a/dist/javascript/async_upload.js b/dist/javascript/async_upload.js index bb6e1919c6264637a2c747f6817b647d52e0f2f3..8b21f619ee7d6a137fa32468960f5f917225d3c0 100644 --- a/dist/javascript/async_upload.js +++ b/dist/javascript/async_upload.js @@ -96,8 +96,8 @@ function async_upload_icon(res) { res.find(">div").each(function(){ var cont = $("#"+this.id); verifForm(cont.html($(this).html())); - cont.find("img[@onclick]").each(function(){this.onclick();}) - $(".form_upload_icon").async_upload(async_upload_icon); + $("form.form_upload_icon",cont).async_upload(async_upload_icon); + cont.find("img[@onclick]").each(function(){this.onclick();}); }); return true; } @@ -111,6 +111,7 @@ function async_upload_portfolio_documents(res){ .append(self.clone().get()); } verifForm(cont.html(self.html())); + $("form.form_upload",cont).async_upload(async_upload_portfolio_documents); }); return true; } diff --git a/dist/javascript/presentation.js b/dist/javascript/presentation.js index 7031010c5e77bae448ecbbd7ee59bfc02b6b88b0..3f5c9a6ab41926921867a24e83e396c71bc0d8ac 100644 --- a/dist/javascript/presentation.js +++ b/dist/javascript/presentation.js @@ -24,7 +24,7 @@ function changestyle(id_couche, element, style) { // Masquer les elements du bandeau var select = $(bandeau_elements).not('#'+id_couche); // sauf eventuellement la boite de recherche si la souris passe en-dessous - if (id_couche=='garder-recherche') select = select.not('#bandeaurecherche'); + if (id_couche=='garder-recherche') select.not('#bandeaurecherche'); select.css('visibility','hidden'); // Afficher, le cas echeant, celui qui est demande diff --git a/ecrire/exec/articles.php b/ecrire/exec/articles.php index 328a703019bd5b17dba4fa93d598f1bb6159ce78..22ca772c80f23cdc121e7fe3717f29b2677cd0d3 100644 --- a/ecrire/exec/articles.php +++ b/ecrire/exec/articles.php @@ -189,7 +189,7 @@ function articles_documents($flag_editable, $type, $id) $res .= "<script src='"._DIR_JAVASCRIPT."async_upload.js' type='text/javascript'></script>\n"; $res .= <<<EOF <script type='text/javascript'> - $(".form_upload").async_upload(async_upload_portfolio_documents); + $("form.form_upload").async_upload(async_upload_portfolio_documents); </script> EOF; diff --git a/ecrire/inc/documents.php b/ecrire/inc/documents.php index f4a6153055e9c718166a550ab56f341c1dff12a1..e6dd16eb1def47c9178fcd52f6495f76b891d94e 100644 --- a/ecrire/inc/documents.php +++ b/ecrire/inc/documents.php @@ -177,7 +177,7 @@ function afficher_documents_colonne($id, $type="article", $flag_modif = true) { $ret .= "<script src='"._DIR_JAVASCRIPT."async_upload.js' type='text/javascript'></script>\n"; $ret .= <<<EOF <script type='text/javascript'> - $(".form_upload").async_upload(async_upload_article_edit) + $("form.form_upload").async_upload(async_upload_article_edit) </script> EOF; diff --git a/ecrire/inc/iconifier.php b/ecrire/inc/iconifier.php index e2f59895fb9ca72dafa81ab553646e76f1e79528..3785ff62b6ae06caabcf881c7c9c7ce3bb21795d 100644 --- a/ecrire/inc/iconifier.php +++ b/ecrire/inc/iconifier.php @@ -64,7 +64,7 @@ function inc_iconifier_dist($id_objet, $id, $script, $iframe_script='') { $js .= "<script src='"._DIR_JAVASCRIPT."async_upload.js' type='text/javascript'></script>\n"; $js .= <<<EOF <script type='text/javascript'> - $(".form_upload_icon").async_upload(async_upload_icon); + $("form.form_upload_icon").async_upload(async_upload_icon); </script> EOF; } diff --git a/ecrire/inc/legender.php b/ecrire/inc/legender.php index a8b5e47c2eb5c888f15d8432de37df5ec156e9d1..41516db1b2bb0a6490a2764c18ca20e8dcab5ad6 100644 --- a/ecrire/inc/legender.php +++ b/ecrire/inc/legender.php @@ -134,14 +134,14 @@ function vignette_formulaire_legender($id_document, $document, $script, $type, $ $action = redirige_action_auteur('supprimer', "document-$id_vignette", $script, "id_$type=$id&show_docs=$id_document#$ancre"); else { $s = ($ancre =='documents' ? '': '-'); - $action = ajax_action_auteur('documenter', "$s$id/$type/$id_vignette", $script, "id_$type=$id&type=$type&s=$s&show_docs=$id_document#$ancre", array($texte)); + $action = ajax_action_auteur('documenter', "$s$id/$type/$id_vignette", $script, "id_$type=$id&type=$type&s=$s&show_docs=$id_document#$ancre", array($texte),'',"function(r,noeud) {noeud.innerHTML = r; \$('.form_upload',noeud).async_upload(async_upload_portfolio_documents);}"); } $joindre = charger_fonction('joindre', 'inc'); return "<hr style='margin-left: -5px; margin-right: -5px; height: 1px; border: 0px; color: #eeeeee; background-color: white;' />" . (!$id_vignette - ? $joindre($script, "id_$type=$id",$id, _T('info_vignette_personnalisee'), 'vignette', $type, $ancre, $id_document) + ? $joindre($script, "id_$type=$id",$id, _T('info_vignette_personnalisee'), 'vignette', $type, $ancre, $id_document,generer_url_ecrire("documenter","id_$type=$id&type=$type",true)) : icone_horizontale($texte, $action, "vignette-24.png", "supprimer.gif", false)); }