aboutsummaryrefslogtreecommitdiff
path: root/IkiWiki/Plugin/cutpaste.pm
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2010-09-15 16:24:50 -0400
committerJoey Hess <joey@kitenet.net>2010-09-15 16:24:50 -0400
commit884835ce1cd3b1ba24d6f6bb19786d04e6b8ae90 (patch)
treed98d0960e513edb31f6cd9fa1fe15b04f61a6303 /IkiWiki/Plugin/cutpaste.pm
parent0e89f374a6728e76b512d00224eb9a9455ed7939 (diff)
downloadikiwiki-884835ce1cd3b1ba24d6f6bb19786d04e6b8ae90.tar
ikiwiki-884835ce1cd3b1ba24d6f6bb19786d04e6b8ae90.tar.gz
cutpaste: Fix bug that occured in some cases involving inlines when text was pasted on a page before being cut.
Diffstat (limited to 'IkiWiki/Plugin/cutpaste.pm')
-rw-r--r--IkiWiki/Plugin/cutpaste.pm31
1 files changed, 22 insertions, 9 deletions
diff --git a/IkiWiki/Plugin/cutpaste.pm b/IkiWiki/Plugin/cutpaste.pm
index 4a8817168..0f6ea0b1f 100644
--- a/IkiWiki/Plugin/cutpaste.pm
+++ b/IkiWiki/Plugin/cutpaste.pm
@@ -5,10 +5,9 @@ use warnings;
use strict;
use IkiWiki 3.00;
-my %savedtext;
-
sub import {
hook(type => "getsetup", id => "cutpaste", call => \&getsetup);
+ hook(type => "needsbuild", id => "cutpaste", call => \&needsbuild);
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);
@@ -23,6 +22,22 @@ sub getsetup () {
},
}
+sub needsbuild (@) {
+ my $needsbuild=shift;
+ foreach my $page (keys %pagestate) {
+ if (exists $pagestate{$page}{cutpaste}) {
+ if (exists $pagesources{$page} &&
+ grep { $_ eq $pagesources{$page} } @$needsbuild) {
+ # remove state, will be re-added if
+ # the cut/copy directive is still present
+ # on rebuild.
+ delete $pagestate{$page}{cutpaste};
+ }
+ }
+ }
+ return $needsbuild;
+}
+
sub preprocess_cut (@) {
my %params=@_;
@@ -32,8 +47,7 @@ sub preprocess_cut (@) {
}
}
- $savedtext{$params{page}} = {} if not exists $savedtext{$params{"page"}};
- $savedtext{$params{page}}->{$params{id}} = $params{text};
+ $pagestate{$params{page}}{cutpaste}{$params{id}} = $params{text};
return "" if defined wantarray;
}
@@ -47,8 +61,7 @@ sub preprocess_copy (@) {
}
}
- $savedtext{$params{page}} = {} if not exists $savedtext{$params{"page"}};
- $savedtext{$params{page}}->{$params{id}} = $params{text};
+ $pagestate{$params{page}}{cutpaste}{$params{id}} = $params{text};
return IkiWiki::preprocess($params{page}, $params{destpage}, $params{text})
if defined wantarray;
@@ -63,15 +76,15 @@ sub preprocess_paste (@) {
}
}
- if (! exists $savedtext{$params{page}}) {
+ if (! exists $pagestate{$params{page}}{cutpaste}) {
error gettext('no text was copied in this page');
}
- if (! exists $savedtext{$params{page}}->{$params{id}}) {
+ if (! exists $pagestate{$params{page}}{cutpaste}{$params{id}}) {
error sprintf(gettext('no text was copied in this page with id %s'), $params{id});
}
return IkiWiki::preprocess($params{page}, $params{destpage},
- $savedtext{$params{page}}->{$params{id}});
+ $pagestate{$params{page}}{cutpaste}{$params{id}});
}
1;