Fix double typesetting issue

Author: SpeedJack

BbCode/Math.php

@@ -16,18 +16,17 @@ private static function loadMathjax(\XF\BbCode\Renderer\AbstractRenderer $render
 	public static function renderMathTag($tagChildren, $tagOption, $tag,
 		array $options, \XF\BbCode\Renderer\AbstractRenderer $renderer)
 	{
-		if (count($tagChildren) == 0)
+		$pre = '$$\[';
+		$post = '$$\]';
+		if (strpos($tag['tag'], 'imath') === 0) {
+			$pre = '$$\(';
+			$post = '$$\)';
+		}
+		if (count($tagChildren) == 0
+			|| !is_string($tagChildren[0])
+			|| strlen($tagChildren[0]) == 0)
 			return '';
 		self::loadMathjax($renderer);
-		return '$$\[' . $tagChildren[0] . '$$\]';
-	}
-
-	public static function renderInlineMathTag($tagChildren, $tagOption, $tag,
-		array $options, \XF\BbCode\Renderer\AbstractRenderer $renderer)
-	{
-		if (count($tagChildren) == 0)
-			return '';
-		self::loadMathjax($renderer);
-		return '$$\(' . $tagChildren[0] . '$$\)';
+		return $pre . $tagChildren[0] . $post;
 	}
 }

CONTRIBUTING.md

@@ -5,7 +5,7 @@
 1. You need [XenForo 2.x](https://xenforo.com/). You can setup a Scotch Box
    environment as described in the [Xenforo 2.x Development
    Documentation](https://xenforo.com/xf2-docs/dev/scotchbox/)
-2. Fork TwitchPiper
+2. Fork BbMath
 3. Move in the `src/addon/` folder of your development enviroment and `mkdir Inforge && cd Inforge`
 4. `git clone https://github.com/<your-username>/BbMath && cd BbMath`
 5. `git remote add upstream https://github.com/InforgeNet/BbMath`

_files/js/inforge/bbmath/mathjax-loader.js

@@ -1,48 +1,54 @@
-window.MathJax = {
-	loader: {
-		load: ['ui/safe']
-	},
-	options: {
-		enableMenu: false
-	},
-	tex: {
-		inlineMath: [['$$\\(', '$$\\)']],
-		displayMath: [['$$\\[', '$$\\]']],
-		processEscapes: false,
-		processRefs: true,
-		processEnvironments: false,
-		tags: 'ams'
-	},
-	svg: {
-		fontCache: 'global'
-	}
-};
+var BbMath = window.BbMath || {};
 
-(function() {
-	var script = document.createElement('script');
-	script.src = 'https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-svg.js';
-	script.async = true;
-	document.head.appendChild(script);
-})();
+!function($, window, document, _undefined)
+{
+	"use strict";
 
-var retypesetDisabled = false;
+	BbMath.MathJax = XF.create({
+		options: {
+			mathjax: {
+				loader: {
+					load: ['ui/safe'],
+				},
+				enableMenu: false,
+				tex: {
+					inlineMath: [['$$\\(', '$$\\)']],
+					displayMath: [['$$\\[', '$$\\]']],
+					processEscapes: false,
+					processRefs: true,
+					processEnvironments: false,
+					tags: 'ams',
+				},
+				svg: {
+					fontCache: 'global',
+				},
+			},
+			mathjaxUrl: 'https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-svg.js'
+		},
 
-function retypesetMathjax()
-{
-	$(this).off('DOMSubtreeModified', retypesetMathjax);
-	if (retypesetDisabled) {
-		setTimeout(retypesetMathjax, 500);
-		return;
-	}
-	retypesetDisabled = true;
-	$(this).on('DOMSubtreeModified', retypesetMathjax);
-	window.MathJax.typesetPromise().then(() => {
-		retypesetDisabled = false;
-	}).catch((err) => console.log(err.message));
-}
+		__construct: function(options) {
+			window.MathJax = this.options.mathjax;
+		},
+
+		load: function() {
+			XF.loadScript(this.options.mathjaxUrl, XF.proxy(this, 'loadSuccess'));
+		},
 
-$(window).on('load', function() {
-	$('article.message, article.resourceBody-main, blockquote.message-body').each(function() {
-		$(this).on('DOMSubtreeModified', retypesetMathjax);
+		loadSuccess: function() {
+			$(document).on('xf:layout', XF.proxy(this, 'retypeset'));
+		},
+
+		retypeset: function() {
+			MathJax.startup.promise = MathJax.startup.promise
+				.then(() => MathJax.typesetPromise())
+				.catch((err) => console.log('MathJax typeset failed: ' + err.message));
+			return MathJax.startup.promise;
+		},
+	});
+
+	$(document).on('xf:page-load-complete', function() {
+		var mathjax = new BbMath.MathJax();
+		mathjax.load();
 	});
-});
+}
+(jQuery, window, document);

_output/bb_codes/_metadata.json

@@ -1,8 +1,8 @@
 {
     "imath.json": {
-        "hash": "2608cc85133fd555483293fb02c28a5a"
+        "hash": "76f85b2621baad104fe9d590e0fff036"
     },
     "math.json": {
-        "hash": "0e73d0c917ba4a663b3fb8481e3e5287"
+        "hash": "c31776ee8f321354e6fa827faec500cd"
     }
 }

_output/bb_codes/imath.json

@@ -5,11 +5,11 @@
     "replace_html_email": "",
     "replace_text": "",
     "callback_class": "Inforge\\BbMath\\BbCode\\Math",
-    "callback_method": "renderInlineMathTag",
+    "callback_method": "renderMathTag",
     "option_regex": "",
-    "trim_lines_after": 1,
+    "trim_lines_after": 0,
     "plain_children": true,
-    "disable_smilies": false,
+    "disable_smilies": true,
     "disable_nl2br": false,
     "disable_autolink": true,
     "allow_empty": false,

_output/bb_codes/math.json

@@ -9,7 +9,7 @@
     "option_regex": "",
     "trim_lines_after": 1,
     "plain_children": true,
-    "disable_smilies": false,
+    "disable_smilies": true,
     "disable_nl2br": false,
     "disable_autolink": true,
     "allow_empty": false,

addon.json

@@ -1,16 +1,17 @@
 {
 	"legacy_addon_id": "",
 	"title": "[Inforge] BbMath",
-	"description": "Add BBCode to support equations and inline math.",
-	"version_id": 1000170,
-	"version_string": "1.0.1",
+	"description": "Add BBCode to support equations and inline math using LaTeX.",
+	"version_id": 1000270,
+	"version_string": "1.0.2",
 	"dev": "Inforge",
 	"dev_url": "https://www.inforge.net",
 	"faq_url": "https://github.com/InforgeNet/BbMath/wiki/Frequently-Asked-Questions",
 	"support_url": "https://github.com/InforgeNet/BbMath/issues",
 	"extra_urls": {
 		"Forum": "https://www.inforge.net/forum",
-		"GitHub": "https://github.com/InforgeNet/BbMath"
+		"GitHub": "https://github.com/InforgeNet/BbMath",
+		"Maintainer (Niccolò Scatena)": "mailto:[email protected]"
 	},
 	"require": {
 		"XF": [