preprocess text before htmlizing it

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

diff --git a/IkiWiki/Plugin/toggle.pm b/IkiWiki/Plugin/toggle.pm
index 9e1afc08dbfa737ac5f29f079a14b1deb54d6cb7..657d8d3c2d49dbc40a415fde9446aaeffe761d46 100644 (file)
--- a/IkiWiki/Plugin/toggle.pm
+++ b/IkiWiki/Plugin/toggle.pm
@@ -3,65 +3,26 @@ package IkiWiki::Plugin::toggle;
 
 use warnings;
 use strict;
-use IkiWiki;
-
-# 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';
-<script type="text/javascript">
-<!--
-if (document.getElementById && document.getElementsByTagName && document.createTextNode) {
-       document.write('<style type="text/css">div.toggleable { display: none; }</style>');
-       window.onload = inittoggle;
-}
-
-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";
-               as[i].onclick = function() {
-                       toggle(this);
-                       return false;
-               }
-       }
-}
-
-function toggle(s) {
-       var id = s.href.match(/#(\w.+)/)[1];
-       style = document.getElementById(id).style;
-       if (style.display == "none")
-               style.display = "block";
-       else
-               style.display = "none";
-}
-
-function getElementsByClass(class) {
-       var ret = new Array();
-       var pattern = new RegExp("(^|\\s)"+class+"(\\s|$)");
-       var els = document.getElementsByTagName('*');
-       for (i = 0, j = 0; i < els.length; i++) {
-               if ( pattern.test(els[i].className) ) {
-                       ret[j] = els[i];
-                       j++;
-               }
-       }
-       return ret;
-}
-//-->
-</script>
-EOF
+use IkiWiki 2.00;
 
 sub import { #{{{
+       add_underlay("javascript");
+       hook(type => "getsetup", id => "toggle", call => \&getsetup);
        hook(type => "preprocess", id => "toggle",
                call => \&preprocess_toggle);
        hook(type => "preprocess", id => "toggleable",
-               call => \&preprocess_toggleable, scan => 1);
+               call => \&preprocess_toggleable);
        hook(type => "format", id => "toggle", call => \&format);
 } # }}}
 
+sub getsetup () { #{{{
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => undef,
+               },
+} #}}}
+
 sub genid ($$) { #{{{
        my $page=shift;
        my $id=shift;
@@ -84,31 +45,45 @@ sub preprocess_toggle (@) { #{{{
 } # }}}
 
 sub preprocess_toggleable (@) { #{{{
-       my %params=(id => "default", text => "", @_);
+       my %params=(id => "default", text => "", open => "no", @_);
 
        # Preprocess the text to expand any preprocessor directives
-       # embedded inside it. This is why scan is set for this preprocessor
-       # directive, since it could expand to something with a link in it.
-       $params{text}=IkiWiki::preprocess($params{page}, $params{destpage}, $params{text});
+       # embedded inside it.
+       $params{text}=IkiWiki::preprocess($params{page}, $params{destpage}, 
+               IkiWiki::filter($params{page}, $params{destpage}, $params{text}));
        
        my $id=genid($params{page}, $params{id});
+       my $class=(lc($params{open}) ne "yes") ? "toggleable" : "toggleable-open";
 
        # Should really be a postprocessor directive, oh well. Work around
        # markdown's dislike of markdown inside a <div> with various funky
        # whitespace.
        my ($indent)=$params{text}=~/( +)$/;
        $indent="" unless defined $indent;
-       return "<div class=\"toggleable\" id=\"$id\"></div>\n\n$params{text}\n$indent<div class=\"toggleableend\"></div>";
+       return "<div class=\"$class\" id=\"$id\"></div>\n\n$params{text}\n$indent<div class=\"toggleableend\"></div>";
 } # }}}
 
 sub format (@) { #{{{
         my %params=@_;
 
-       if ($params{content}=~s!(<div class="toggleable" id="[^"]+">)</div>!$1!g) {
+       if ($params{content}=~s!(<div class="toggleable(?:-open)?" id="[^"]+">\s*)</div>!$1!g) {
                $params{content}=~s/<div class="toggleableend">//g;
-               $params{content}=~s!^<\/body>!$javascript</body>!m;
+               if (! ($params{content}=~s!^(<body>)!$1.include_javascript($params{page})!em)) {
+                       # no </body> tag, probably in preview mode
+                       $params{content}=include_javascript($params{page}, 1).$params{content};
+               }
        }
        return $params{content};
 } # }}}
 
+sub include_javascript ($;$) { #{{{
+       my $page=shift;
+       my $absolute=shift;
+       
+       return '<script src="'.urlto("ikiwiki.js", $page, $absolute).
+               '" type="text/javascript" charset="utf-8"></script>'."\n".
+               '<script src="'.urlto("toggle.js", $page, $absolute).
+               '" type="text/javascript" charset="utf-8"></script>';
+} #}}}
+
 1