event retriggering bug fixe

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

js/materio_flag.js

@@ -20,10 +20,12 @@ MaterioFlag = function(){
 
     ajaxifyLinks();
 
-      // trigger updated event for direct html loading
-    setTimeout(function(){
-      triggerContentChanged();
-    }, 10);  
+    // trigger updated event for direct html loading
+    if(isList()){
+      setTimeout(function(){
+        triggerContentChanged();
+      }, 10);
+    }
   };
 
   function onFlaging(event){
@@ -55,7 +57,7 @@ MaterioFlag = function(){
   };
 
   function onResultsUpdated(event){
-    trace('onResultsUpdated', event);
+    trace('MaterioFlag :: onResultsUpdated', event);
     ajaxifyLinks(event.container);
   };
 

js/materio_page_title.js

@@ -9,7 +9,7 @@ MaterioPageTitle = function(){
   };
 
   function onRefreshBlock(event){
-    trace('onRefreshBlock', event);
+    trace('MaterioPageTitle :: onRefreshBlock', event);
     // var url = Drupal.settings.basePath+Drupal.settings.pathPrefix+'materio_page_title/refresh/block';
     // $.getJSON(url, function(json){
     //   trace('page title json', json);

js/materio_search_api_ajax.js

@@ -44,17 +44,20 @@ MaterioSearchApiAjax = function(){
       .bind('history-state-change', onHistoryStateChange);
     
     // trigger updated event for direct html loading
-    setTimeout(function(){
-      var event = jQuery.Event('resultschanged');
-      
-      if(isExplore())
-        event.container = '#content .search-results';
-
-      if(isActuality())
-        event.container = '#content .actuality-items';  
+    if( isActuality() || isExplore() ){
+      setTimeout(function(){
+        var event = jQuery.Event('resultschanged');
+        
+        if(isExplore())
+          event.container = '#content .search-results';
+  
+        if(isActuality())
+          event.container = '#content .actuality-items';  
 
-      $.event.trigger(event);  
-    }, 10);  
+        trace('MaterioSearchApiAjax :: initSearchAjax :: triggering resultschanged')
+        $.event.trigger(event);  
+      }, 10);
+    }
   };
   
   function getSearchKeys(){
@@ -98,21 +101,7 @@ MaterioSearchApiAjax = function(){
             _isloadingresults = false;
             $('#materio-search-api-search-form').removeClass('loading');
 
-            var path = Drupal.settings.basePath + Drupal.settings.pathPrefix + json.search_path + '/' + json.keys;
-            
-            var event = jQuery.Event('new-history-page');
-            event.path = path;
-            event.title = json.title;
-            event.content = json.return;
-            $.event.trigger(event);
-            
-            for (language in Drupal.settings.materio_search_api_ajax.languages) {
-              var l = Drupal.settings.materio_search_api_ajax.languages[language];
-              $('#block-locale-language li.'+language+' a').attr('href', Drupal.settings.basePath + l.prefix+'/' + json.search_path + '/' + json.keys)        
-            };
-
             changeContent(json);
-
         });
       }
     }
@@ -138,6 +127,7 @@ MaterioSearchApiAjax = function(){
 
   function changeContent(json){
     trace('MaterioSearchApiAjax changeContent | json', json);
+
     if(json.return){
       $.event.trigger('loaded-content');
       $('.inner-content',_$content).html(json.return);
@@ -145,9 +135,21 @@ MaterioSearchApiAjax = function(){
     }else{
       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);
+    
+    for (language in Drupal.settings.materio_search_api_ajax.languages) {
+      var l = Drupal.settings.materio_search_api_ajax.languages[language];
+      $('#block-locale-language li.'+language+' a').attr('href', Drupal.settings.basePath + l.prefix+'/' + json.search_path + '/' + json.keys)        
+    };
   };
 
   function triggerContentChanged(){
+    trace('MaterioSearchApiAjax :: triggerContentChanged');
     var event = jQuery.Event('resultschanged');
     event.container = '#content .search-results, #content .actuality-items';
     // event.title = json.title;
@@ -273,6 +275,7 @@ MaterioSearchApiAjax = function(){
   function onHistoryStateChange(event){
     if(isExplore() || isActuality())
       triggerContentChanged();
+    // TODO:  pushstate trogger state change, so we have a retriggerring here on loading new results … how to avoid this  
   };
 
   /**