* map: Recent changes caused unnecessary ul's to be inserted for items

[git.ikiwiki.info.git] / IkiWiki / Plugin / map.pm

diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm
index 65a6ed552e9b28ebf7abb516543e2575200a5aca..b08d78d76dc6752ee37012bb3df707eba7faefc4 100644 (file)
--- a/IkiWiki/Plugin/map.pm
+++ b/IkiWiki/Plugin/map.pm
@@ -61,6 +61,7 @@ sub preprocess (@) { #{{{
        my $parent="";
        my $indent=0;
        my $openli=0;
        my $parent="";
        my $indent=0;
        my $openli=0;

+       my $dummy=0;

        my $map = "<div class='map'>\n<ul>\n";
        foreach my $item (sort keys %mapitems) {
                $item=~s/^\Q$common_prefix\E\///
        my $map = "<div class='map'>\n<ul>\n";
        foreach my $item (sort keys %mapitems) {
                $item=~s/^\Q$common_prefix\E\///


@@ -69,12 +70,14 @@ sub preprocess (@) { #{{{
                my $baseitem=IkiWiki::dirname($item);
                while (length $parent && length $baseitem && $baseitem !~ /^\Q$parent\E(\/|$)/) {
                        $parent=IkiWiki::dirname($parent);
                my $baseitem=IkiWiki::dirname($item);
                while (length $parent && length $baseitem && $baseitem !~ /^\Q$parent\E(\/|$)/) {
                        $parent=IkiWiki::dirname($parent);

+                       last if !$dummy && length $parent && $baseitem =~ /^\Q$parent\E(\/|$)/;

                        $indent--;
                        $map .= "</li>\n";
                        if ($indent > 0) {
                                $map .= "</ul>\n";
                        }
                }
                        $indent--;
                        $map .= "</li>\n";
                        if ($indent > 0) {
                                $map .= "</ul>\n";
                        }
                }

+               $dummy=0;

                while ($depth < $indent) {
                        $indent--;
                        $map .= "</li>\n";
                while ($depth < $indent) {
                        $indent--;
                        $map .= "</li>\n";


@@ -91,6 +94,7 @@ sub preprocess (@) { #{{{
                                $map .= "<ul>\n";
                        }
                        if ($depth > $indent) {
                                $map .= "<ul>\n";
                        }
                        if ($depth > $indent) {

+                               $dummy=1;

                                $p.="/".shift(@bits);
                                $map .= "<li>"
                                        .htmllink($params{page}, $params{destpage}, $p, class => "mapparent")
                                $p.="/".shift(@bits);
                                $map .= "<li>"
                                        .htmllink($params{page}, $params{destpage}, $p, class => "mapparent")