beautify url recentchanges_link redirs to

[ikiwiki.git] / IkiWiki / Plugin / toggle.pm

diff --git a/IkiWiki/Plugin/toggle.pm b/IkiWiki/Plugin/toggle.pm
index 7981d3701fed823d908b4a81f6f60a1b173136ec..284eb8249df031e77f2e1ff1796d19624bbae1cf 100644 (file)
--- a/IkiWiki/Plugin/toggle.pm
+++ b/IkiWiki/Plugin/toggle.pm
@@ -3,13 +3,13 @@ package IkiWiki::Plugin::toggle;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki;
+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.
 
 # 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.

-my $javascript=<<'EOF';
+our $javascript=<<'EOF';

 <script type="text/javascript">
 <!--
 if (document.getElementById && document.getElementsByTagName && document.createTextNode) {
 <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];
        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;
                as[i].onclick = function() {
                        toggle(this);
                        return false;


@@ -58,35 +59,59 @@ sub import { #{{{
        hook(type => "preprocess", id => "toggle",
                call => \&preprocess_toggle);
        hook(type => "preprocess", id => "toggleable",
        hook(type => "preprocess", id => "toggle",
                call => \&preprocess_toggle);
        hook(type => "preprocess", id => "toggleable",

-               call => \&preprocess_toggleable, scan => 1);
+               call => \&preprocess_toggleable);

        hook(type => "format", id => "toggle", call => \&format);
 } # }}}
 
        hook(type => "format", id => "toggle", call => \&format);
 } # }}}
 

+sub genid ($$) { #{{{
+       my $page=shift;
+       my $id=shift;
+
+       $id="$page.$id";
+
+       # make it a legal html id attribute
+       $id=~s/[^-a-zA-Z0-9.]/-/g;
+       if ($id !~ /^[a-zA-Z]/) {
+               $id="id$id";
+       }
+       return $id;
+} #}}}
+

 sub preprocess_toggle (@) { #{{{
        my %params=(id => "default", text => "more", @_);
 
 sub preprocess_toggle (@) { #{{{
        my %params=(id => "default", text => "more", @_);
 

-       return "<a class=\"toggle\" href=\"#$params{page}.$params{id}\">$params{text}</a>";
+       my $id=genid($params{page}, $params{id});
+       return "<a class=\"toggle\" href=\"#$id\">$params{text}</a>";

 } # }}}
 
 sub preprocess_toggleable (@) { #{{{
 } # }}}
 
 sub preprocess_toggleable (@) { #{{{

-       my %params=(id => "default", text => "", @_);
+       my %params=(id => "default", text => "", open => "no", @_);

 
        # Preprocess the text to expand any preprocessor directives
 
        # Preprocess the text to expand any preprocessor directives

-       # embedded inside it. This is why scan is set for this preprocessor
-       # directive, since it could expand to something with a link in it.
-       $params{text}=IkiWiki::preprocess($params{page}, $params{destpage}, $params{text});
+       # embedded inside it.
+       $params{text}=IkiWiki::preprocess($params{page}, $params{destpage}, 
+               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
 
        # Should really be a postprocessor directive, oh well. Work around

-       # markdown's dislike of markdown inside a <div>.
-       return "<div class=\"toggleable\" id=\"$params{page}.$params{id}\"></div>\n\n$params{text}<div class=\"toggleableend\"></div>";
+       # markdown's dislike of markdown inside a <div> with various funky
+       # whitespace.
+       my ($indent)=$params{text}=~/( +)$/;
+       $indent="" unless defined $indent;
+       return "<div class=\"$class\" id=\"$id\"></div>\n\n$params{text}\n$indent<div class=\"toggleableend\"></div>";

 } # }}}
 
 sub format (@) { #{{{
         my %params=@_;
 
 } # }}}
 
 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;
                $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};
 } # }}}
        }
        return $params{content};
 } # }}}