From 991dd80ff7991a705ab19b9018136cdff131741b Mon Sep 17 00:00:00 2001
From: Ameen Ross <a.ross@amdev.eu>
Date: Sun, 6 Mar 2011 04:44:46 +0100
Subject: [PATCH] Committed

---
 js/advanced_forum.js                         |   18 +++++++++++-------
 styles/naked/advanced_forum.naked.images.css |    6 +++---
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/js/advanced_forum.js b/js/advanced_forum.js
index bf317a6..094b26f 100644
--- a/js/advanced_forum.js
+++ b/js/advanced_forum.js
@@ -55,7 +55,7 @@
 
       // Build cookie string
       cookie = '';
-      for(x in Drupal.advanced_forum.collapsed_page) {
+      for (x in Drupal.advanced_forum.collapsed_page) {
         cookie += '/' + x + '=' + Drupal.advanced_forum.collapsed_page[x];
       }
       // Save new cookie
@@ -73,9 +73,11 @@
 
     // Check if item is collapsed
     if (Drupal.advanced_forum.collapsed_current.indexOf(id) != -1) {
-      $('#forum-collapsible-' + id).addClass('advanced-forum-collapsed').closest('table').children('tbody').hide();
+      $(this).addClass('advanced-forum-collapsed');
+      $('#forum-table-' + id).hide();
     } else {
-      $('#forum-collapsible-' + id).removeClass('advanced-forum-collapsed').closest('table').children('tbody').show();
+      $(this).removeClass('advanced-forum-collapsed');
+      $('#forum-table-' + id).show();
     }
   };
 
@@ -83,10 +85,11 @@
    * Collapse forum.
    */
   Drupal.advanced_forum.collapse = function(id) {
+    $('#forum-collapsible-' + id).addClass('advanced-forum-collapsed');
     if (Drupal.settings.advanced_forum.effect == 'toggle') {
-      $('#forum-collapsible-' + id).addClass('advanced-forum-collapsed').closest('table').children('tbody').hide();
+      $('#forum-table-' + id).hide();
     } else {
-      $('#forum-collapsible-' + id).addClass('advanced-forum-collapsed').closest('table').children('tbody').fadeOut(150);
+      $('#forum-table-' + id).fadeOut(150);
     }
   };
 
@@ -94,10 +97,11 @@
    * Expand forum.
    */
   Drupal.advanced_forum.expand = function(id) {
+    $('#forum-collapsible-' + id).removeClass('advanced-forum-collapsed');
     if (Drupal.settings.advanced_forum.effect == 'toggle') {
-      $('#forum-collapsible-' + id).removeClass('advanced-forum-collapsed').closest('table').children('tbody').show();
+      $('#forum-table-' + id).show();
     } else {
-      $('#forum-collapsible-' + id).removeClass('advanced-forum-collapsed').closest('table').children('tbody').fadeIn(150);
+      $('#forum-table-' + id).fadeIn(150);
     }
   };
 
diff --git a/styles/naked/advanced_forum.naked.images.css b/styles/naked/advanced_forum.naked.images.css
index d8cecb8..250c5bf 100644
--- a/styles/naked/advanced_forum.naked.images.css
+++ b/styles/naked/advanced_forum.naked.images.css
@@ -12,12 +12,12 @@ td.forum-list-icon {
   display: block;
 }
 
-tr.even td.forum-list-icon-default .forum-list-icon-wrapper span, 
+tr.even td.forum-list-icon-default .forum-list-icon-wrapper span,
 tr.odd td.forum-list-icon-default .forum-list-icon-wrapper span {
   background: transparent url(images/forum_list_default.png) no-repeat center center;
 }
 
-tr.even td.forum-list-icon-new-posts .forum-list-icon-wrapper span, 
+tr.even td.forum-list-icon-new-posts .forum-list-icon-wrapper span,
 tr.odd td.forum-list-icon-new-posts .forum-list-icon-wrapper span {
   background: transparent url(images/forum_list_new_posts.png) no-repeat center center;
 }
@@ -99,6 +99,6 @@ span.advanced-forum-toggle {
   cursor: pointer;
   background: transparent url(images/container_collapse.png) no-repeat center center;
 }
-span.advanced-forum-toggle-collapsed {
+span.advanced-forum-toggle.advanced-forum-collapsed {
   background: transparent url(images/container_expand.png) no-repeat center center;
 }
-- 
1.7.0.4