X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/957ded9d64ca6abf0127c5c49e24177685bac5ae..154c4ea9e:/IkiWiki/Plugin/map.pm?ds=inline
diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm
index 46f11dc89..4a9bf58db 100644
--- a/IkiWiki/Plugin/map.pm
+++ b/IkiWiki/Plugin/map.pm
@@ -21,6 +21,7 @@ sub getsetup () {
plugin => {
safe => 1,
rebuild => undef,
+ section => "widget",
},
}
@@ -28,12 +29,16 @@ sub preprocess (@) {
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}}) {
@@ -67,10 +72,8 @@ sub preprocess (@) {
$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= is specified), so
- # register a dependency.
- add_depends($params{page}, $params{pages}, presence => ! exists $params{show});
+ # Set this to 1 or more spaces to pretty-print maps for debugging
+ my $spaces = "";
# Create the map.
my $parent="";
@@ -79,12 +82,12 @@ sub preprocess (@) {
my $addparent="";
my $map = "
\n";
- # Return empty div if %mapitems is empty
- if (!scalar(keys %mapitems)) {
+ if (! keys %mapitems) {
+ # return empty div for empty map
$map .= "
\n";
return $map;
}
- else { # continue populating $map
+ else {
$map .= "\n";
}
@@ -98,18 +101,18 @@ sub preprocess (@) {
$parent=IkiWiki::dirname($parent);
last if length $addparent && $baseitem =~ /^\Q$addparent\E(\/|$)/;
$addparent="";
- $indent--;
- $map .= "\n";
- if ($indent > 0) {
- $map .= "
\n";
+ $map .= ($spaces x $indent) . "\n";
+ if ($indent > 1) {
+ $map .= ($spaces x $indent) . "\n";
}
+ $indent--;
}
while ($depth < $indent) {
- $indent--;
- $map .= "\n";
- if ($indent > 0) {
- $map .= "\n";
+ $map .= ($spaces x $indent) . "\n";
+ if ($indent > 1) {
+ $map .= ($spaces x $indent) . "\n";
}
+ $indent--;
}
my @bits=split("/", $item);
my $p="";
@@ -117,13 +120,14 @@ sub preprocess (@) {
while ($depth > $indent) {
$indent++;
if ($indent > 1) {
- $map .= "\n";
+ $map .= ($spaces x $indent) . "\n";
}
if ($depth > $indent) {
$p.="/".shift(@bits);
$addparent=$p;
$addparent=~s/^\///;
- $map .= "- "
+ $map .= ($spaces x $indent) . "
- \n";
+ $map .= ($spaces x $indent)
.htmllink($params{page}, $params{destpage},
"/".$common_prefix.$p, class => "mapparent",
noimageinline => 1)
@@ -134,8 +138,9 @@ sub preprocess (@) {
$openli=0;
}
}
- $map .= "
\n" if $openli;
- $map .= "- "
+ $map .= ($spaces x $indent) . "
\n" if $openli;
+ $map .= ($spaces x $indent) . "- \n";
+ $map .= ($spaces x $indent)
.htmllink($params{page}, $params{destpage},
"/".$common_prefix."/".$item,
@linktext,
@@ -145,9 +150,12 @@ sub preprocess (@) {
$parent=$item;
}
while ($indent > 0) {
+ $map .= ($spaces x $indent) . "
\n";
$indent--;
- $map .= "\n
\n";
+ $map .= ($spaces x $indent) . "
\n";
}
+ $map =~ s{\n *\n *\n}{\n}gs;
+ $map =~ s{}{}g;
$map .= "\n";
return $map;
}