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

conjunction OR ++

Browse Source 
ajax : keys aren't args any more, because of a+b+c

Signed-off-by: bachy <git@g-u-i.net>
This commit is contained in:
bachy
2013-01-03 16:04:25 +01:00
parent 2601c718c2
commit bcf209570a
10 changed files with 802 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
js/materio_search_api_ajax.js
View File

@@ -10,7 +10,7 @@ MaterioSearchApiAjax = function(){
* init()
*/
function init(){
trace('init MaterioSearchApiAjax');
//trace('init MaterioSearchApiAjax');
initSearchAjax();
initViewMode();
@@ -49,7 +49,7 @@ MaterioSearchApiAjax = function(){
// trigger updated event for direct html loading
if( isActuality() || isExplore() ){
setTimeout(function(){
trace('MaterioSearchApiAjax :: initSearchAjax :: triggering resultschanged')
//trace('MaterioSearchApiAjax :: initSearchAjax :: triggering resultschanged')
$.event.trigger({
type : 'resultschanged',
container : isActuality() ? '#content .actuality-items' : '#content .search-results'
@@ -63,8 +63,8 @@ MaterioSearchApiAjax = function(){
};
function loadResults(keys){
// trace('keys', keys);
if(keys !== undefined){
trace('keys', keys);
if(keys !== undefined && keys !== '' && keys.length >= 2){
keys = keys.replace('/', ' ');
var types = {}, stringTypes = [];
@@ -74,7 +74,7 @@ MaterioSearchApiAjax = function(){
stringTypes.push($this.val());
types[$this.val()] = $this.attr('checked');
});
trace('types', types);
//trace('types', types);
if(!_isloadingresults){
@@ -83,14 +83,11 @@ MaterioSearchApiAjax = function(){
$('#materio-search-api-search-form').addClass('loading');
// trace('window.location.href',window.location.href);
// 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,
{'types':types,'current_path':document.location.href},
$.getJSON(Drupal.settings.basePath+Drupal.settings.pathPrefix+'materio_search_api_ajax/search/',
{'types':types,'current_path':document.location.href, keys:keys},
function(json){
trace('json', json);
$.event.trigger('loaded-content');
_isloadingresults = false;
$('#materio-search-api-search-form').removeClass('loading');
//trace('json', json);
// google analytics
$.event.trigger({
type : "record-stat",
@@ -99,9 +96,13 @@ MaterioSearchApiAjax = function(){
label : 'filters : '+ stringTypes.join(' ,'),
value : json.count
});
if(json.redirect){
window.location = json.redirect;
}else{
$.event.trigger('loaded-content');
_isloadingresults = false;
$('#materio-search-api-search-form').removeClass('loading');
changeContent(json);
}
@@ -119,7 +120,7 @@ MaterioSearchApiAjax = function(){
var url = Drupal.settings.basePath+Drupal.settings.pathPrefix+'materio_search_api_ajax/actuality';
$.getJSON(url,
function(json){
trace('json', json);
//trace('json', json);
$.event.trigger('resultsloaded');
_isloadingresults = false;
$('#materio-search-api-search-form').removeClass('loading');
@@ -136,7 +137,7 @@ MaterioSearchApiAjax = function(){
$('.inner-content',_$content).html(json.return).find('ul.pager').hide();
triggerContentChanged();
}else{
trace('no results');
//trace('no results');
}
$.event.trigger({
@@ -153,7 +154,7 @@ MaterioSearchApiAjax = function(){
};
function triggerContentChanged(){
trace('MaterioSearchApiAjax :: triggerContentChanged');
//trace('MaterioSearchApiAjax :: triggerContentChanged');
$.event.trigger({
type : 'resultschanged',
container : '#content .search-results, #content .actuality-items'
@@ -179,9 +180,9 @@ MaterioSearchApiAjax = function(){
// trace('loadNextResultsPage');
var keys = href.match(/explore\/([^\/|\?]+)/);
var page = href.match(/\?page=([0-9]+)/);
var url = Drupal.settings.basePath+Drupal.settings.pathPrefix+'materio_search_api_ajax/search/'+keys[1]+'/'+page[1];
var url = Drupal.settings.basePath+Drupal.settings.pathPrefix+'materio_search_api_ajax/search/'+page[1];
loadNextPage(url, $('.materiobase-results', _$content), '.search-results');
loadNextPage(url, keys[1], $('.materiobase-results', _$content), '.search-results');
};
function loadNextActualityPage(href){
@@ -189,15 +190,15 @@ MaterioSearchApiAjax = function(){
var page = href.match(/\?page=([0-9]+)/);
var url = Drupal.settings.basePath+Drupal.settings.pathPrefix+'materio_search_api_ajax/actuality/'+page[1];
loadNextPage(url, $('.materiobase-actuality', _$content), '.actuality-items');
loadNextPage(url, '', $('.materiobase-actuality', _$content), '.actuality-items');
};
function loadNextPage(url, $container, target){
trace('MaterioSearchApiAjax :: loadNextPage()');
function loadNextPage(url, keys, $container, target){
//trace('MaterioSearchApiAjax :: loadNextPage()');
_isloadingresults = true;
$container.addClass('loading');
$.getJSON(url, function(json){
trace('json', json);
$.getJSON(url, {'keys':keys}, function(json){
//trace('json', json);
$container.removeClass('loading');
addNextpage(json, target);
// addNextpageItemByItem($(json.return), target);
@@ -229,7 +230,7 @@ MaterioSearchApiAjax = function(){
// TEST not used
function addNextpageItemByItem($newcontent, container_class){
trace('MaterioSearchApiAjax :: addNextpageItemByItem()');
//trace('MaterioSearchApiAjax :: addNextpageItemByItem()');
$('ul.pager', _$content).remove();
$(container_class, _$content).append($(container_class, $newcontent).children('article').eq(0));
@@ -265,7 +266,7 @@ MaterioSearchApiAjax = function(){
if(!_isloadingresults){
_isloadingresults = true;
$.getJSON(Drupal.settings.basePath+'materio_search_api_ajax/viewmode/change/'+vm, function(json){
trace('viewmode json', json);
//trace('viewmode json', json);
_isloadingresults = false;
if (json.statut == "saved"){
@@ -314,11 +315,7 @@ MaterioSearchApiAjax = function(){
return $('.actuality-items', '#content').length;
};
init();
};
var materiosearchapiajax = new MaterioSearchApiAjax();