1 files changed, 56 insertions, 14 deletions

diff --git a/lib/scripts/page.js b/lib/scripts/page.js
index 05c5ece20..e4033b76d 100644
--- a/lib/scripts/page.js
+++ b/lib/scripts/page.js
@@ -10,6 +10,7 @@ dw_page = {
     init: function(){
         dw_page.sectionHighlight();
         jQuery('a.fn_top').mouseover(dw_page.footnoteDisplay);
+        dw_page.initTocToggle();
     },
 
     /**
@@ -20,8 +21,8 @@ dw_page = {
     sectionHighlight: function() {
         jQuery('form.btn_secedit')
             .mouseover(function(){
-                var $tgt = jQuery(this).parent();
-                var nr = $tgt.attr('class').match(/(\s+|^)editbutton_(\d+)(\s+|$)/)[2];
+                var $tgt = jQuery(this).parent(),
+                    nr = $tgt.attr('class').match(/(\s+|^)editbutton_(\d+)(\s+|$)/)[2];
 
                 // Walk the DOM tree up (first previous siblings, then parents)
                 // until boundary element
@@ -73,26 +74,67 @@ dw_page = {
      * @author Andreas Gohr <andi@splitbrain.org>
      * @author Chris Smith <chris@jalakai.co.uk>
      */
-    footnoteDisplay: function(e){
-        var $fndiv = dw_page.insituPopup(this, 'insitu__fn');
+    footnoteDisplay: function () {
+        var content = jQuery(jQuery(this).attr('href')) // Footnote text anchor
+                      .closest('div.fn').html();
 
-        // locate the footnote anchor element
-        var $a = jQuery("#fn__" + e.target.id.substr(5));
-        if (!$a.length){ return; }
-
-        // anchor parent is the footnote container, get its innerHTML
-        var content = new String ($a.parent().parent().html());
+        if (content === null){
+            return;
+        }
 
         // strip the leading content anchors and their comma separators
-        content = content.replace(/<sup>.*<\/sup>/gi, '');
-        content = content.replace(/^\s+(,\s+)+/,'');
+        content = content.replace(/((^|\s*,\s*)<sup>.*?<\/sup>)+\s*/gi, '');
 
         // prefix ids on any elements with "insitu__" to ensure they remain unique
         content = content.replace(/\bid=(['"])([^"']+)\1/gi,'id="insitu__$2');
 
         // now put the content into the wrapper
-        $fndiv.html(content);
-        $fndiv.show();
+        dw_page.insituPopup(this, 'insitu__fn').html(content).show();
+    },
+
+    /**
+     * Adds the toggle switch to the TOC
+     */
+    initTocToggle: function() {
+        var $header, $clicky, $toc, $tocul, setClicky;
+        $header = jQuery('#toc__header');
+        if(!$header.length) {
+            return;
+        }
+        $toc = jQuery('#toc__inside');
+        $tocul = $toc.children('ul.toc');
+
+        setClicky = function(hiding){
+            if(hiding){
+                $clicky.html('<span>+</span>');
+                $clicky[0].className = 'toc_open';
+            }else{
+                $clicky.html('<span>&minus;</span>');
+                $clicky[0].className = 'toc_close';
+            }
+        };
+
+        $clicky = jQuery(document.createElement('span'))
+                        .attr('id','toc__toggle');
+        $header.css('cursor','pointer')
+               .click(function () {
+                    var hidden;
+
+                    // Assert that $toc instantly takes the whole TOC space
+                    $toc.css('height', $toc.height()).show();
+
+                    hidden = $tocul.stop(true, true).is(':hidden');
+
+                    setClicky(!hidden);
+
+                    // Start animation and assure that $toc is hidden/visible
+                    $tocul.dw_toggle(hidden, function () {
+                        $toc.toggle(hidden);
+                    });
+                })
+               .prepend($clicky);
+
+        setClicky();
     }
 };