diff --git a/dist/fond/ajax.html b/dist/fond/ajax.html index fc5232dfcca983d9f89567be7a793760885e9fa3..44ca01fbe6d60e51907ec87427f1f40c360e9936 100644 --- a/dist/fond/ajax.html +++ b/dist/fond/ajax.html @@ -10,7 +10,7 @@ if (window.jQuery) { .prepend('<div><input type=\'hidden\' name=\'var_ajax_env\' value=\'#GET{env}\' />' +'<input type=\'hidden\' name=\'var_ajax_cle\' value=\'#GET{cle}\' /><\/div>') .ajaxbloc(); - } + }; jQuery('document').ready(ajaxbloc_#GET{ajaxid}); onAjaxLoad(ajaxbloc_#GET{ajaxid}); } diff --git a/dist/fond/ajax_stat.html b/dist/fond/ajax_stat.html index 3debca3a3565efdd5dc2ee1d433de2534fe6d954..f73b1328faa9d0cbf27f1893869d9cd54f7c6705 100644 --- a/dist/fond/ajax_stat.html +++ b/dist/fond/ajax_stat.html @@ -10,7 +10,7 @@ if (window.jQuery) { .prepend('<div><input type=\'hidden\' name=\'var_ajax_env\' value=\'#GET{env}\' />' +'<input type=\'hidden\' name=\'var_ajax_cle\' value=\'#GET{cle}\' /><\/div>') .ajaxbloc(); - } + }; jQuery('document').ready(ajaxbloc_#GET{ajaxid}); onAjaxLoad(ajaxbloc_#GET{ajaxid}); } diff --git a/dist/formulaires/formulaire_.html b/dist/formulaires/formulaire_.html index 00c8710eab9849be19e1f7dc34ebb9806f140d7a..fbcd67b9f607da0a8fdd5f3fa2a49250565fcaf0 100644 --- a/dist/formulaires/formulaire_.html +++ b/dist/formulaires/formulaire_.html @@ -4,9 +4,8 @@ <script type='text/javascript'>/*<!#EVAL{chr(91)}CDATA#EVAL{chr(91)}*/ if (window.jQuery) { var ajaxform_#ENV{ajaxid} = function() { - jQuery('div#[(#ENV{ajaxid})] form',this) - .formulaire_dyn_ajax('#ENV{ajaxid}'); - } + jQuery('##ENV{ajaxid}',this).formulaire_dyn_ajax(); + }; jQuery('document') .ready(ajaxform_#ENV{ajaxid}); onAjaxLoad(ajaxform_#ENV{ajaxid}); diff --git a/dist/javascript/ajaxCallback.js b/dist/javascript/ajaxCallback.js index 211ebc98fd6c188e8277a72cb8cc27feac9b78bb..d59e4dc4cf599d85e4270da3322c3ad22932f495 100644 --- a/dist/javascript/ajaxCallback.js +++ b/dist/javascript/ajaxCallback.js @@ -64,23 +64,24 @@ jQuery.fn.animeajax = function(end) { return this; // don't break the chain } -// rechargement ajax d'un formulaire dynamique implemente par formulaires/forumlaire_.html +// rechargement ajax d'un formulaire dynamique implemente par formulaires/formulaire_.html jQuery.fn.formulaire_dyn_ajax = function(target) { + if (typeof target == 'undefined') target = this; this - .not('.noajax') - .prepend("<"+"input type='hidden' name='var_ajax' value='1' /"+">") - .ajaxForm({"target":'#'+target, - "beforeSubmit": - function(){ - $('#'+target).animeajax().addClass('loading'); + .find('form:not(.noajax)') + .prepend("<input type='hidden' name='var_ajax' value='1' />") + .ajaxForm({ + target: target, + beforeSubmit: function(){ + jQuery(target).animeajax().addClass('loading'); }, - "success": - function(){ - $('#'+target).removeClass('loading'); + success: function(){ + jQuery(target).removeClass('loading'); window.location.hash = target; } - }) - .addClass('.noajax'); // previent qu'on n'ajaxera pas deux fois le meme formulaire en cas de ajaxload + }) + .addClass('.noajax') // previent qu'on n'ajaxera pas deux fois le meme formulaire en cas de ajaxload + .end(); return this; // don't break the chain } @@ -90,31 +91,31 @@ var preloaded_urls = {}; var ajaxbloc_selecteur; jQuery.fn.ajaxbloc = function() { var blocfrag = this; - var ajax_env = $('input[@name=var_ajax_env]',this).eq(0).attr('value'); + var ajax_env = jQuery('input[@name=var_ajax_env]',this).eq(0).attr('value'); if (!ajax_env || ajax_env==undefined) return; - var ajax_cle = $('input[@name=var_ajax_cle]',this).eq(0).attr('value'); + var ajax_cle = jQuery('input[@name=var_ajax_cle]',this).eq(0).attr('value'); if (!ajax_cle || ajax_cle==undefined) return; if (ajaxbloc_selecteur==undefined) ajaxbloc_selecteur = '.pagination a,a.ajax'; - $(ajaxbloc_selecteur,this).not('.noajax').each(function(){ + jQuery(ajaxbloc_selecteur,this).not('.noajax').each(function(){ var url = this.href.split('#'); url[0] += (url[0].indexOf("?")>0 ? '&':'?')+'var_ajax=1&var_ajax_env='+ajax_env+'&var_ajax_cle='+ajax_cle; - if ($(this).is('.preload') && !preloaded_urls[url[0]]) { - $.ajax({"url":url[0],"success":function(r){preloaded_urls[url[0]]=r;}}); + if (jQuery(this).is('.preload') && !preloaded_urls[url[0]]) { + jQuery.ajax({"url":url[0],"success":function(r){preloaded_urls[url[0]]=r;}}); } - $(this).click(function(){ - $(blocfrag).animeajax().addClass('loading'); + jQuery(this).click(function(){ + jQuery(blocfrag).animeajax().addClass('loading'); var on_pagination = function(contenu) { preloaded_urls[url[0]] = contenu; - $(blocfrag).html(preloaded_urls[url[0]]); - $(blocfrag).removeClass('loading'); + jQuery(blocfrag).html(preloaded_urls[url[0]]); + jQuery(blocfrag).removeClass('loading'); window.location.hash = url[1]; } if(preloaded_urls[url[0]]) { on_pagination(preloaded_urls[url[0]]); triggerAjaxLoad(blocfrag); } else { - $.ajax({"url":url[0],"success":on_pagination}); + jQuery.ajax({"url":url[0],"success":on_pagination}); } return false; });