urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

don't rely on plugin load order when determining generated directives 

Instead, shortcuts will explicitly be marked as such when registered, and
listdirectives can filter them out.
master
Joey Hess 2008-10-30 13:41:19 -04:00
parent 8f5723e1d5
commit 354d22e27b
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
IkiWiki/Plugin/listdirectives.pm
View File

@ -30,7 +30,7 @@ sub getsetup () { #{{{
} #}}} } #}}}
my @fulllist; my @fulllist;
my @earlylist; my @shortlist;
my $pluginstring; my $pluginstring;
sub checkconfig () { #{{{ sub checkconfig () { #{{{
@ -40,15 +40,14 @@ sub checkconfig () { #{{{
else { else {
$config{directive_description_dir} =~ s/\/+$//; $config{directive_description_dir} =~ s/\/+$//;
} }
@earlylist = sort keys %{$IkiWiki::hooks{preprocess}};
} #}}} } #}}}
sub needsbuild (@) { #{{{ sub needsbuild (@) { #{{{
my $needsbuild=shift; my $needsbuild=shift;
@fulllist = sort keys %{$IkiWiki::hooks{preprocess}}; @fulllist = sort keys %{$IkiWiki::hooks{preprocess}};
$pluginstring = join(' ', @earlylist) . " : " . join(' ', @fulllist); @shortlist = grep { ! $IkiWiki::hooks{preprocess}{$_}{shortcut} } @fulllist;
$pluginstring = join(' ', @shortlist) . " : " . join(' ', @fulllist);
foreach my $page (keys %pagestate) { foreach my $page (keys %pagestate) {
if (exists $pagestate{$page}{listdirectives}{shown}) { if (exists $pagestate{$page}{listdirectives}{shown}) {
@ -77,7 +76,7 @@ sub preprocess (@) { #{{{
@pluginlist = @fulllist; @pluginlist = @fulllist;
} }
else { else {
@pluginlist = @earlylist; @pluginlist = @shortlist;
} }
my $result = '<ul class="listdirectives">'; my $result = '<ul class="listdirectives">';

1
IkiWiki/Plugin/shortcut.pm
View File

@ -39,6 +39,7 @@ sub preprocess_shortcut (@) { #{{{
} }
hook(type => "preprocess", no_override => 1, id => $params{name}, hook(type => "preprocess", no_override => 1, id => $params{name},
shortcut => 1,
call => sub { shortcut_expand($params{url}, $params{desc}, @_) }); call => sub { shortcut_expand($params{url}, $params{desc}, @_) });
#translators: This is used to display what shortcuts are defined. #translators: This is used to display what shortcuts are defined.

7
doc/bugs/cannot_preview_shortcuts.mdwn
View File

@ -8,3 +8,10 @@ Shortcuts such as \[[!google foo]] do not work when previewing pages.
>> still works, but it relies on the fact that the `listdirectives` `checkconfig` >> still works, but it relies on the fact that the `listdirectives` `checkconfig`
>> hook is called before the `shortcut` `checkconfig` hook. >> hook is called before the `shortcut` `checkconfig` hook.
>> -- [[Will]] >> -- [[Will]]
>> The order plugins are loaded is effectively random. (`keys %hooks`).
>> So I've made shortcuts pass a 'shortcut' parameter when registering
>> them, which listdirectives can grep out of the full list of directives.
>> That may not be the best name to give it, especially if other plugins
>> generate directives too. Seemed better than forcing shortcut's
>> checkconfig hook to run last tho. --[[Joey]]