X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/a405b46c3b6020e1fa3631bfe5fd982f315c977f..64def3eaeae4ddbe5cee61d08612da1eb1bc54d3:/IkiWiki/Plugin/toggle.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/toggle.pm b/IkiWiki/Plugin/toggle.pm
index 7981d3701..e203defb0 100644
--- a/IkiWiki/Plugin/toggle.pm
+++ b/IkiWiki/Plugin/toggle.pm
@@ -3,13 +3,13 @@ package IkiWiki::Plugin::toggle;
 
 use warnings;
 use strict;
-use IkiWiki;
+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.
-my $javascript=<<'EOF';
+our $javascript=<<'EOF';
 <script type="text/javascript">
 <!--
 if (document.getElementById && document.getElementsByTagName && document.createTextNode) {
@@ -21,7 +21,8 @@ function inittoggle() {
 	var as = getElementsByClass('toggle');
 	for (var i = 0; i < as.length; i++) {
 		var id = as[i].href.match(/#(\w.+)/)[1];
-		document.getElementById(id).style.display="none";
+		if (document.getElementById(id).className == "toggleable")
+			document.getElementById(id).style.display="none";
 		as[i].onclick = function() {
 			toggle(this);
 			return false;
@@ -38,18 +39,22 @@ function toggle(s) {
 		style.display = "none";
 }
 
-function getElementsByClass(class) {
+function getElementsByClass(cls, node, tag) {
+	if (document.getElementsByClass)
+		return document.getElementsByClass(cls, node, tag);
+	if (! node) node = document;
+	if (! tag) tag = '*';
 	var ret = new Array();
-	var pattern = new RegExp("(^|\\s)"+class+"(\\s|$)");
-	var els = document.getElementsByTagName('*');
-	for (i = 0, j = 0; i < els.length; i++) {
+	var pattern = new RegExp("(^|\\s)"+cls+"(\\s|$)");
+	var els = node.getElementsByTagName(tag);
+	for (i = 0; i < els.length; i++) {
 		if ( pattern.test(els[i].className) ) {
-			ret[j] = els[i];
-			j++;
+			ret.push(els[i]);
 		}
 	}
 	return ret;
 }
+
 //-->
 </script>
 EOF
@@ -58,35 +63,59 @@ sub import { #{{{
 	hook(type => "preprocess", id => "toggle",
 		call => \&preprocess_toggle);
 	hook(type => "preprocess", id => "toggleable",
-		call => \&preprocess_toggleable, scan => 1);
+		call => \&preprocess_toggleable);
 	hook(type => "format", id => "toggle", call => \&format);
 } # }}}
 
+sub genid ($$) { #{{{
+	my $page=shift;
+	my $id=shift;
+
+	$id="$page.$id";
+
+	# make it a legal html id attribute
+	$id=~s/[^-a-zA-Z0-9.]/-/g;
+	if ($id !~ /^[a-zA-Z]/) {
+		$id="id$id";
+	}
+	return $id;
+} #}}}
+
 sub preprocess_toggle (@) { #{{{
 	my %params=(id => "default", text => "more", @_);
 
-	return "<a class=\"toggle\" href=\"#$params{page}.$params{id}\">$params{text}</a>";
+	my $id=genid($params{page}, $params{id});
+	return "<a class=\"toggle\" href=\"#$id\">$params{text}</a>";
 } # }}}
 
 sub preprocess_toggleable (@) { #{{{
-	my %params=(id => "default", text => "", @_);
+	my %params=(id => "default", text => "", open => "no", @_);
 
 	# Preprocess the text to expand any preprocessor directives
-	# embedded inside it. This is why scan is set for this preprocessor
-	# directive, since it could expand to something with a link in it.
-	$params{text}=IkiWiki::preprocess($params{page}, $params{destpage}, $params{text});
+	# embedded inside it.
+	$params{text}=IkiWiki::preprocess($params{page}, $params{destpage}, 
+		IkiWiki::filter($params{page}, $params{destpage}, $params{text}));
+	
+	my $id=genid($params{page}, $params{id});
+	my $class=(lc($params{open}) ne "yes") ? "toggleable" : "toggleable-open";
 
 	# Should really be a postprocessor directive, oh well. Work around
-	# markdown's dislike of markdown inside a <div>.
-	return "<div class=\"toggleable\" id=\"$params{page}.$params{id}\"></div>\n\n$params{text}<div class=\"toggleableend\"></div>";
+	# markdown's dislike of markdown inside a <div> with various funky
+	# whitespace.
+	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 (@) { #{{{
         my %params=@_;
 
-	if ($params{content}=~s!(<div class="toggleable" 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!^<\/body>!$javascript</body>!m;
+		if (! ($params{content}=~s!^<body>!<body>$javascript!m)) {
+			# no </body> tag, probably in preview mode
+			$params{content}=$javascript.$params{content};
+		}
 	}
 	return $params{content};
 } # }}}