X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/6fc66f83deba6df8abdf4bc117f8da7efbd7cbc1..89e0de5bc46f87231a3447acb8609641cc9162aa:/IkiWiki/Plugin/toggle.pm diff --git a/IkiWiki/Plugin/toggle.pm b/IkiWiki/Plugin/toggle.pm index 7318731c5..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 @@ -84,29 +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. $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}); + 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
with various funky # whitespace. my ($indent)=$params{text}=~/( +)$/; $indent="" unless defined $indent; - return "
\n\n$params{text}\n$indent
"; + return "
\n\n$params{text}\n$indent
"; } # }}} sub format (@) { #{{{ my %params=@_; - if ($params{content}=~s!(
)
!$1!g) { + if ($params{content}=~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}; } # }}}