Handle the case when HTML got tidied.

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

index 284eb8249df031e77f2e1ff1796d19624bbae1cf..825b55d68b5592017d02ae53cd221df41fa97b6e 100644 (file)
--- a/IkiWiki/Plugin/toggle.pm
+++ b/IkiWiki/Plugin/toggle.pm
@@ -39,9 +39,9 @@ function toggle(s) {
                 style.display = "none";
  }
  
-function getElementsByClass(class) {
+function getElementsByClass(c) {
         var ret = new Array();
-       var pattern = new RegExp("(^|\\s)"+class+"(\\s|$)");
+       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) ) {
@@ -106,7 +106,7 @@ sub preprocess_toggleable (@) { #{{{
  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;
                 if (! ($params{content}=~s!^<body>!<body>$javascript!m)) {
                         # no </body> tag, probably in preview mode