2009-07-18 14:06:04 +02:00
|
|
|
[[!tag plugins/map patch]]
|
|
|
|
|
2009-06-15 13:22:02 +02:00
|
|
|
input:
|
|
|
|
|
|
|
|
before.
|
|
|
|
\[[!map pages="sdfsdfsdfsd/*"]]
|
|
|
|
after.
|
|
|
|
|
|
|
|
Presuming that the pagespec does not match, output:
|
|
|
|
|
2009-06-15 13:29:23 +02:00
|
|
|
<p>before.
|
|
|
|
<div class="map">
|
|
|
|
<ul>
|
|
|
|
</div></p>
|
2009-06-15 13:22:02 +02:00
|
|
|
|
|
|
|
The UL element is not closed.
|
|
|
|
|
2009-07-18 14:06:04 +02:00
|
|
|
Patch:
|
2009-06-15 13:28:36 +02:00
|
|
|
|
|
|
|
--- /usr/share/perl5/IkiWiki/Plugin/map.pm 2009-05-06 00:56:55.000000000 +0100
|
|
|
|
+++ IkiWiki/Plugin/map.pm 2009-06-15 12:23:54.000000000 +0100
|
|
|
|
@@ -137,11 +137,11 @@
|
|
|
|
$openli=1;
|
|
|
|
$parent=$item;
|
|
|
|
}
|
|
|
|
- while ($indent > 0) {
|
|
|
|
+ while ($indent > 1) {
|
|
|
|
$indent--;
|
|
|
|
$map .= "</li>\n</ul>\n";
|
|
|
|
}
|
|
|
|
- $map .= "</div>\n";
|
|
|
|
+ $map .= "</ul>\n</div>\n";
|
|
|
|
return $map;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-06-15 13:22:02 +02:00
|
|
|
-- [[Jon]]
|
2009-07-10 20:21:02 +02:00
|
|
|
|
|
|
|
> Strictly speaking, a `<ul>` with no `<li>`s isn't valid HTML either...
|
|
|
|
> could `map` instead delay emitting the first `<ul>` until it determines that
|
|
|
|
> it will have at least one item? Perhaps refactoring that function into
|
|
|
|
> something easier to regression-test would be useful. --[[smcv]]
|
2009-07-12 23:57:19 +02:00
|
|
|
|
|
|
|
>> You are right (just checked 4.01 DTD to confirm). I suspect refactoring
|
|
|
|
>> the function would be wise. From my brief look at it to formulate the
|
|
|
|
>> above I thought it was a bit icky. I'm not a good judge of what would
|
|
|
|
>> be regression-test friendly but I might have a go at reworking it. With
|
2009-07-12 23:58:36 +02:00
|
|
|
>> this variety of problem I have a strong inclination to use HOFs like map,
|
|
|
|
>> grep. - [[Jon]]
|