Merge commit 'upstream/master'

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

index ef30fe6b6ddce2349820da08401c2ccf376845a8..657d8d3c2d49dbc40a415fde9446aaeffe761d46 100644 (file)
--- a/IkiWiki/Plugin/toggle.pm
+++ b/IkiWiki/Plugin/toggle.pm
@@ -5,57 +5,9 @@ use warnings;
  use strict;
  use IkiWiki 2.00;
  
  use strict;
  use IkiWiki 2.00;
  
-# Here's the javascript that makes this possible. A key feature is the use
-# of css to hide toggleables, to avoid any flashing on page load. The css
-# is only emitted after the javascript tests that it's going to be able to
-# show the toggleables.
-our $javascript=<<'EOF';
-<script type="text/javascript">
-<!--
-if (document.getElementById && document.getElementsByTagName && document.createTextNode) {
-       document.write('<style type="text/css">div.toggleable { display: none; }</style>');
-       window.onload = inittoggle;
-}
-
-function inittoggle() {
-       var as = getElementsByClass('toggle');
-       for (var i = 0; i < as.length; i++) {
-               var id = as[i].href.match(/#(\w.+)/)[1];
-               if (document.getElementById(id).className == "toggleable")
-                       document.getElementById(id).style.display="none";
-               as[i].onclick = function() {
-                       toggle(this);
-                       return false;
-               }
-       }
-}
-
-function toggle(s) {
-       var id = s.href.match(/#(\w.+)/)[1];
-       style = document.getElementById(id).style;
-       if (style.display == "none")
-               style.display = "block";
-       else
-               style.display = "none";
-}
-
-function getElementsByClass(c) {
-       var ret = new Array();
-       var pattern = new RegExp("(^|\\s)"+c+"(\\s|$)");
-       var els = document.getElementsByTagName('*');
-       for (i = 0, j = 0; i < els.length; i++) {
-               if ( pattern.test(els[i].className) ) {
-                       ret[j] = els[i];
-                       j++;
-               }
-       }
-       return ret;
-}
-//-->
-</script>
-EOF
-
  sub import { #{{{
  sub import { #{{{
+       add_underlay("javascript");
+       hook(type => "getsetup", id => "toggle", call => \&getsetup);
         hook(type => "preprocess", id => "toggle",
                 call => \&preprocess_toggle);
         hook(type => "preprocess", id => "toggleable",
         hook(type => "preprocess", id => "toggle",
                 call => \&preprocess_toggle);
         hook(type => "preprocess", id => "toggleable",
@@ -63,6 +15,14 @@ sub import { #{{{
         hook(type => "format", id => "toggle", call => \&format);
  } # }}}
  
         hook(type => "format", id => "toggle", call => \&format);
  } # }}}
  
+sub getsetup () { #{{{
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => undef,
+               },
+} #}}}
+
  sub genid ($$) { #{{{
         my $page=shift;
         my $id=shift;
  sub genid ($$) { #{{{
         my $page=shift;
         my $id=shift;
@@ -106,14 +66,24 @@ sub preprocess_toggleable (@) { #{{{
  sub format (@) { #{{{
          my %params=@_;
  
  sub format (@) { #{{{
          my %params=@_;
  
-       if ($params{content}=~s!(<div class="toggleable(?:-open)?" id="[^"]+">)</div>!$1!g) {
+       if ($params{content}=~s!(<div class="toggleable(?:-open)?" id="[^"]+">\s*)</div>!$1!g) {
                 $params{content}=~s/<div class="toggleableend">//g;
                 $params{content}=~s/<div class="toggleableend">//g;
-               if (! ($params{content}=~s!^<body>!<body>$javascript!m)) {
+               if (! ($params{content}=~s!^(<body>)!$1.include_javascript($params{page})!em)) {
                         # no </body> tag, probably in preview mode
                         # no </body> tag, probably in preview mode
-                       $params{content}=$javascript.$params{content};
+                       $params{content}=include_javascript($params{page}, 1).$params{content};
                 }
         }
         return $params{content};
  } # }}}
  
                 }
         }
         return $params{content};
  } # }}}
  
+sub include_javascript ($;$) { #{{{
+       my $page=shift;
+       my $absolute=shift;
+       
+       return '<script src="'.urlto("ikiwiki.js", $page, $absolute).
+               '" type="text/javascript" charset="utf-8"></script>'."\n".
+               '<script src="'.urlto("toggle.js", $page, $absolute).
+               '" type="text/javascript" charset="utf-8"></script>';
+} #}}}
+
  1
  1