? faq-762152.patch
Index: faq.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/faq/Attic/faq.admin.inc,v
retrieving revision 1.1.2.26.2.2
diff -u -p -r1.1.2.26.2.2 faq.admin.inc
--- faq.admin.inc	8 Oct 2010 21:53:37 -0000	1.1.2.26.2.2
+++ faq.admin.inc	12 Dec 2010 19:31:34 -0000
@@ -43,8 +43,9 @@ function faq_general_settings_form($form
     '#default_value' => variable_get('faq_description', ''),
     '#description' => t('Your FAQ description.  This will be placed at the top of the page, above the questions and can serve as an introductory text.'),
     '#rows' => 5,
+    '#format' => variable_get('faq_description_format', NULL),
   );
-  $form['body_filter']['faq_description_format'] = filter_form(variable_get('faq_description_format', ''), NULL, array('faq_description_format'));
+
   $form['faq_custom_breadcrumbs'] = array(
     '#type' => 'checkbox',
     '#title' => t('Create custom breadcrumbs for the FAQ'),
Index: faq.js
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/faq/faq.js,v
retrieving revision 1.1.2.6.2.26
diff -u -p -r1.1.2.6.2.26 faq.js
--- faq.js	15 Sep 2010 14:03:30 -0000	1.1.2.6.2.26
+++ faq.js	12 Dec 2010 19:31:34 -0000
@@ -1,231 +1,233 @@
 /* $Id: faq.js,v 1.1.2.6.2.26 2010/09/15 14:03:30 snpower Exp $ */
 
-function teaser_handler(event) {
-  if ($("input[name=faq_display]:checked").val() != "new_page") {
-    if ($("input[name=faq_use_teaser]:checked").val() == 1) {
-      $("input[name=faq_more_link]").removeAttr("disabled");
-    }
-    else {
-      $("input[name=faq_more_link]").attr("disabled", "disabled");
+(function ($) {
+  function teaser_handler(event) {
+    if ($("input[name=faq_display]:checked").val() != "new_page") {
+      if ($("input[name=faq_use_teaser]:checked").val() == 1) {
+        $("input[name=faq_more_link]").removeAttr("disabled");
+      }
+      else {
+        $("input[name=faq_more_link]").attr("disabled", "disabled");
+      }
     }
   }
-}
 
-function faq_display_handler(event) {
-  // Enable / disable "questions_inline" and "questions_top" only settings.
-  if ($("input[name=faq_display]:checked").val() == "questions_inline" || $("input[name=faq_display]:checked").val() == "questions_top") {
-    $("input[name=faq_back_to_top]").removeAttr("disabled");
-    $("input[name=faq_qa_mark]").removeAttr("disabled");
-    // Enable / disable label settings according to "qa_mark" setting.
-    if ($("input[name=faq_qa_mark]:checked").val() == 1) {
-      $("input[name=faq_question_label]").removeAttr("disabled");
-      $("input[name=faq_answer_label]").removeAttr("disabled");
+  function faq_display_handler(event) {
+    // Enable / disable "questions_inline" and "questions_top" only settings.
+    if ($("input[name=faq_display]:checked").val() == "questions_inline" || $("input[name=faq_display]:checked").val() == "questions_top") {
+      $("input[name=faq_back_to_top]").removeAttr("disabled");
+      $("input[name=faq_qa_mark]").removeAttr("disabled");
+      // Enable / disable label settings according to "qa_mark" setting.
+      if ($("input[name=faq_qa_mark]:checked").val() == 1) {
+        $("input[name=faq_question_label]").removeAttr("disabled");
+        $("input[name=faq_answer_label]").removeAttr("disabled");
+      }
+      else {
+        $("input[name=faq_question_label]").attr("disabled", "disabled");
+        $("input[name=faq_answer_label]").attr("disabled", "disabled");
+      }
     }
     else {
+      $("input[name=faq_back_to_top]").attr("disabled", "disabled");
+      $("input[name=faq_qa_mark]").attr("disabled", "disabled");
       $("input[name=faq_question_label]").attr("disabled", "disabled");
       $("input[name=faq_answer_label]").attr("disabled", "disabled");
     }
-  }
-  else {
-    $("input[name=faq_back_to_top]").attr("disabled", "disabled");
-    $("input[name=faq_qa_mark]").attr("disabled", "disabled");
-    $("input[name=faq_question_label]").attr("disabled", "disabled");
-    $("input[name=faq_answer_label]").attr("disabled", "disabled");
-  }
-
-  // Enable / disable "hide_answer" only settings.
-  if ($("input[name=faq_display]:checked").val() != "hide_answer") {
-    $("input[name=faq_hide_qa_accordion]").attr("disabled", "disabled");
-  }
-  else {
-    $("input[name=faq_hide_qa_accordion]").removeAttr("disabled");
-  }
-
-  // Enable / disable "new_page" only settings.
-  if ($("input[name=faq_display]:checked").val() != "new_page") {
-    $("input[name=faq_use_teaser]").removeAttr("disabled");
-    $("input[name=faq_more_link]").removeAttr("disabled");
-    $("input[name=faq_disable_node_links]").removeAttr("disabled");
-  }
-  else {
-    $("input[name=faq_use_teaser]").attr("disabled", "disabled");
-    $("input[name=faq_more_link]").attr("disabled", "disabled");
-    $("input[name=faq_disable_node_links]").attr("disabled", "disabled");
-  }
-  teaser_handler(event);
-
-  // Enable / disable "new_page" and "questions_top" only settings.
-  if ($("input[name=faq_display]:checked").val() == "new_page" ||
-    $("input[name=faq_display]:checked").val() == "questions_top") {
-    $("select[name=faq_question_listing]").removeAttr("disabled");
-  }
-  else {
-    $("select[name=faq_question_listing]").attr("disabled", "disabled");
-  }
 
-}
-
-function qa_mark_handler(event) {
-  if ($("input[name=faq_display]:checked").val() == "questions_inline") {
-    // Enable / disable label settings according to "qa_mark" setting.
-    if ($("input[name=faq_qa_mark]:checked").val() == 1) {
-      $("input[name=faq_question_label]").removeAttr("disabled");
-      $("input[name=faq_answer_label]").removeAttr("disabled");
+    // Enable / disable "hide_answer" only settings.
+    if ($("input[name=faq_display]:checked").val() != "hide_answer") {
+      $("input[name=faq_hide_qa_accordion]").attr("disabled", "disabled");
     }
     else {
-      $("input[name=faq_question_label]").attr("disabled", "disabled");
-      $("input[name=faq_answer_label]").attr("disabled", "disabled");
+      $("input[name=faq_hide_qa_accordion]").removeAttr("disabled");
     }
-  }
-}
 
-function questions_top_handler(event) {
-  $("input[name=faq_display]").val() == "questions_top" ?
-    $("input[name=faq_group_questions_top]").removeAttr("disabled"):
-    $("input[name=faq_group_questions_top]").attr("disabled", "disabled");
-
-  $("input[name=faq_display]").val() == "questions_top" ?
-    $("input[name=faq_answer_category_name]").removeAttr("disabled"):
-    $("input[name=faq_answer_category_name]").attr("disabled", "disabled");
-}
+    // Enable / disable "new_page" only settings.
+    if ($("input[name=faq_display]:checked").val() != "new_page") {
+      $("input[name=faq_use_teaser]").removeAttr("disabled");
+      $("input[name=faq_more_link]").removeAttr("disabled");
+      $("input[name=faq_disable_node_links]").removeAttr("disabled");
+    }
+    else {
+      $("input[name=faq_use_teaser]").attr("disabled", "disabled");
+      $("input[name=faq_more_link]").attr("disabled", "disabled");
+      $("input[name=faq_disable_node_links]").attr("disabled", "disabled");
+    }
+    teaser_handler(event);
 
+    // Enable / disable "new_page" and "questions_top" only settings.
+    if ($("input[name=faq_display]:checked").val() == "new_page" ||
+      $("input[name=faq_display]:checked").val() == "questions_top") {
+      $("select[name=faq_question_listing]").removeAttr("disabled");
+    }
+    else {
+      $("select[name=faq_question_listing]").attr("disabled", "disabled");
+    }
 
-function child_term_handler(event) {
-  if ($("input[name=faq_hide_child_terms]:checked").val() == 1) {
-    $("input[name=faq_show_term_page_children]").attr("disabled", "disabled");
-  }
-  else if ($("input[name=faq_category_display]:checked").val() != "categories_inline") {
-    $("input[name=faq_show_term_page_children]").removeAttr("disabled");
   }
-}
 
+  function qa_mark_handler(event) {
+    if ($("input[name=faq_display]:checked").val() == "questions_inline") {
+      // Enable / disable label settings according to "qa_mark" setting.
+      if ($("input[name=faq_qa_mark]:checked").val() == 1) {
+        $("input[name=faq_question_label]").removeAttr("disabled");
+        $("input[name=faq_answer_label]").removeAttr("disabled");
+      }
+      else {
+        $("input[name=faq_question_label]").attr("disabled", "disabled");
+        $("input[name=faq_answer_label]").attr("disabled", "disabled");
+      }
+    }
+  }
 
-function categories_handler(event) {
-  if ($("input[name=faq_display]").val() == "questions_top") {
-    $("input[name=faq_category_display]:checked").val() == "categories_inline" ?
+  function questions_top_handler(event) {
+    $("input[name=faq_display]").val() == "questions_top" ?
       $("input[name=faq_group_questions_top]").removeAttr("disabled"):
       $("input[name=faq_group_questions_top]").attr("disabled", "disabled");
-    $("input[name=faq_category_display]:checked").val() == "new_page" ?
-      $("input[name=faq_answer_category_name]").attr("disabled", "disabled"):
-      $("input[name=faq_answer_category_name]").removeAttr("disabled");
-  }
-  else {
-    $("input[name=faq_group_questions_top]").attr("disabled", "disabled");
+
+    $("input[name=faq_display]").val() == "questions_top" ?
+      $("input[name=faq_answer_category_name]").removeAttr("disabled"):
+      $("input[name=faq_answer_category_name]").attr("disabled", "disabled");
   }
 
-  // Enable / disable "hide_qa" only settings.
-  if ($("input[name=faq_category_display]:checked").val() != "hide_qa") {
-    $("input[name=faq_category_hide_qa_accordion]").attr("disabled", "disabled");
-  }
-  else {
-    $("input[name=faq_category_hide_qa_accordion]").removeAttr("disabled");
-  }
-
-  $("input[name=faq_category_display]:checked").val() == "categories_inline" ?
-    $("input[name=faq_hide_child_terms]").attr("disabled", "disabled"):
-    $("input[name=faq_hide_child_terms]").removeAttr("disabled");
-  $("input[name=faq_category_display]:checked").val() == "categories_inline" ?
-    $("input[name=faq_show_term_page_children]").attr("disabled", "disabled"):
-    $("input[name=faq_show_term_page_children]").removeAttr("disabled");
-  $("input[name=faq_category_display]:checked").val() == "new_page" ?
-    $("select[name=faq_category_listing]").removeAttr("disabled"):
-    $("select[name=faq_category_listing]").attr("disabled", "disabled");
-
-  child_term_handler();
-}
-
-Drupal.behaviors.initFaqModule = function (context) {
-  // Hide/show answer for a question.
-  var faq_hide_qa_accordion = Drupal.settings.faq.faq_hide_qa_accordion;
-  $('div.faq-dd-hide-answer', context).addClass("collapsible collapsed");
-  if (!faq_hide_qa_accordion) {
-    $('div.faq-dd-hide-answer', context).hide();
-  }
-  $('div.faq-dt-hide-answer', context).click(function() {
-    if (faq_hide_qa_accordion) {
-      $('div.faq-dt-hide-answer').not($(this)).removeClass('faq-qa-visible');
-    }
-    $(this).toggleClass('faq-qa-visible');
-    $('div.faq-dd-hide-answer').not($(this).next('div.faq-dd-hide-answer')).addClass("collapsed");
-    $(this).next('div.faq-dd-hide-answer').toggleClass("collapsed");
-    if (!faq_hide_qa_accordion) {
-      $(this).next('div.faq-dd-hide-answer').slideToggle('fast', function() {
-        $(this).parent().toggleClass('expanded');
-      });
-    }
-    return false;
-  });
 
-  // Show any question identified by a fragment
-  if (/^#\w+$/.test(document.location.hash)) {
-    $('div.faq-dt-hide-answer > ' + document.location.hash).parent().triggerHandler('click');
-  }
-
-  // Hide/show q/a for a category.
-  var faq_category_hide_qa_accordion = Drupal.settings.faq.faq_category_hide_qa_accordion;
-  $('div.faq-qa-hide', context).addClass("collapsible collapsed");
-  if (!faq_category_hide_qa_accordion) {
-    $('div.faq-qa-hide', context).hide();
-  }
-  $('div.faq-qa-header .faq-header', context).click(function() {
-    if (faq_category_hide_qa_accordion) {
-      $('div.faq-qa-header .faq-header').not($(this)).removeClass('faq-category-qa-visible');
-    }
-    $(this).toggleClass('faq-category-qa-visible');
-    $('div.faq-qa-hide').not($(this).parent().next('div.faq-qa-hide')).addClass("collapsed");
-    $(this).parent().next('div.faq-qa-hide').toggleClass("collapsed");
-    if (!faq_category_hide_qa_accordion) {
-      $(this).parent().next('div.faq-qa-hide').slideToggle('fast', function() {
-        $(this).parent().toggleClass('expanded');
-      });
+  function child_term_handler(event) {
+    if ($("input[name=faq_hide_child_terms]:checked").val() == 1) {
+      $("input[name=faq_show_term_page_children]").attr("disabled", "disabled");
+    }
+    else if ($("input[name=faq_category_display]:checked").val() != "categories_inline") {
+      $("input[name=faq_show_term_page_children]").removeAttr("disabled");
     }
-    return false;
-  });
-
-
-  // Show expand all link. 
-  if (!faq_hide_qa_accordion && !faq_category_hide_qa_accordion) {
-    $('#faq-expand-all', context).show();
-    $('#faq-expand-all a.faq-expand-all-link', context).show();
-
-    // Add collapse link click event.
-    $('#faq-expand-all a.faq-collapse-all-link', context).click(function () {
-      $(this).hide();
-      $('#faq-expand-all a.faq-expand-all-link').show();
-      $('div.faq-qa-hide').slideUp('slow', function() {
-        $(this).removeClass('expanded');
-      });
-      $('div.faq-dd-hide-answer').slideUp('slow', function() {
-        $(this).removeClass('expanded');
-      });
-    });
-
-    // Add expand link click event.
-    $('#faq-expand-all a.faq-expand-all-link', context).click(function () {
-      $(this).hide();
-      $('#faq-expand-all a.faq-collapse-all-link').show();
-      $('div.faq-qa-hide').slideDown('slow', function() {
-        $(this).addClass('expanded');
-      });
-      $('div.faq-dd-hide-answer').slideDown('slow', function() {
-        $(this).addClass('expanded');
-      });
-    });
   }
 
 
+  function categories_handler(event) {
+    if ($("input[name=faq_display]").val() == "questions_top") {
+      $("input[name=faq_category_display]:checked").val() == "categories_inline" ?
+        $("input[name=faq_group_questions_top]").removeAttr("disabled"):
+        $("input[name=faq_group_questions_top]").attr("disabled", "disabled");
+      $("input[name=faq_category_display]:checked").val() == "new_page" ?
+        $("input[name=faq_answer_category_name]").attr("disabled", "disabled"):
+        $("input[name=faq_answer_category_name]").removeAttr("disabled");
+    }
+    else {
+      $("input[name=faq_group_questions_top]").attr("disabled", "disabled");
+    }
 
-  // Handle faq_category_settings_form.
-  faq_display_handler();
-  questions_top_handler();
-  categories_handler();
-  teaser_handler();
-  $("input[name=faq_display]", context).bind("click", faq_display_handler);
-  $("input[name=faq_qa_mark]", context).bind("click", qa_mark_handler);
-  $("input[name=faq_use_teaser]", context).bind("click", teaser_handler);
-  $("input[name=faq_category_display]", context).bind("click", categories_handler);
-  $("input[name=faq_hide_child_terms]", context).bind("click", child_term_handler);
+    // Enable / disable "hide_qa" only settings.
+    if ($("input[name=faq_category_display]:checked").val() != "hide_qa") {
+      $("input[name=faq_category_hide_qa_accordion]").attr("disabled", "disabled");
+    }
+    else {
+      $("input[name=faq_category_hide_qa_accordion]").removeAttr("disabled");
+    }
 
-}
+    $("input[name=faq_category_display]:checked").val() == "categories_inline" ?
+      $("input[name=faq_hide_child_terms]").attr("disabled", "disabled"):
+      $("input[name=faq_hide_child_terms]").removeAttr("disabled");
+    $("input[name=faq_category_display]:checked").val() == "categories_inline" ?
+      $("input[name=faq_show_term_page_children]").attr("disabled", "disabled"):
+      $("input[name=faq_show_term_page_children]").removeAttr("disabled");
+    $("input[name=faq_category_display]:checked").val() == "new_page" ?
+      $("select[name=faq_category_listing]").removeAttr("disabled"):
+      $("select[name=faq_category_listing]").attr("disabled", "disabled");
 
+    child_term_handler();
+  }
 
+  Drupal.behaviors.initFaqModule = {
+    attach: function (context) {
+      // Hide/show answer for a question.
+      var faq_hide_qa_accordion = Drupal.settings.faq.faq_hide_qa_accordion;
+      $('div.faq-dd-hide-answer', context).addClass("collapsible collapsed");
+      if (!faq_hide_qa_accordion) {
+        $('div.faq-dd-hide-answer', context).hide();
+      }
+      $('div.faq-dt-hide-answer', context).click(function() {
+        if (faq_hide_qa_accordion) {
+          $('div.faq-dt-hide-answer').not($(this)).removeClass('faq-qa-visible');
+        }
+        $(this).toggleClass('faq-qa-visible');
+        $('div.faq-dd-hide-answer').not($(this).next('div.faq-dd-hide-answer')).addClass("collapsed");
+        $(this).next('div.faq-dd-hide-answer').toggleClass("collapsed");
+        if (!faq_hide_qa_accordion) {
+          $(this).next('div.faq-dd-hide-answer').slideToggle('fast', function() {
+            $(this).parent().toggleClass('expanded');
+          });
+        }
+        return false;
+      });
+
+      // Show any question identified by a fragment
+      if (/^#\w+$/.test(document.location.hash)) {
+        $('div.faq-dt-hide-answer > ' + document.location.hash).parent().triggerHandler('click');
+      }
+
+      // Hide/show q/a for a category.
+      var faq_category_hide_qa_accordion = Drupal.settings.faq.faq_category_hide_qa_accordion;
+      $('div.faq-qa-hide', context).addClass("collapsible collapsed");
+      if (!faq_category_hide_qa_accordion) {
+        $('div.faq-qa-hide', context).hide();
+      }
+      $('div.faq-qa-header .faq-header', context).click(function() {
+        if (faq_category_hide_qa_accordion) {
+          $('div.faq-qa-header .faq-header').not($(this)).removeClass('faq-category-qa-visible');
+        }
+        $(this).toggleClass('faq-category-qa-visible');
+        $('div.faq-qa-hide').not($(this).parent().next('div.faq-qa-hide')).addClass("collapsed");
+        $(this).parent().next('div.faq-qa-hide').toggleClass("collapsed");
+        if (!faq_category_hide_qa_accordion) {
+          $(this).parent().next('div.faq-qa-hide').slideToggle('fast', function() {
+            $(this).parent().toggleClass('expanded');
+          });
+        }
+        return false;
+      });
+
+
+      // Show expand all link.
+      if (!faq_hide_qa_accordion && !faq_category_hide_qa_accordion) {
+        $('#faq-expand-all', context).show();
+        $('#faq-expand-all a.faq-expand-all-link', context).show();
+
+        // Add collapse link click event.
+        $('#faq-expand-all a.faq-collapse-all-link', context).click(function () {
+          $(this).hide();
+          $('#faq-expand-all a.faq-expand-all-link').show();
+          $('div.faq-qa-hide').slideUp('slow', function() {
+            $(this).removeClass('expanded');
+          });
+          $('div.faq-dd-hide-answer').slideUp('slow', function() {
+            $(this).removeClass('expanded');
+          });
+        });
+
+        // Add expand link click event.
+        $('#faq-expand-all a.faq-expand-all-link', context).click(function () {
+          $(this).hide();
+          $('#faq-expand-all a.faq-collapse-all-link').show();
+          $('div.faq-qa-hide').slideDown('slow', function() {
+            $(this).addClass('expanded');
+          });
+          $('div.faq-dd-hide-answer').slideDown('slow', function() {
+            $(this).addClass('expanded');
+          });
+        });
+      }
+
+
+
+      // Handle faq_category_settings_form.
+      faq_display_handler();
+      questions_top_handler();
+      categories_handler();
+      teaser_handler();
+      $("input[name=faq_display]", context).bind("click", faq_display_handler);
+      $("input[name=faq_qa_mark]", context).bind("click", qa_mark_handler);
+      $("input[name=faq_use_teaser]", context).bind("click", teaser_handler);
+      $("input[name=faq_category_display]", context).bind("click", categories_handler);
+      $("input[name=faq_hide_child_terms]", context).bind("click", child_term_handler);
+
+    }
+  }
+})(jQuery);
\ No newline at end of file