urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "map: don't create useless </ul><ul> sequences" 

This reverts commit 2d5c2f301c.
master
Simon McVittie 2011-07-29 20:46:42 +01:00
parent 82537ecf19
commit ce1c7a3eab
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
IkiWiki/Plugin/map.pm
View File

@ -94,9 +94,8 @@ sub preprocess (@) {
if defined $common_prefix && length $common_prefix;
my $depth = ($item =~ tr/\//\//) + 1;
my $baseitem=IkiWiki::dirname($item);
my $parentbase=IkiWiki::dirname($parent);
while (length $parentbase && length $baseitem && $baseitem !~ /^\Q$parentbase\E(\/|$)/) {
$parentbase=IkiWiki::dirname($parentbase);
while (length $parent && length $baseitem && $baseitem !~ /^\Q$parent\E(\/|$)/) {
$parent=IkiWiki::dirname($parent);
last if length $addparent && $baseitem =~ /^\Q$addparent\E(\/|$)/;
$addparent="";
$indent--;
@ -114,10 +113,14 @@ sub preprocess (@) {
}
my @bits=split("/", $item);
my $p="";
$indent++ unless length $parent;
$p.="/".shift(@bits) for 1..$indent;
while ($depth > $indent) {
if (@bits && !(length $parent && "/$parent" eq $p)) {
$indent++;
if ($indent > 1) {
$map .= "<ul>\n";
}
if ($depth > $indent) {
$p.="/".shift(@bits);
$addparent=$p;
$addparent=~s/^\///;
$map .= "<li>"
@ -130,11 +133,6 @@ sub preprocess (@) {
else {
$openli=0;
}
$indent++;
$p.="/".shift(@bits) if @bits;
if ($indent > 1) {
$map .= "<ul>\n";
}
}
$map .= "</li>\n" if $openli;
$map .= "<li>"