X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/d5357374c9def3cee23d46595f61795e08f4cc0b..e39366315cd153fc794aed7a9b4df587115d49e7:/IkiWiki/Plugin/map.pm

diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm
index 682960777..38f090ff7 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,16 +72,6 @@ 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}, content => exists $params{show});
-	# Explicitly add all currently shown pages, to detect when pages
-	# are removed.
-	foreach my $item (keys %mapitems) {
-		add_depends($params{page}, $item, content => exists $params{show});
-	}
-
 	# Create the map.
 	my $parent="";
 	my $indent=0;
@@ -84,12 +79,12 @@ sub preprocess (@) {
 	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";
 	}
 
@@ -99,8 +94,9 @@ sub preprocess (@) {
 			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--;
@@ -118,14 +114,10 @@ sub preprocess (@) {
 		}
 		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>"
@@ -138,6 +130,11 @@ sub preprocess (@) {
 			else {
 				$openli=0;
 			}
+			$indent++;
+			$p.="/".shift(@bits) if @bits;
+			if ($indent > 1) {
+				$map .= "<ul>\n";
+			}
 		}
 		$map .= "</li>\n" if $openli;
 		$map .= "<li>"