X-Git-Url: https://scripts.mit.edu/gitweb/www/ikiwiki.git/blobdiff_plain/a405b46c3b6020e1fa3631bfe5fd982f315c977f..14cd75746a2c73b50548b6fdb3583d536b6ef9bd:/IkiWiki/Plugin/toggle.pm diff --git a/IkiWiki/Plugin/toggle.pm b/IkiWiki/Plugin/toggle.pm index 7981d3701..cd9617e25 100644 --- 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'; EOF @@ -58,35 +63,59 @@ sub import { #{{{ 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 genid ($$) { #{{{ + my $page=shift; + my $id=shift; + + $id="$page.$id"; + + # make it a legal html id attribute + $id=~s/[^-a-zA-Z0-9.]/-/g; + if ($id !~ /^[a-zA-Z]/) { + $id="id$id"; + } + return $id; +} #}}} + sub preprocess_toggle (@) { #{{{ my %params=(id => "default", text => "more", @_); - return "$params{text}"; + my $id=genid($params{page}, $params{id}); + return "$params{text}"; } # }}} 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