export javascript, and support default-open toggles

[ikiwiki.git] / IkiWiki / Plugin / toggle.pm

diff --git a/IkiWiki/Plugin/toggle.pm b/IkiWiki/Plugin/toggle.pm
index 7318731c54808c01ee73ec4b8b660708bb8a066a..54c9a0d9a29223e98aecfc6e49f707c7263adfae 100644 (file)
--- a/IkiWiki/Plugin/toggle.pm
+++ b/IkiWiki/Plugin/toggle.pm
@@ -3,13 +3,13 @@ package IkiWiki::Plugin::toggle;
 
 use warnings;
 use strict;
-use IkiWiki;
+use IkiWiki 2.00;
 
 # Here's the javascript that makes this possible. A key feature is the use
 # of css to hide toggleables, to avoid any flashing on page load. The css
 # is only emitted after the javascript tests that it's going to be able to
 # show the toggleables.
-my $javascript=<<'EOF';
+our $javascript=<<'EOF';
 <script type="text/javascript">
 <!--
 if (document.getElementById && document.getElementsByTagName && document.createTextNode) {
@@ -21,7 +21,8 @@ function inittoggle() {
        var as = getElementsByClass('toggle');
        for (var i = 0; i < as.length; i++) {
                var id = as[i].href.match(/#(\w.+)/)[1];
-               document.getElementById(id).style.display="none";
+               if (document.getElementById(id).className == "toggleable")
+                       document.getElementById(id).style.display="none";
                as[i].onclick = function() {
                        toggle(this);
                        return false;
@@ -80,7 +81,13 @@ sub preprocess_toggle (@) { #{{{
        my %params=(id => "default", text => "more", @_);
 
        my $id=genid($params{page}, $params{id});
-       return "<a class=\"toggle\" href=\"#$id\">$params{text}</a>";
+       if (! $params{preview}) {
+               return "<a class=\"toggle\" href=\"#$id\">$params{text}</a>";
+       }
+       else {
+               return "$params{text} ".
+                       gettext("(not toggleable in preview mode)");
+       }
 } # }}}
 
 sub preprocess_toggleable (@) { #{{{
@@ -89,7 +96,7 @@ sub preprocess_toggleable (@) { #{{{
        # Preprocess the text to expand any preprocessor directives
        # embedded inside it.
        $params{text}=IkiWiki::preprocess($params{page}, $params{destpage}, 
-               IkiWiki::filter($params{page}, $params{text}));
+               IkiWiki::filter($params{page}, $params{destpage}, $params{text}));
        
        my $id=genid($params{page}, $params{id});
 
@@ -106,7 +113,10 @@ sub format (@) { #{{{
 
        if ($params{content}=~s!(<div class="toggleable" id="[^"]+">)</div>!$1!g) {
                $params{content}=~s/<div class="toggleableend">//g;
-               $params{content}=~s!^<\/body>!$javascript</body>!m;
+               if (! ($params{content}=~s!^<\/body>!$javascript</body>!m)) {
+                       # no </body> tag, probably in preview mode
+                       $params{content}.=$javascript;
+               }
        }
        return $params{content};
 } # }}}