X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/cf35ee04cddd7b9b39636499dd24b689443c0e97..e73987b01da90374aaaba063e5a36ba61e90aa5f:/IkiWiki/Plugin/toggle.pm
diff --git a/IkiWiki/Plugin/toggle.pm b/IkiWiki/Plugin/toggle.pm
index 3f9c48672..610d38e3a 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';
<script type="text/javascript">
<!--
if (document.getElementById && document.getElementsByTagName && document.createTextNode) {
@@ -21,7 +21,8 @@ function inittoggle() {
var as = getElementsByClass('toggle');
for (var i = 0; i < as.length; i++) {
var id = as[i].href.match(/#(\w.+)/)[1];
- document.getElementById(id).style.display="none";
+ if (document.getElementById(id).className == "toggleable")
+ document.getElementById(id).style.display="none";
as[i].onclick = function() {
toggle(this);
return false;
@@ -38,23 +39,28 @@ function toggle(s) {
style.display = "none";
}
-function getElementsByClass(class) {
+function getElementsByClass(cls, node, tag) {
+ if (document.getElementsByClass)
+ return document.getElementsByClass(cls, node, tag);
+ if (! node) node = document;
+ if (! tag) tag = '*';
var ret = new Array();
- var pattern = new RegExp("(^|\\s)"+class+"(\\s|$)");
- var els = document.getElementsByTagName('*');
- for (i = 0, j = 0; i < els.length; i++) {
+ var pattern = new RegExp("(^|\\s)"+cls+"(\\s|$)");
+ var els = node.getElementsByTagName(tag);
+ for (i = 0; i < els.length; i++) {
if ( pattern.test(els[i].className) ) {
- ret[j] = els[i];
- j++;
+ ret.push(els[i]);
}
}
return ret;
}
+
//-->
</script>
EOF
sub import { #{{{
+ hook(type => "getsetup", id => "toggle", call => \&getsetup);
hook(type => "preprocess", id => "toggle",
call => \&preprocess_toggle);
hook(type => "preprocess", id => "toggleable",
@@ -62,6 +68,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;
@@ -84,7 +98,7 @@ 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.
@@ -92,21 +106,25 @@ 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 <div> with various funky
# whitespace.
my ($indent)=$params{text}=~/( +)$/;
$indent="" unless defined $indent;
- return "<div class=\"toggleable\" id=\"$id\"></div>\n\n$params{text}\n$indent<div class=\"toggleableend\"></div>";
+ return "<div class=\"$class\" id=\"$id\"></div>\n\n$params{text}\n$indent<div class=\"toggleableend\"></div>";
} # }}}
sub format (@) { #{{{
my %params=@_;
- if ($params{content}=~s!(<div class="toggleable" id="[^"]+">)</div>!$1!g) {
+ if ($params{content}=~s!(<div class="toggleable(?:-open)?" id="[^"]+">\s*)</div>!$1!g) {
$params{content}=~s/<div class="toggleableend">//g;
- $params{content}=~s!^<\/body>!$javascript</body>!m;
+ if (! ($params{content}=~s!^<body>!<body>$javascript!m)) {
+ # no </body> tag, probably in preview mode
+ $params{content}=$javascript.$params{content};
+ }
}
return $params{content};
} # }}}