From bac670f13567db4df857927d6d1db17b33afde20 Mon Sep 17 00:00:00 2001
From: "cedric@yterium.com" <>
Date: Thu, 3 Feb 2011 17:39:46 +0000
Subject: [PATCH] nettoyage, mise a jour des noms de fonction js pour les
animations a l'ajout Il reste un script a factoriser
---
formulaires/joindre_document.php | 6 +++---
modeles/document_case.html | 1 -
modeles/document_desc.html | 1 -
.../squelettes/inclure/colonne-documents.html | 8 ++++----
.../inclure/portfolio-documents.html | 20 +++++++++----------
5 files changed, 17 insertions(+), 19 deletions(-)
diff --git a/formulaires/joindre_document.php b/formulaires/joindre_document.php
index b385ba70..bba8e121 100644
--- a/formulaires/joindre_document.php
+++ b/formulaires/joindre_document.php
@@ -201,9 +201,9 @@ function formulaires_joindre_document_traiter_dist($id_document='new',$id_objet=
$callback .= "jQuery('#doc$ancre a.editbox').get(0).focus();";
if (count($sel)){
$sel = "#doc".implode(",#doc",$sel);
- $callback .= "jQuery('$sel').addClass('append').animeAppend();";
+ $callback .= "jQuery('$sel').animateAppend();";
}
- $js = "if (window.jQuery) jQuery(function(){ajaxReload('documents',function(){ $callback });});";
+ $js = "if (window.jQuery) jQuery(function(){ajaxReload('documents',{callback:function(){ $callback }});});";
$js = "<script type='text/javascript'>$js</script>";
$res['message_ok'] .= $js;
}
@@ -265,7 +265,7 @@ function joindre_options_upload_ftp($dir, $mode = 'document') {
$lefichier .
"</option>";
}
- }
+ }
$texte = join('', $texte_upload);
if (count($texte_upload)>1) {
diff --git a/modeles/document_case.html b/modeles/document_case.html
index 0929d8ca..59fa3f8b 100644
--- a/modeles/document_case.html
+++ b/modeles/document_case.html
@@ -36,7 +36,6 @@
]
</div>]
<div class="actions">
- <a href="[(#SELF|parametre_url{timestamp,#REM|time})]" class="refresh none ajax"><:medias:bouton_refresh_document:></a>
<BOUCLE_compte(documents_liens){id_document}{0,2} />
[(#TOTAL_BOUCLE|=={1}|et{#AUTORISER{modifier,#OBJET,#ID_OBJET}})[(#BOUTON_ACTION{<:medias:bouton_enlever_supprimer_document:>,#URL_ACTION_AUTEUR{dissocier_document,#ID_OBJET-#OBJET-#ID_DOCUMENT-suppr,#SELF},ajax,<:medias:bouton_enlever_supprimer_document_confirmation:>})]<span>|</span>]
[(#AUTORISER{modifier,#OBJET,#ID_OBJET})[(#BOUTON_ACTION{<:medias:bouton_enlever_document:>,#URL_ACTION_AUTEUR{dissocier_document,#ID_OBJET-#OBJET-#ID_DOCUMENT,#SELF},ajax})]<span>|</span>]
diff --git a/modeles/document_desc.html b/modeles/document_desc.html
index 33b6038b..a52f10bb 100644
--- a/modeles/document_desc.html
+++ b/modeles/document_desc.html
@@ -32,7 +32,6 @@
]
</div>]
<div class="actions">
- <a href="[(#SELF|parametre_url{timestamp,#REM|time})]" class="refresh none ajax"><:medias:bouton_refresh_document:></a>
<BOUCLE_compte(documents_liens){id_document}{0,2} />
[(#TOTAL_BOUCLE|=={1}|et{#AUTORISER{modifier,#OBJET,#ID_OBJET}})[(#BOUTON_ACTION{<:medias:bouton_enlever_supprimer_document:>,#URL_ACTION_AUTEUR{dissocier_document,#ID_OBJET-#OBJET-#ID_DOCUMENT-suppr-safe,#SELF},ajax,<:medias:bouton_enlever_supprimer_document_confirmation:>,'',[(function(){$("#doc(#ID_DOCUMENT)").animeRemove();return true;})()]})]<span>|</span>]
[(#AUTORISER{modifier,#OBJET,#ID_OBJET})[(#BOUTON_ACTION{<:medias:bouton_enlever_document:>,#URL_ACTION_AUTEUR{dissocier_document,#ID_OBJET-#OBJET-#ID_DOCUMENT--safe,#SELF},ajax,'','',[(function(){$("#doc(#ID_DOCUMENT)").animeRemove();return true;})()]})]<span>|</span>]
diff --git a/prive/squelettes/inclure/colonne-documents.html b/prive/squelettes/inclure/colonne-documents.html
index 19177ed4..ec3d3aa8 100644
--- a/prive/squelettes/inclure/colonne-documents.html
+++ b/prive/squelettes/inclure/colonne-documents.html
@@ -14,10 +14,10 @@
function editbox_init(){
jQuery('a.editbox:not(.nobox)')
.attr("onclick","").addClass('nobox').click(function(){
- var casedoc = jQuery(this).parents('div.item.document,div.item.image').eq(0);
- jQuery(casedoc).animeajax();
- jQuery.modalboxload(jQuery(this).attr('href'),{
- onClose: function (dialog) {var a = jQuery(casedoc).find('a.refresh');if (a.length) a.click();}
+ 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;
});
diff --git a/prive/squelettes/inclure/portfolio-documents.html b/prive/squelettes/inclure/portfolio-documents.html
index fb5d9dbd..a57c7f59 100644
--- a/prive/squelettes/inclure/portfolio-documents.html
+++ b/prive/squelettes/inclure/portfolio-documents.html
@@ -43,17 +43,17 @@
</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).animeajax();
- jQuery.modalboxload(jQuery(this).attr('href'),{
- onClose: function (dialog) {var a = jQuery(casedoc).find('a.refresh');if (a.length) a.click();}
+ 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;
});
- return false;
- });
-}
+ }
if (window.jQuery)
(function($){if(typeof onAjaxLoad == "function") onAjaxLoad(editbox_init);
$(editbox_init);
--
GitLab