X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/7bde880fa8cf2e7d3413a7ede7ae5b604a97e85b..6b68c6ff7251d200526ab9bd212cd24841687ad6:/IkiWiki/Plugin/map.pm?ds=sidebyside
diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm
index 97450eb6d..581ae5011 100644
--- a/IkiWiki/Plugin/map.pm
+++ b/IkiWiki/Plugin/map.pm
@@ -37,6 +37,9 @@ sub preprocess (@) { #{{{
my @b=split(/\//, $common_prefix);
$common_prefix="";
while (@a && @b && $a[0] eq $b[0]) {
+ if (length $common_prefix) {
+ $common_prefix.="/";
+ }
$common_prefix.=shift(@a);
shift @b;
}
@@ -45,7 +48,8 @@ sub preprocess (@) { #{{{
}
# Common prefix should not be a page in the map.
- while (length $common_prefix && exists $mapitems{$common_prefix}) {
+ while (defined $common_prefix && length $common_prefix &&
+ exists $mapitems{$common_prefix}) {
$common_prefix=IkiWiki::dirname($common_prefix);
}
@@ -60,19 +64,23 @@ sub preprocess (@) { #{{{
my $parent="";
my $indent=0;
my $openli=0;
+ my $dummy=0;
my $map = "
\n
\n";
foreach my $item (sort keys %mapitems) {
- $item=~s/^\Q$common_prefix\E\/// if length $common_prefix;
+ $item=~s/^\Q$common_prefix\E\///
+ if defined $common_prefix && length $common_prefix;
my $depth = ($item =~ tr/\//\//) + 1;
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 .= "\n";
if ($indent > 0) {
$map .= "
\n";
}
}
+ $dummy=0;
while ($depth < $indent) {
$indent--;
$map .= "\n";
@@ -89,10 +97,13 @@ sub preprocess (@) { #{{{
$map .= "
\n";
}
if ($depth > $indent) {
+ $dummy=1;
$p.="/".shift(@bits);
$map .= "- "
- .htmllink($params{page}, $params{destpage}, $p, class => "mapparent")
- ."\n";
+ .htmllink($params{page}, $params{destpage},
+ $p, class => "mapparent",
+ noimageinline => 1)
+ ."\n";
$openli=1;
}
else {
@@ -102,8 +113,9 @@ sub preprocess (@) { #{{{
$map .= "
\n" if $openli;
$map .= "- "
.htmllink($params{page}, $params{destpage},
- "/".$common_prefix."/".$item, class => "mapitem")
- ."\n";
+ "/".$common_prefix."/".$item,
+ class => "mapitem", noimageinline => 1)
+ ."\n";
$openli=1;
$parent=$item;
}