nodebb-plugin-markdown 13.2.2 → 13.2.4

package/README.md

@@ -1,9 +1,9 @@
-# NodeBB Markdown Parser
-
-This NodeBB plugin is a parser that allows users to write posts using [Markdown](https://daringfireball.net/projects/markdown/).
-
-To customise options for the parser, please consult the "Markdown" page in the administration panel, under the "Plugins" heading.
-
-## Installation
-
-    npm install nodebb-plugin-markdown
+# NodeBB Markdown Parser
+
+This NodeBB plugin is a parser that allows users to write posts using [Markdown](https://daringfireball.net/projects/markdown/).
+
+To customise options for the parser, please consult the "Markdown" page in the administration panel, under the "Plugins" heading.
+
+## Installation
+
+    npm install nodebb-plugin-markdown

package/index.js

@@ -64,9 +64,6 @@ const Markdown = {
 			rel: 'prefetch stylesheet',
 			type: '',
 			href: `${nconf.get('relative_path')}/assets/plugins/nodebb-plugin-markdown/styles/${highlightTheme || 'default.css'}`,
-		}, {
-			rel: 'prefetch',
-			href: `${nconf.get('relative_path')}/assets/language/${meta.config.defaultLang || 'en-GB'}/markdown.json?${meta.config['cache-buster']}`,
 		});
 
 		return hookData;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-markdown",
-  "version": "13.2.2",
+  "version": "13.2.4",
   "description": "A Markdown parser for NodeBB",
   "main": "index.js",
   "repository": {

package/public/js/markdown.js

@@ -51,7 +51,7 @@ export function prepareFormattingTools() {
 		'translator',
 	], function (formatting, controls, translator) {
 		if (formatting && controls) {
-			translator.getTranslations(window.config.userLang || window.config.defaultLang, 'markdown', function (strings) {
+			translator.getTranslations(window.config.userLang, 'markdown', function (strings) {
 				// used for h1,h2...h6
 				function formatHeading(heading, textarea, selectionStart, selectionEnd) {
 					if (selectionStart === selectionEnd) {
@@ -219,16 +219,23 @@ export function markExternalLinks() {
 
 	const anchorEls = document.querySelectorAll('[component="post/content"] a');
 	anchorEls.forEach((anchorEl) => {
-		// Do nothing if the anchor contains only an image
-		if (anchorEl.childElementCount === 1 && anchorEl.querySelector('img') && !anchorEl.text) {
+		const imageOnly = anchorEl.childElementCount === 1 && anchorEl.querySelector('img') && !anchorEl.text;
+		const iconAlreadyAdded = anchorEl.querySelector('.external-link-icon');
+		if (imageOnly || iconAlreadyAdded) {
 			return;
 		}
 
 		// Otherwise, mark external links with icon
-		const parsed = new URL(anchorEl.href, document.location.href);
+		let parsed;
+		try {
+			parsed = new URL(anchorEl.href, document.location.href);
+		} catch (err) {
+			return;
+		}
+
 		if (parsed.host != document.location.host) {
 			const iconEl = document.createElement('i');
-			iconEl.classList.add('fa', 'fa-external-link', 'small');
+			iconEl.classList.add('fa', 'fa-external-link', 'small', 'external-link-icon');
 			anchorEl.append(' ', iconEl);
 		}
 	});

package/public/languages/de/markdown.json

@@ -1,12 +1,12 @@
-{
-	"bold": "Fettschrift",
-	"italic": "Kursivschrift",
-	"list-item": "Listenpunkt",
-	"strikethrough-text": "Durchgestrichen",
-	"code-text": "code_text",
-	"link-text": "Link Text",
-	"link-url": "Link Adresse",
-	"picture-text": "Bild Text",
-	"picture-url": "Bild Link",
-	"help-text": "Dieses Forum unterstützt Markdown. <a href=\"http://commonmark.org/help/\" class=\"text-decoration-underline\">Für mehr Informationen, hier klicken.</a>"
-}
+{
+	"bold": "Fettschrift",
+	"italic": "Kursivschrift",
+	"list-item": "Listenpunkt",
+	"strikethrough-text": "Durchgestrichen",
+	"code-text": "code_text",
+	"link-text": "Link Text",
+	"link-url": "Link Adresse",
+	"picture-text": "Bild Text",
+	"picture-url": "Bild Link",
+	"help-text": "Dieses Forum unterstützt Markdown. <a href=\"http://commonmark.org/help/\" class=\"text-decoration-underline\">Für mehr Informationen, hier klicken.</a>"
+}

package/public/languages/en-GB/markdown.json

@@ -1,13 +1,13 @@
-{
-	"bold": "bolded text",
-	"italic": "italicised text",
-	"list-item": "list item",
-	"heading": "heading",
-	"strikethrough-text": "strikethrough text",
-	"code-text": "code_text",
-	"link-text": "link text",
-	"link-url": "link url",
-	"picture-text": "alt text",
-	"picture-url": "image url",
-	"help-text": "This forum is powered by Markdown. <a href=\"http://commonmark.org/help/\" class=\"text-decoration-underline\">For full documentation, click here.</a>"
+{
+	"bold": "bolded text",
+	"italic": "italicised text",
+	"list-item": "list item",
+	"heading": "heading",
+	"strikethrough-text": "strikethrough text",
+	"code-text": "code_text",
+	"link-text": "link text",
+	"link-url": "link url",
+	"picture-text": "alt text",
+	"picture-url": "image url",
+	"help-text": "This forum is powered by Markdown. <a href=\"http://commonmark.org/help/\" class=\"text-decoration-underline\">For full documentation, click here.</a>"
 }

package/public/languages/fa-IR/markdown.json

@@ -1,11 +1,11 @@
-{
-	"bold": "متن پررنگ",
-	"italic": "متن ایتالیک ( کج )",
-	"list-item": "لیست",
-	"strikethrough-text": "متن خط خورده",
-	"link-text": "متن لینک",
-	"link-url": "آدرس لینک",
-	"picture-text": "متن جایگزین",
-	"picture-url": "آدرس عکس",
-	"help-text": "این انجمن از زبان مارک دون استفاده می کند، برای اطلاعات بیشتر [اینجا](http://commonmark.org/help/) کلیک کنید!"
-}
+{
+	"bold": "متن پررنگ",
+	"italic": "متن ایتالیک ( کج )",
+	"list-item": "لیست",
+	"strikethrough-text": "متن خط خورده",
+	"link-text": "متن لینک",
+	"link-url": "آدرس لینک",
+	"picture-text": "متن جایگزین",
+	"picture-url": "آدرس عکس",
+	"help-text": "این انجمن از زبان مارک دون استفاده می کند، برای اطلاعات بیشتر [اینجا](http://commonmark.org/help/) کلیک کنید!"
+}

package/public/languages/fr/markdown.json

@@ -1,11 +1,11 @@
-{
-	"bold": "texte en gras",
-	"italic": "texte en italique",
-	"list-item": "élément de liste",
-	"strikethrough-text": "strikethrough text",
-	"link-text": "texte du lien",
-	"link-url": "url du lien",
-	"picture-text": "text alternatif",
-	"picture-url": "url de l'image",
-	"help-text": "Ce forum utilise la syntaxe Markdown. <a href=\"http://commonmark.org/help/\" class=\"text-decoration-underline\">Pour accéder à la documentation, suivre ce lien.</a>"
-}
+{
+	"bold": "texte en gras",
+	"italic": "texte en italique",
+	"list-item": "élément de liste",
+	"strikethrough-text": "strikethrough text",
+	"link-text": "texte du lien",
+	"link-url": "url du lien",
+	"picture-text": "text alternatif",
+	"picture-url": "url de l'image",
+	"help-text": "Ce forum utilise la syntaxe Markdown. <a href=\"http://commonmark.org/help/\" class=\"text-decoration-underline\">Pour accéder à la documentation, suivre ce lien.</a>"
+}

package/public/languages/pl/markdown.json

@@ -1,11 +1,11 @@
-{
-	"bold": "pogrubienie",
-	"italic": "pochylenie",
-	"list-item": "wypunktowanie",
-	"strikethrough-text": "przekreślenie",
-	"link-text": "tekst odnośnika",
-	"link-url": "url odnośnika",
-	"picture-text": "text alternatywny",
-	"picture-url": "url obrazu",
-	"help-text": "Forum działa dzięki Markdown. <a href=\"http://commonmark.org/help/\" class=\"text-decoration-underline\">By uzyskać pełną dokumentację, kliknij tutaj.</a>"
-}
+{
+	"bold": "pogrubienie",
+	"italic": "pochylenie",
+	"list-item": "wypunktowanie",
+	"strikethrough-text": "przekreślenie",
+	"link-text": "tekst odnośnika",
+	"link-url": "url odnośnika",
+	"picture-text": "text alternatywny",
+	"picture-url": "url obrazu",
+	"help-text": "Forum działa dzięki Markdown. <a href=\"http://commonmark.org/help/\" class=\"text-decoration-underline\">By uzyskać pełną dokumentację, kliknij tutaj.</a>"
+}

package/public/languages/tr/markdown.json

@@ -1,11 +1,11 @@
-{
-	"bold": "kalın yazı",
-	"italic": "İtalik yazı",
-	"list-item": "liste madde",
-	"strikethrough-text": "Üstü çizili metin",
-	"link-text": "bağlantı metni",
-	"link-url": "link url",
-	"picture-text": "alt metni",
-	"picture-url": "görsel url",
-	"help-text": "This forum is powered by Markdown. <a href=\"http://commonmark.org/help/\" class=\"text-decoration-underline\">For full documentation, click here.</a>"
-}
+{
+	"bold": "kalın yazı",
+	"italic": "İtalik yazı",
+	"list-item": "liste madde",
+	"strikethrough-text": "Üstü çizili metin",
+	"link-text": "bağlantı metni",
+	"link-url": "link url",
+	"picture-text": "alt metni",
+	"picture-url": "görsel url",
+	"help-text": "This forum is powered by Markdown. <a href=\"http://commonmark.org/help/\" class=\"text-decoration-underline\">For full documentation, click here.</a>"
+}