X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/89e0de5bc46f87231a3447acb8609641cc9162aa..92ba3bb4a1b84ffa791fa0be88529e96fd71b157:/IkiWiki/Plugin/toggle.pm
diff --git a/IkiWiki/Plugin/toggle.pm b/IkiWiki/Plugin/toggle.pm
index cd9617e25..657d8d3c2 100644
--- a/IkiWiki/Plugin/toggle.pm
+++ b/IkiWiki/Plugin/toggle.pm
@@ -5,61 +5,9 @@ use warnings;
use strict;
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.
-our $javascript=<<'EOF';
-
-EOF
-
sub import { #{{{
+ add_underlay("javascript");
+ hook(type => "getsetup", id => "toggle", call => \&getsetup);
hook(type => "preprocess", id => "toggle",
call => \&preprocess_toggle);
hook(type => "preprocess", id => "toggleable",
@@ -67,6 +15,14 @@ sub import { #{{{
hook(type => "format", id => "toggle", call => \&format);
} # }}}
+sub getsetup () { #{{{
+ return
+ plugin => {
+ safe => 1,
+ rebuild => undef,
+ },
+} #}}}
+
sub genid ($$) { #{{{
my $page=shift;
my $id=shift;
@@ -110,14 +66,24 @@ sub preprocess_toggleable (@) { #{{{
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!^!$javascript!m)) {
+ if (! ($params{content}=~s!^()!$1.include_javascript($params{page})!em)) {
# no tag, probably in preview mode
- $params{content}=$javascript.$params{content};
+ $params{content}=include_javascript($params{page}, 1).$params{content};
}
}
return $params{content};
} # }}}
+sub include_javascript ($;$) { #{{{
+ my $page=shift;
+ my $absolute=shift;
+
+ return ''."\n".
+ '';
+} #}}}
+
1