bugfix

[ikiwiki.git] / IkiWiki / Plugin / toggle.pm
diff --git a/IkiWiki/Plugin/toggle.pm b/IkiWiki/Plugin/toggle.pm

index 657d8d3c2d49dbc40a415fde9446aaeffe761d46..3319421d923d56c3489b7374edb912be7493027b 100644 (file)
--- a/IkiWiki/Plugin/toggle.pm
+++ b/IkiWiki/Plugin/toggle.pm
@@ -3,9 +3,9 @@ package IkiWiki::Plugin::toggle;
  
  use warnings;
  use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
  
-sub import { #{{{
+sub import {
         add_underlay("javascript");
         hook(type => "getsetup", id => "toggle", call => \&getsetup);
         hook(type => "preprocess", id => "toggle",
@@ -13,17 +13,18 @@ sub import { #{{{
         hook(type => "preprocess", id => "toggleable",
                 call => \&preprocess_toggleable);
         hook(type => "format", id => "toggle", call => \&format);
-} # }}}
+}
  
-sub getsetup () { #{{{
+sub getsetup () {
         return
                 plugin => {
                         safe => 1,
                         rebuild => undef,
+                       section => "widget",
                 },
-} #}}}
+}
  
-sub genid ($$) { #{{{
+sub genid ($$) {
         my $page=shift;
         my $id=shift;
  
@@ -35,16 +36,16 @@ sub genid ($$) { #{{{
                 $id="id$id";
         }
         return $id;
-} #}}}
+}
  
-sub preprocess_toggle (@) { #{{{
+sub preprocess_toggle (@) {
         my %params=(id => "default", text => "more", @_);
  
         my $id=genid($params{page}, $params{id});
         return "<a class=\"toggle\" href=\"#$id\">$params{text}</a>";
-} # }}}
+}
  
-sub preprocess_toggleable (@) { #{{{
+sub preprocess_toggleable (@) {
         my %params=(id => "default", text => "", open => "no", @_);
  
         # Preprocess the text to expand any preprocessor directives
@@ -61,29 +62,29 @@ sub preprocess_toggleable (@) { #{{{
         my ($indent)=$params{text}=~/( +)$/;
         $indent="" unless defined $indent;
         return "<div class=\"$class\" id=\"$id\"></div>\n\n$params{text}\n$indent<div class=\"toggleableend\"></div>";
-} # }}}
+}
  
-sub format (@) { #{{{
+sub format (@) {
          my %params=@_;
  
         if ($params{content}=~s!(<div class="toggleable(?:-open)?" id="[^"]+">\s*)</div>!$1!g) {
                 $params{content}=~s/<div class="toggleableend">//g;
-               if (! ($params{content}=~s!^(<body>)!$1.include_javascript($params{page})!em)) {
+               if (! ($params{content}=~s!^(<body[^>]*>)!$1.include_javascript($params{page})!em)) {
                         # no </body> tag, probably in preview mode
                         $params{content}=include_javascript($params{page}, 1).$params{content};
                 }
         }
         return $params{content};
-} # }}}
+}
  
-sub include_javascript ($;$) { #{{{
+sub include_javascript ($;$) {
         my $page=shift;
         my $absolute=shift;
         
-       return '<script src="'.urlto("ikiwiki.js", $page, $absolute).
+       return '<script src="'.urlto("ikiwiki/ikiwiki.js", $page, $absolute).
                 '" type="text/javascript" charset="utf-8"></script>'."\n".
-               '<script src="'.urlto("toggle.js", $page, $absolute).
+               '<script src="'.urlto("ikiwiki/toggle.js", $page, $absolute).
                 '" type="text/javascript" charset="utf-8"></script>';
-} #}}}
+}
  
  1