toggle: Fix incompatability between javascript and webkit.

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

index f969d7686709da5a06410a260c09fbc598530f4b..ef30fe6b6ddce2349820da08401c2ccf376845a8 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) ) {
@@ -108,9 +108,9 @@ sub format (@) { #{{{
  
         if ($params{content}=~s!(<div class="toggleable(?:-open)?" id="[^"]+">)</div>!$1!g) {
                 $params{content}=~s/<div class="toggleableend">//g;
-               if (! ($params{content}=~s!^<\/body>!$javascript</body>!m)) {
+               if (! ($params{content}=~s!^<body>!<body>$javascript!m)) {
                         # no </body> tag, probably in preview mode
-                       $params{content}.=$javascript;
+                       $params{content}=$javascript.$params{content};
                 }
         }
         return $params{content};