X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/e90d67d3c9a93862657563e17e24054087f205d1..90b3140fffc9c42d255ee8788eb53c8c8a626e8c:/IkiWiki/Plugin/toggle.pm diff --git a/IkiWiki/Plugin/toggle.pm b/IkiWiki/Plugin/toggle.pm index 3319421d9..eea6e8861 100644 --- a/IkiWiki/Plugin/toggle.pm +++ b/IkiWiki/Plugin/toggle.pm @@ -50,8 +50,7 @@ sub preprocess_toggleable (@) { # Preprocess the text to expand any preprocessor directives # embedded inside it. - $params{text}=IkiWiki::preprocess($params{page}, $params{destpage}, - IkiWiki::filter($params{page}, $params{destpage}, $params{text})); + $params{text}=IkiWiki::preprocess($params{page}, $params{destpage}, $params{text}); my $id=genid($params{page}, $params{id}); my $class=(lc($params{open}) ne "yes") ? "toggleable" : "toggleable-open"; @@ -69,21 +68,20 @@ sub format (@) { if ($params{content}=~s!(

\s*)

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

//g; - if (! ($params{content}=~s!^(]*>)!$1.include_javascript($params{page})!em)) { - # no tag, probably in preview mode - $params{content}=include_javascript($params{page}, 1).$params{content}; + if (! ($params{content}=~s!^(\s*]*>)!include_javascript($params{page}).$1!em)) { + # no tag, probably in preview mode + $params{content}=$params{content}.include_javascript(undef); } } return $params{content}; } -sub include_javascript ($;$) { - my $page=shift; - my $absolute=shift; +sub include_javascript ($) { + my $from=shift; - return ''."\n". - ''; }