$.event.trigger({type:'blabla

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

Signed-off-by: bachy <git@g-u-i.net>

js/materio_flag.js

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

js/materio_search_api_ajax.js

@@ -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');