X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/17b2afe721d5b8fd2468fca56e91fe83bf49be64..6d01db205f41f16755fe7fbe49694b3bba2121c8:/IkiWiki/Plugin/toggle.pm?ds=inline
diff --git a/IkiWiki/Plugin/toggle.pm b/IkiWiki/Plugin/toggle.pm
index aae8cdf84..af4d2ba3a 100644
--- a/IkiWiki/Plugin/toggle.pm
+++ b/IkiWiki/Plugin/toggle.pm
@@ -20,6 +20,7 @@ sub getsetup () {
plugin => {
safe => 1,
rebuild => undef,
+ section => "widget",
},
}
@@ -49,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";
@@ -68,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!^(]*>)!$1.include_javascript($params{page})!em)) {
+ # no tag, probably in preview mode
+ $params{content}=include_javascript(undef).$params{content};
}
}
return $params{content};
}
-sub include_javascript ($;$) {
- my $page=shift;
- my $absolute=shift;
+sub include_javascript ($) {
+ my $from=shift;
- return ''."\n".
- '';
}