? SolrPhpClient Index: apachesolr.js =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/apachesolr/apachesolr.js,v retrieving revision 1.1.2.2.2.5 diff -u -F^function -r1.1.2.2.2.5 apachesolr.js --- apachesolr.js 28 Jul 2009 13:53:37 -0000 1.1.2.2.2.5 +++ apachesolr.js 19 Oct 2009 23:18:41 -0000 @@ -2,6 +2,10 @@ Drupal.behaviors.apachesolr = function(context) { $('.apachesolr-hidden-facet').hide(); + var facetBlockSelectors = new Array(); + for (var i in Drupal.settings.apachesolr_facet_modules) { + facetBlockSelectors.push('.block-' + Drupal.settings.apachesolr_facet_modules[i] + ':has(.apachesolr-hidden-facet)'); + } $('').text(Drupal.t('Show more')).click(function() { if ($(this).prev().find('.apachesolr-hidden-facet:visible').length == 0) { $(this).prev().find('.apachesolr-hidden-facet').show(); @@ -12,7 +16,7 @@ $(this).text(Drupal.t('Show more')); } return false; - }).appendTo($('.block-apachesolr_search:has(.apachesolr-hidden-facet), .block-apachesolr:has(.apachesolr-hidden-facet)')); + }).appendTo($(facetBlockSelectors.join(','))); if (Drupal.settings.apachesolr_facetstyle == 'checkboxes') { // Find all facet links and give them a checkbox Index: apachesolr.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/apachesolr/apachesolr.module,v retrieving revision 1.1.2.12.2.155.2.31 diff -u -F^function -r1.1.2.12.2.155.2.31 apachesolr.module --- apachesolr.module 19 Oct 2009 14:46:52 -0000 1.1.2.12.2.155.2.31 +++ apachesolr.module 19 Oct 2009 23:18:42 -0000 @@ -1763,6 +1763,7 @@ function apachesolr_js() { // Only add the js stuff once. if (empty($settings)) { $settings['apachesolr_facetstyle'] = variable_get('apachesolr_facetstyle', 'checkboxes'); + $settings['apachesolr_facet_modules'] = array_keys(apachesolr_get_enabled_facets()); drupal_add_js($settings, 'setting'); drupal_add_js(drupal_get_path('module', 'apachesolr') . '/apachesolr.js'); }