(no commit message)

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

diff --git a/IkiWiki/Plugin/cutpaste.pm b/IkiWiki/Plugin/cutpaste.pm
index b1161ba063c64ca8ecd8e08ec711d43682de64d5..4a88171685b8d94cfaced062a9547ea8c3e6d401 100644 (file)
--- a/IkiWiki/Plugin/cutpaste.pm
+++ b/IkiWiki/Plugin/cutpaste.pm
@@ -3,18 +3,27 @@ package IkiWiki::Plugin::cutpaste;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki 2.00;
-use UNIVERSAL;
+use IkiWiki 3.00;

 
 my %savedtext;
 
 
 my %savedtext;
 

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

        hook(type => "preprocess", id => "cut", call => \&preprocess_cut, scan => 1);
        hook(type => "preprocess", id => "copy", call => \&preprocess_copy, scan => 1);
        hook(type => "preprocess", id => "paste", call => \&preprocess_paste);
        hook(type => "preprocess", id => "cut", call => \&preprocess_cut, scan => 1);
        hook(type => "preprocess", id => "copy", call => \&preprocess_copy, scan => 1);
        hook(type => "preprocess", id => "paste", call => \&preprocess_paste);

-} # }}}
-
-sub preprocess_cut (@) { #{{{
+}
+
+sub getsetup () {
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => undef,
+                       section => "widget",
+               },
+}
+
+sub preprocess_cut (@) {

        my %params=@_;
 
        foreach my $param (qw{id text}) {
        my %params=@_;
 
        foreach my $param (qw{id text}) {


@@ -27,9 +36,9 @@ sub preprocess_cut (@) { #{{{
        $savedtext{$params{page}}->{$params{id}} = $params{text};
 
        return "" if defined wantarray;
        $savedtext{$params{page}}->{$params{id}} = $params{text};
 
        return "" if defined wantarray;

-} # }}}
+}

 
 

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

        my %params=@_;
 
        foreach my $param (qw{id text}) {
        my %params=@_;
 
        foreach my $param (qw{id text}) {


@@ -41,11 +50,11 @@ sub preprocess_copy (@) { #{{{
        $savedtext{$params{page}} = {} if not exists $savedtext{$params{"page"}};
        $savedtext{$params{page}}->{$params{id}} = $params{text};
 
        $savedtext{$params{page}} = {} if not exists $savedtext{$params{"page"}};
        $savedtext{$params{page}}->{$params{id}} = $params{text};
 

-       return IkiWiki::preprocess($params{page}, $params{destpage}, 
-               IkiWiki::filter($params{page}, $params{destpage}, $params{text})) if defined wantarray;
-} # }}}
+       return IkiWiki::preprocess($params{page}, $params{destpage}, $params{text})
+               if defined wantarray;
+}

 
 

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

        my %params=@_;
 
        foreach my $param (qw{id}) {
        my %params=@_;
 
        foreach my $param (qw{id}) {


@@ -61,8 +70,8 @@ sub preprocess_paste (@) { #{{{
                error sprintf(gettext('no text was copied in this page with id %s'), $params{id});
        }
 
                error sprintf(gettext('no text was copied in this page with id %s'), $params{id});
        }
 

-       return IkiWiki::preprocess($params{page}, $params{destpage}, 
-               IkiWiki::filter($params{page}, $params{destpage}, $savedtext{$params{page}}->{$params{id}}));
-} # }}}
+       return IkiWiki::preprocess($params{page}, $params{destpage},
+               $savedtext{$params{page}}->{$params{id}});
+}

 
 1;
 
 1;