X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/4a40b5f9d56e4a36112af0007f52357761a5b3fb..618e3c107547d43a207ea2b7cad3a4e10e04cb04:/IkiWiki/Plugin/toggle.pm?ds=sidebyside diff --git a/IkiWiki/Plugin/toggle.pm b/IkiWiki/Plugin/toggle.pm index 92a89bd79..e203defb0 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,7 +63,7 @@ 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); } # }}} @@ -84,26 +89,33 @@ 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

. - return "

\n\n$params{text}\n

"; + # markdown's dislike of markdown inside a

with various funky + # whitespace. + my ($indent)=$params{text}=~/( +)$/; + $indent="" unless defined $indent; + return "

\n\n$params{text}\n$indent

"; } # }}} sub format (@) { #{{{ my %params=@_; - if ($params{content}=~s!(

)

!$1!g) { + if ($params{content}=~s!(

\s*)

!$1!g) { $params{content}=~s/

//g; - $params{content}=~s!^<\/body>!$javascript!m; + if (! ($params{content}=~s!^!$javascript!m)) { + # no tag, probably in preview mode + $params{content}=$javascript.$params{content}; + } } return $params{content}; } # }}}