diff options
Diffstat (limited to 'IkiWiki/Plugin/toggle.pm')
| -rw-r--r-- | IkiWiki/Plugin/toggle.pm | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/IkiWiki/Plugin/toggle.pm b/IkiWiki/Plugin/toggle.pm index 8089443e0..284eb8249 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; @@ -80,17 +81,11 @@ sub preprocess_toggle (@) { #{{{ my %params=(id => "default", text => "more", @_); my $id=genid($params{page}, $params{id}); - if (! $params{preview}) { - return "<a class=\"toggle\" href=\"#$id\">$params{text}</a>"; - } - else { - return "$params{text} ". - gettext("(not toggleable in preview mode)"); - } + return "<a class=\"toggle\" href=\"#$id\">$params{text}</a>"; } # }}} 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 +93,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 <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="[^"]+">)</div>!$1!g) { $params{content}=~s/<div class="toggleableend">//g; - if (! ($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}=$javascript.$params{content}; } } return $params{content}; |