--- E:\work\collapsiblock\collapsiblock.js	2008-12-13 06:42:04.000000000 +-0100
+++ C:\xampp\htdocs\drupal\sites\all\modules\custom\collapsiblock\collapsiblock.js	2009-07-29 11:13:59.000000000 +-0100
@@ -4,25 +4,29 @@
 
 Drupal.behaviors.collapsiblock = function (context) {
   var cookieData = Drupal.Collapsiblock.getCookieData();
   var slidetype = Drupal.settings.collapsiblock.slide_type;
   var defaultState = Drupal.settings.collapsiblock.default_state;
   var slidespeed = parseInt(Drupal.settings.collapsiblock.slide_speed);
-  $('div.block:not(.collapsiblock-processed)', context).addClass('collapsiblock-processed').each(function () {
-    var selector = Drupal.settings.collapsiblock && Drupal.settings.collapsiblock.titleSelector ? Drupal.settings.collapsiblock.titleSelector : 'h2';
+  var titleSelector = Drupal.settings.collapsiblock && Drupal.settings.collapsiblock.titleSelector ? Drupal.settings.collapsiblock.titleSelector : 'h2';
+  var blockSelector = Drupal.settings.collapsiblock && Drupal.settings.collapsiblock.blockSelector ? Drupal.settings.collapsiblock.blockSelector : 'div.block';
+  var contentSelector = Drupal.settings.collapsiblock && Drupal.settings.collapsiblock.contentSelector ? Drupal.settings.collapsiblock.contentSelector : 'div.content';
+  
+  $(blockSelector+':not(.collapsiblock-processed)', context).addClass('collapsiblock-processed').each(function () {
+    
     var id = this.id;
-    var titleElt = $(selector +':first', this);
+    var titleElt = $(titleSelector +':first', this);
     if (titleElt.size()) {
       titleElt = titleElt[0];
       // Status values: 1 = not collapsible, 2 = collapsible and expanded, 3 = collapsible and collapsed, 4 = always collapsed
       var stat = Drupal.settings.collapsiblock.blocks[this.id] ? Drupal.settings.collapsiblock.blocks[this.id] : defaultState;
       if (stat == 1) {
         return;
       }
 
-      titleElt.target = $(this).find('div.content');
+      titleElt.target = $(this).find(contentSelector);
       $(titleElt)
         .addClass('collapsiblock')
         .click(function () {
           var st = Drupal.Collapsiblock.getCookieData();
           if ($(this).is('.collapsiblockCollapsed')) {
             $(this).removeClass('collapsiblockCollapsed');
