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

event retriggering bug fixe

Browse Source 
Signed-off-by: bachy <git@g-u-i.net>
This commit is contained in:
bachy 2012-11-09 22:13:48 +01:00
parent 63df1c8f3a
commit d97c0a2e45
6 changed files with 38 additions and 33 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

4
js/materio_flag.js
View File

@ -21,9 +21,11 @@ MaterioFlag = function(){
ajaxifyLinks();
// 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);
};

2
js/materio_page_title-ck.js
View File

File diff suppressed because one or more lines are too long

2
js/materio_page_title.js
View File

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

2
js/materio_search_api_ajax-ck.js
View File

File diff suppressed because one or more lines are too long

31
js/materio_search_api_ajax.js
View File

@ -44,6 +44,7 @@ MaterioSearchApiAjax = function(){
.bind('history-state-change', onHistoryStateChange);
// trigger updated event for direct html loading
if( isActuality() || isExplore() ){
setTimeout(function(){
var event = jQuery.Event('resultschanged');
@ -53,8 +54,10 @@ MaterioSearchApiAjax = function(){
if(isActuality())
event.container = '#content .actuality-items';
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
};
/**