plugin => {
safe => 1,
rebuild => undef,
+ section => "widget",
},
}
my %params=@_;
$params{pages}="*" unless defined $params{pages};
+ # Needs to update whenever a page is added or removed (or in some
+ # cases, when its content changes, if show= is specified).
+ my $deptype=deptype(exists $params{show} ? "content" : "presence");
+
my $common_prefix;
# Get all the items to map.
my %mapitems;
- foreach my $page (pagespec_match_list([keys %pagesources],
- $params{pages}, location => $params{page})) {
+ foreach my $page (pagespec_match_list($params{page}, $params{pages},
+ deptype => $deptype)) {
if (exists $params{show} &&
exists $pagestate{$page} &&
exists $pagestate{$page}{meta}{$params{show}}) {
$common_prefix=IkiWiki::dirname($common_prefix);
}
- # Needs to update whenever a page is added or removed (or in some
- # cases, when its content changes, if show=title), so register a
- # dependency.
- add_depends($params{page}, $params{pages});
- # Explicitly add all currently shown pages, to detect when pages
- # are removed.
- add_depends($params{page}, join(" or ", keys %mapitems));
-
# Create the map.
my $parent="";
my $indent=0;
my $addparent="";
my $map = "<div class='map'>\n";
- # Return empty div if %mapitems is empty
- if (!scalar(keys %mapitems)) {
+ if (! keys %mapitems) {
+ # return empty div for empty map
$map .= "</div>\n";
return $map;
}
- else { # continue populating $map
+ else {
$map .= "<ul>\n";
}
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);
+ my $parentbase=IkiWiki::dirname($parent);
+ while (length $parentbase && length $baseitem && $baseitem !~ /^\Q$parentbase\E(\/|$)/) {
+ $parentbase=IkiWiki::dirname($parentbase);
last if length $addparent && $baseitem =~ /^\Q$addparent\E(\/|$)/;
$addparent="";
$indent--;
}
my @bits=split("/", $item);
my $p="";
+ $indent++ unless length $parent;
$p.="/".shift(@bits) for 1..$indent;
while ($depth > $indent) {
- $indent++;
- if ($indent > 1) {
- $map .= "<ul>\n";
- }
- if ($depth > $indent) {
- $p.="/".shift(@bits);
+ if (@bits && !(length $parent && "/$parent" eq $p)) {
$addparent=$p;
$addparent=~s/^\///;
$map .= "<li>"
else {
$openli=0;
}
+ $indent++;
+ $p.="/".shift(@bits) if @bits;
+ if ($indent > 1) {
+ $map .= "<ul>\n";
+ }
}
$map .= "</li>\n" if $openli;
$map .= "<li>"