web commit by http://jblevins.org/: Ideas about keyboard shortcuts

[git.ikiwiki.info.git] / IkiWiki / Plugin / inline.pm

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index c7107d6645504c7939c37df2b5ab8caebcabb445..9b2caffcfe690ec6788d409840766bcde0cdb038 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -10,6 +10,7 @@ use URI;
 
 my %knownfeeds;
 my %page_numfeeds;
+my @inline;
 
 sub import { #{{{
        hook(type => "getopt", id => "inline", call => \&getopt);
@@ -19,6 +20,7 @@ sub import { #{{{
                call => \&IkiWiki::preprocess_inline);
        hook(type => "pagetemplate", id => "inline",
                call => \&IkiWiki::pagetemplate_inline);
+       hook(type => "format", id => "inline", call => \&format);
        # Hook to change to do pinging since it's called late.
        # This ensures each page only pings once and prevents slow
        # pings interrupting page builds.
@@ -51,6 +53,17 @@ sub checkconfig () { #{{{
        }
 } #}}}
 
+sub format (@) { #{{{
+        my %params=@_;
+
+       # Fill in the inline content generated earlier. This is actually an
+       # optimisation.
+       $params{content}=~s{<div class="inline" id="([^"]+)"></div>}{
+               delete @inline[$1,]
+       }eg;
+       return $params{content};
+} #}}}
+
 sub sessioncgi () { #{{{
        my $q=shift;
        my $session=shift;
@@ -304,7 +317,9 @@ sub preprocess_inline (@) { #{{{
                }
        }
        
-       return $ret;
+       return $ret if $raw;
+       push @inline, $ret;
+       return "<div class=\"inline\" id=\"$#inline\"></div>\n\n";
 } #}}}
 
 sub pagetemplate_inline (@) { #{{{