Changed bb code [toc] to make it more flexible

This usage is know closer to the original usage of
http://ndabas.github.io/toc/

Changed:
- jquery.toc.js: Do not check for empty headings
- bbcode.php: Added processing of [toc] with parameters
- main.js: Use the default params for jquery.toc.js
- bbcode.html: Added more help for [toc] and corrected some html

doc/bbcode.html

@@ -49,26 +49,31 @@
 
 <p>Red Matrix specific codes</p>
 <ul class="listbullet" style="list-style-type: circle;">
-<li>[&amp;copy;] &copy;  This works for many HTML entities<br />
+<li>[&amp;copy;] &copy;  This works for many HTML entities</li>
-<li>[zrl]https://redmatrix.me[/zrl] Magic-auth version of [url] tag<br />
+<li>[zrl]https://redmatrix.me[/zrl] Magic-auth version of [url] tag</li>
-<li>[zmg]https://redmatrix.me/some/photo.jpg[/zmg] Magic-auth version of [img] tag<br />
+<li>[zmg]https://redmatrix.me/some/photo.jpg[/zmg] Magic-auth version of [img] tag<br /></li>
-<br />
-<li>[observer=1]Text to display if observer is authenticated in the matrix[/observer]
-<li>[observer=0]Text to display if observer is <strong>not</strong> authenticated in the matrix[/observer]<br />
-<li>[observer.baseurl] website of observer <br />
-<li>[observer.url] channel URL of observer <br />
-<li>[observer.name] name of observer <br />
-<li>[observer.address] address (zot-id) of observer <br />
-<li>[observer.photo] profile photo of observer <br />
-<br />
-<li>[spoiler] for hiding spoilers<br /><br />
 
-<li>[rpost=title]Text to post[/rpost] The observer will be returned to their home hub to enter a post with the specified title and body. Both are optional <br />
+<li>[observer=1]Text to display if observer is authenticated in the matrix[/observer]</li>
-<li>[qr]text to post[/qr] - create a QR code.<br />
+<li>[observer=0]Text to display if observer is <strong>not</strong> authenticated in the matrix[/observer]</li>
-<li>[toc] - create a table of content in a webpage (level h1,...,h4).<br />
+<li>[observer.baseurl] website of observer</li>
-<br /><br />
+<li>[observer.url] channel URL of observer</li>
+<li>[observer.name] name of observer</li>
+<li>[observer.address] address (zot-id) of observer</li>
+<li>[observer.photo] profile photo of observer<br /></li>
+
+<li>[spoiler] for hiding spoilers<br /><br /></li>
+
+<li>[rpost=title]Text to post[/rpost] The observer will be returned to their home hub to enter a post with the specified title and body. Both are optional</li>
+<li>[qr]text to post[/qr] - create a QR code.</li>
+<li>[toc] - create a table of content in a webpage. Please refer to the <a href="http://ndabas.github.io/toc/" target="_blank">original jquery toc</a> to get more explanations.
+	<ul>
+		<li>Optional param: 'data-toc'. If ommited the default is 'body'</li>
+		<li>Optional param: 'data-toc-headings'. If ommited the default is 'h1,h2,h3'</li>
+		<li>Full example: [toc data-toc='div.page-body' data-toc-headings='h1,h2']</li>
+	</ul>
+</li>
 </ul>
-
+<br />
 <p>These require a suitable map plugin/addon such as openstreetmap or else the result will be blank</p>
 <ul>
 <li>[map] Generate an inline map using the current browser coordinates of the poster, if browser location is enabled<br />

include/bbcode.php

@@ -582,10 +582,15 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
 	if (strpos($Text,'[h6]') !== false) {
 		$Text = preg_replace("(\[h6\](.*?)\[\/h6\])ism",'<h6>$1</h6>',$Text);
 	}
-	// Check for table of content
+	// Check for table of content without params
 	if (strpos($Text,'[toc]') !== false) {
 		$Text = preg_replace("/\[toc\]/ism",'<ul id="toc"></ul>',$Text);		
 	}
+	// Check for table of content with params
+	if (strpos($Text,'[toc') !== false) {
+		$Text = preg_replace("/\[toc([^\]]+?)\]/ism",'<ul$1></ul>',$Text);
+		
+	}
 	// Check for centered text
 	if (strpos($Text,'[/center]') !== false) {	
 	$Text = preg_replace("(\[center\](.*?)\[\/center\])ism","<div style=\"text-align:center;\">$1</div>",$Text);

library/tableofcontents/jquery.toc.js

@@ -15,8 +15,6 @@
  * 
  * The original script was modified to work within the red#martrix
  * - added var pathname
- * - added var textHeading: Accept heading with text only
- *     Why? At the moment webpages can contain empty title using h3
  */
 
 (function ($) {
@@ -56,10 +54,6 @@
                 var elem = $(this), level = $.map(headingSelectors, function (selector, index) {
                     return elem.is(selector) ? index : undefined;
                 })[0];                
-                
-                // Accept heading with text only
-                var textHeading = elem.text();
-                if(textHeading != '') {
                 if (level > currentLevel) {
                     // If the heading is at a deeper level than where we are, start a new nested
                     // list, but only if we already have some list items in the parent. If we do
@@ -84,7 +78,6 @@
                 );
 
                 currentLevel = level;
-                }
             });
         });
     }, old = $.fn.toc;

view/js/main.js

@@ -1125,7 +1125,7 @@ $(document).ready(function() {
 
 
 	$(".autotime").timeago();
-	$("#toc").toc({content: "body", headings: "h1,h2,h3,h4"});
+	$("#toc").toc();
 	
 
 });