bachir/materio-base-legacy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

$.event.trigger({type:'blabla

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/materio_flag-ck.js
View File

File diff suppressed because one or more lines are too long

86
js/materio_flag.js
View File

@ -47,9 +47,10 @@ MaterioFlag = function(){
trace('block refreshed '+type, json); trace('block refreshed '+type, json);
$(id).replaceWith(json.block); $(id).replaceWith(json.block);
var event = jQuery.Event('my'+type+'-block-updated'); $.event.trigger({
event.listname = name; type : 'my'+type+'-block-updated',
$.event.trigger(event); listname : name
});
}); });
} }
@ -111,11 +112,12 @@ MaterioFlag = function(){
var path = Drupal.settings.basePath + Drupal.settings.pathPrefix + json.path; var path = Drupal.settings.basePath + Drupal.settings.pathPrefix + json.path;
var event = jQuery.Event('new-history-page'); $.event.trigger({
event.path = path; type : 'new-history-page',
event.title = json.title; path : path,
event.content = json.return; title : json.title,
$.event.trigger(event); content : json.return
});
// TODO: change language links for folders // TODO: change language links for folders
// for (language in Drupal.settings.materio_search_api_ajax.languages) { // for (language in Drupal.settings.materio_search_api_ajax.languages) {
@ -131,9 +133,10 @@ MaterioFlag = function(){
}; };
function triggerContentChanged(){ function triggerContentChanged(){
var event = jQuery.Event('resultschanged'); $.event.trigger({
event.container = '#content .flaglist-items'; type: 'resultschanged',
$.event.trigger(event); container : '#content .flaglist-items'
});
}; };
function onClickCreatLink(event){ function onClickCreatLink(event){
@ -153,12 +156,11 @@ MaterioFlag = function(){
function showCreateListForm(json, $link){ function showCreateListForm(json, $link){
// google analytics // google analytics
var estat = jQuery.Event('record-stat'); $.event.trigger({
estat.path = false; type:"record-stat",
estat.categorie = 'FlagLists'; categorie:"flagLists",
estat.action = 'show create form'; action: 'show create form'
estat.label = ''; });
$.event.trigger(estat);
var $modal = $('<div id="modal" class="modal"/>').appendTo('body'); var $modal = $('<div id="modal" class="modal"/>').appendTo('body');
$modal $modal
@ -177,12 +179,11 @@ MaterioFlag = function(){
$(this).parents('#modal').remove(); $(this).parents('#modal').remove();
// google analytics // google analytics
var estat = jQuery.Event('record-stat'); $.event.trigger({
estat.path = false; type:"record-stat",
estat.categorie = 'FlagLists'; categorie:"flagLists",
estat.action = 'cancel create form'; action: 'cancel create form'
estat.label = ''; });
$.event.trigger(estat);
break; break;
case 'create': case 'create':
@ -191,12 +192,12 @@ MaterioFlag = function(){
var type = $(this).parents('form').find('input[name*="type"]').val(); var type = $(this).parents('form').find('input[name*="type"]').val();
// google analytics // google analytics
var estat = jQuery.Event('record-stat'); $.event.trigger({
estat.path = false; type : "record-stat",
estat.categorie = 'FlagLists'; categorie : "flagLists",
estat.action = 'submit create form'; action : "submit create form",
estat.label = 'title : '+title; label : 'title : '+title
$.event.trigger(estat); });
createList($modal, type, title, $link); createList($modal, type, title, $link);
break; break;
@ -205,6 +206,7 @@ MaterioFlag = function(){
return false; return false;
}) })
.parents('form').find('input[type="text"]').focus(); .parents('form').find('input[type="text"]').focus();
// TODO: esc keypressed close the form
}; };
function createList($modal, type, title, $link){ function createList($modal, type, title, $link){
@ -238,12 +240,12 @@ MaterioFlag = function(){
if (data2.status) { if (data2.status) {
// google analytics // google analytics
var estat = jQuery.Event('record-stat'); $.event.trigger({
estat.path = false; type : "record-stat",
estat.categorie = 'FlagLists'; categorie : 'FlagLists',
estat.action = 'node flaged'; action : 'node flaged',
estat.label = 'nid : '+nid+' | flag : '+name; label : 'nid : '+nid+' | flag : '+name
$.event.trigger(estat); });
refreshBlocks(name); refreshBlocks(name);
refreshNodeLinks(); refreshNodeLinks();
@ -283,9 +285,10 @@ MaterioFlag = function(){
} }
}); });
var event = jQuery.Event('materioflag-nodelinks-updated'); $.event.trigger({
event.nids = nids; type : 'materioflag-nodelinks-updated',
$.event.trigger(event); nids : nids
});
}; };
function onInitScrollerPager(event){ function onInitScrollerPager(event){
@ -342,9 +345,10 @@ MaterioFlag = function(){
}, 150*i); }, 150*i);
}); });
var event = jQuery.Event('resultscompleted'); $.event.trigger({
event.container = $(container_class, '#content'); type : 'resultscompleted',
$.event.trigger(event); container : $(container_class, '#content')
});
}; };
function onViewModeChanged(event){ function onViewModeChanged(event){

2
js/materio_search_api_ajax-ck.js
View File

File diff suppressed because one or more lines are too long

68
js/materio_search_api_ajax.js
View File

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