$.event.trigger({type:'blabla

event = jQuery.Event('blabla')
…
become
$.event.trigger({type:'blabla
…

Signed-off-by: bachy <git@g-u-i.net>
This commit is contained in:
bachy
2012-11-11 13:50:11 +01:00
parent d97c0a2e45
commit 7dafe10be1
4 changed files with 77 additions and 81 deletions

View File

@@ -46,16 +46,11 @@ MaterioSearchApiAjax = function(){
// trigger updated event for direct html loading
if( isActuality() || isExplore() ){
setTimeout(function(){
var event = jQuery.Event('resultschanged');
if(isExplore())
event.container = '#content .search-results';
if(isActuality())
event.container = '#content .actuality-items';
trace('MaterioSearchApiAjax :: initSearchAjax :: triggering resultschanged')
$.event.trigger(event);
$.event.trigger({
type : 'resultschanged',
container : isActuality() ? '#content .actuality-items' : '#content .search-results'
});
}, 10);
}
};
@@ -85,12 +80,12 @@ MaterioSearchApiAjax = function(){
$('#materio-search-api-search-form').addClass('loading');
// google analytics
var estat = jQuery.Event('record-stat');
estat.path = false;
estat.categorie = 'Search event';
estat.action = 'Search';
estat.label = 'keys :'+ keys +' | filters : '+ stringTypes.join(' ,');
$.event.trigger(estat);
$.event.trigger({
type : "record-stat",
categorie : 'Search event',
action : 'Search',
label : 'keys :'+ keys +' | filters : '+ stringTypes.join(' ,')
});
// TODO: record ajax path in a variable from materio_search_api_ajax_init
$.getJSON(Drupal.settings.basePath+Drupal.settings.pathPrefix+'materio_search_api_ajax/search/'+keys,
@@ -136,11 +131,12 @@ MaterioSearchApiAjax = function(){
trace('no results');
}
var event = jQuery.Event('new-history-page');
event.path = Drupal.settings.basePath + Drupal.settings.pathPrefix + json.search_path + '/' + json.keys;
event.title = json.title;
event.content = json.return;
$.event.trigger(event);
$.event.trigger({
type : 'new-history-page',
path : Drupal.settings.basePath + Drupal.settings.pathPrefix + json.search_path + '/' + json.keys,
title : json.title,
content : json.return
});
for (language in Drupal.settings.materio_search_api_ajax.languages) {
var l = Drupal.settings.materio_search_api_ajax.languages[language];
@@ -150,10 +146,10 @@ MaterioSearchApiAjax = function(){
function triggerContentChanged(){
trace('MaterioSearchApiAjax :: triggerContentChanged');
var event = jQuery.Event('resultschanged');
event.container = '#content .search-results, #content .actuality-items';
// event.title = json.title;
$.event.trigger(event);
$.event.trigger({
type : 'resultschanged',
container : '#content .search-results, #content .actuality-items'
});
};
function onInitScrollerPager(event){
@@ -219,9 +215,10 @@ MaterioSearchApiAjax = function(){
}, 150*i);
});
var event = jQuery.Event('resultscompleted');
event.container = $(container_class, _$content);
$.event.trigger(event);
$.event.trigger({
type : 'resultscompleted',
container : $(container_class, _$content)
});
};
/**
@@ -241,17 +238,12 @@ MaterioSearchApiAjax = function(){
if (json.statut == "saved"){
// google analytics
var estat = jQuery.Event('record-stat');
estat.path = false;
estat.categorie = 'Viewmode';
estat.action = vm;
if(isExplore())
estat.label = 'Search results';
if(isActuality())
estat.label = 'Actualities';
$.event.trigger(estat);
$.event.trigger({
type : "record-stat",
categorie : 'Viewmode',
action : vm,
label : isActuality() ? 'Actualities' : 'Search results'
});
$.event.trigger('view-mode-changed');
$('.viewmode-link, .viewmode-link i').removeClass('active');