X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/b66f9a1981094bc2159a228dfaefc5c2e01ee68a..618e3c107547d43a207ea2b7cad3a4e10e04cb04:/IkiWiki/Plugin/toggle.pm diff --git a/IkiWiki/Plugin/toggle.pm b/IkiWiki/Plugin/toggle.pm index 8089443e0..e203defb0 100644 --- a/IkiWiki/Plugin/toggle.pm +++ b/IkiWiki/Plugin/toggle.pm @@ -9,7 +9,7 @@ use IkiWiki 2.00; # 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 @@ -80,17 +85,11 @@ sub preprocess_toggle (@) { #{{{ my %params=(id => "default", text => "more", @_); my $id=genid($params{page}, $params{id}); - if (! $params{preview}) { - return "$params{text}"; - } - else { - return "$params{text} ". - gettext("(not toggleable in preview mode)"); - } + 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. @@ -98,23 +97,24 @@ sub preprocess_toggleable (@) { #{{{ 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!(

\s*)

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

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