From a9cd74b3fbe013a624605bfb5fd87294823b85df Mon Sep 17 00:00:00 2001 From: Bachir Soussi Chiadmi Date: Wed, 18 Apr 2018 11:42:11 +0200 Subject: [PATCH] bug fix --- .../figli/edlp_search/assets/dist/scripts/edlp_search.min.js | 5 +---- .../modules/figli/edlp_search/assets/scripts/edlp_search.js | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/sites/all/modules/figli/edlp_search/assets/dist/scripts/edlp_search.min.js b/sites/all/modules/figli/edlp_search/assets/dist/scripts/edlp_search.min.js index d2322afcc..c95d4fd4a 100644 --- a/sites/all/modules/figli/edlp_search/assets/dist/scripts/edlp_search.min.js +++ b/sites/all/modules/figli/edlp_search/assets/dist/scripts/edlp_search.min.js @@ -1,7 +1,4 @@ (function($,Drupal,drupalSettings){var settings=drupalSettings.edlp_search;var _$body=$('body');var _$container;var _$form;function init(){initEvents();initAjax();};function initEvents(){$('body').on('new-content-ajax-loaded',initAjax).on('edlp_search_search_form-col-closed',onSearchClosed);};function initAjax(){_$form=$('#edlp-search-form:not(.ajax-enabled)');if(!_$form.length)return false;_$form=$('#edlp-search-form:not(.ajax-enabled)').on('submit',onSubmitForm).addClass('ajax-enabled');_$container=_$form.parents('.row');if(!_$container.length){_$container=_$form.parent();}};function onSubmitForm(e){e.preventDefault();var args={};args.keys=$('input[type="search"]',this).val();args.entries=[];$('input[type="checkbox"]:checked','#edit-entries').each(function(index,el){args.entries.push($(this).val());});args.langues=$('input[name="language"]',this).val();args.genres=$('input[name="genres"]',this).val();loadResults(args);return false;};function loadResults(args){_$form.addClass('ajax-loading');_$body.addClass('ajax-loading');$('[theme="edlp_search_results"]',_$container).addClass('ajax-loading');var path=window.location.origin+drupalSettings.path.baseUrl+settings.results_ajax_url;$.getJSON(path,args).done(function(data){onResultsLoaded(data);}).fail(function(jqxhr,textStatus,error){onResultsLoadFail(jqxhr,textStatus,error);});};function onResultsLoaded(data){_$form.removeClass('ajax-loading');_$body.removeClass('ajax-loading');$prev_results=$('[theme="edlp_search_results"]',_$container);if($prev_results.length){$prev_results.replaceWith(data.rendered);}else{_$container.append(data.rendered);} -_$body.trigger({'type':'search-results-loaded','results':data.results_nids});if(typeof _paq!=='undefined'){var search_name='keys:'+data.keys -+';langues:'+data.langues -+';genres:'+data.genres -+';entries:'+data.entry_names.join(',');_paq.push(['trackEvent','AjaxSearch','Results',search_name,data.results_nids.length]);_paq.push(['trackSiteSearch',search_name,'search',data.results_nids.length]);}};function onResultsLoadFail(jqxhr,textStatus,error){void 0;};function onSearchClosed(e){$('div[theme="edlp_search_results"]').remove();_$body.trigger({'type':'search-closed'});} +_$body.trigger({'type':'search-results-loaded','results':data.results_nids});if(typeof _paq!=='undefined'){var search_name=data.keys+';'+data.langues+';'+data.genres+';'+data.entry_names.join(',');_paq.push(['trackSiteSearch',search_name,'search',data.results_nids.length]);}};function onResultsLoadFail(jqxhr,textStatus,error){void 0;};function onSearchClosed(e){$('div[theme="edlp_search_results"]').remove();_$body.trigger({'type':'search-closed'});} init();})(jQuery,Drupal,drupalSettings); \ No newline at end of file diff --git a/sites/all/modules/figli/edlp_search/assets/scripts/edlp_search.js b/sites/all/modules/figli/edlp_search/assets/scripts/edlp_search.js index a395f5d5a..efc24608b 100644 --- a/sites/all/modules/figli/edlp_search/assets/scripts/edlp_search.js +++ b/sites/all/modules/figli/edlp_search/assets/scripts/edlp_search.js @@ -102,7 +102,7 @@ // _paq.push(['trackPageView']); // trackEvent(category, action, [name], [value]) - var search_name = data.keys';'+data.langues+';'+data.genres';'+data.entry_names.join(','); + var search_name = data.keys+';'+data.langues+';'+data.genres+';'+data.entry_names.join(','); // _paq.push(['trackEvent', 'AjaxSearch', 'Results', search_name, data.results_nids.length]); // piwik track searches // trackSiteSearch(keyword, [category], [resultsCount])