Merge branch 'master' of ssh://git.ikiwiki.info

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

diff --git a/IkiWiki/Plugin/embed.pm b/IkiWiki/Plugin/embed.pm
index 4fc91d978a5295473fac4135270c14027304ad2b..a7d38358fe3ab4177c2cf6a7817f3e037f2c8e4a 100644 (file)
--- a/IkiWiki/Plugin/embed.pm
+++ b/IkiWiki/Plugin/embed.pm
@@ -3,7 +3,7 @@ package IkiWiki::Plugin::embed;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki 2.00;
+use IkiWiki 3.00;

 
 my $attribr=qr/[^<>"]+/;
 
 
 my $attribr=qr/[^<>"]+/;
 


@@ -43,26 +43,35 @@ my $safehtml=qr{(
 
 my @embedded;
 
 
 my @embedded;
 

-sub import { #{{{
+sub import {
+       hook(type => "getsetup", id => "embed", call => \&getsetup);

        hook(type => "filter", id => "embed", call => \&filter);
        hook(type => "filter", id => "embed", call => \&filter);

-} # }}}
+}

 
 

-sub embed ($) { #{{{
+sub getsetup () {
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => undef,
+               },
+}
+
+sub embed ($) {

        hook(type => "format", id => "embed", call => \&format) unless @embedded;
        push @embedded, shift;
        return "<div class=\"embed$#embedded\"></div>";
        hook(type => "format", id => "embed", call => \&format) unless @embedded;
        push @embedded, shift;
        return "<div class=\"embed$#embedded\"></div>";

-} #}}}
+}

 
 

-sub filter (@) { #{{{
+sub filter (@) {

        my %params=@_;
        $params{content} =~ s/$safehtml/embed($1)/eg;
        return $params{content};
        my %params=@_;
        $params{content} =~ s/$safehtml/embed($1)/eg;
        return $params{content};

-} # }}}
+}

 
 

-sub format (@) { #{{{
+sub format (@) {

         my %params=@_;
        $params{content} =~ s/<div class="embed(\d+)"><\/div>/$embedded[$1]/eg;
         return $params{content};
         my %params=@_;
        $params{content} =~ s/<div class="embed(\d+)"><\/div>/$embedded[$1]/eg;
         return $params{content};

-} # }}}
+}

 
 1
 
 1