projects / ikiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3ef8864)
Revert "insert flattr javascript via sanitize, not format hook"
authorJoey Hess <joey@kitenet.net>
Thu, 12 Aug 2010 22:18:35 +0000 (18:18 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 12 Aug 2010 22:18:35 +0000 (18:18 -0400)
This reverts commit 3ef8864122c2e665d41ed4d45baa50d4a5d21873.

Most aggregators block javascript and so it would display uglily.
Need to find a way to fallback to static buttons instead.

IkiWiki/Plugin/flattr.pm patch | blob | history

diff --git a/IkiWiki/Plugin/flattr.pm b/IkiWiki/Plugin/flattr.pm
index 9cf9dfb138ae74a3333ae102f3ffba44ab4a3952..3aee1eb93320eb1f0631eb58b39b50137c7f17bc 100644 (file)
--- a/IkiWiki/Plugin/flattr.pm
+++ b/IkiWiki/Plugin/flattr.pm
@@ -8,7 +8,7 @@ use IkiWiki 3.00;
 sub import {
        hook(type => "getsetup", id => "flattr", call => \&getsetup);
        hook(type => "preprocess", id => "flattr", call => \&preprocess);
-       hook(type => "sanitize", id => "flattr", call => \&sanitize, last => 1);
+       hook(type => "format", id => "flattr", call => \&format);
 }
 
 sub getsetup () {
@@ -54,16 +54,17 @@ sub preprocess (@) {
                '</a>';
 }
 
-sub sanitize (@) {
+sub format (@) {
        my %params=@_;
 
        # Add flattr's javascript to pages with flattr buttons.
        if ($flattr_pages{$params{page}}) {
-               return flattrjs().$params{content};
-       }
-       else {
-               return $params{content};
+               if (! ($params{content}=~s!^(<body[^>]*>)!$1.flattrjs()!em)) {
+                       # no <body> tag, probably in preview mode
+                       $params{content}=flattrjs().$params{content};
+               }
        }
+       return $params{content};
 }
 
 my $js_cached;
Ikiwiki is a compiler for VCS-based (Git, Subversion, ...) wikis.