nodebb-plugin-markdown 12.2.2 → 12.2.4

package/index.js

@@ -200,7 +200,7 @@ const Markdown = {
 			while ((current = matcher.exec(data.postData.content)) !== null) {
 				const match = current[1];
 				if (match && Markdown.isExternalLink(match)) { // for security only parse external images
-					const parsedUrl = new URL(match);
+					const parsedUrl = new URL(match, nconf.get('url'));
 					const filename = path.basename(parsedUrl.pathname);
 					const size = Markdown._externalImageCache.get(match);
 
@@ -277,6 +277,18 @@ const Markdown = {
 		const formatting = [
 			{ name: 'bold', className: 'fa fa-bold', title: '[[modules:composer.formatting.bold]]' },
 			{ name: 'italic', className: 'fa fa-italic', title: '[[modules:composer.formatting.italic]]' },
+			{
+				className: 'fa fa-heading',
+				title: '[[modules:composer.formatting.heading]]',
+				dropdownItems: [
+					{ name: 'heading1', text: '[[modules:composer.formatting.heading1]]' },
+					{ name: 'heading2', text: '[[modules:composer.formatting.heading2]]' },
+					{ name: 'heading3', text: '[[modules:composer.formatting.heading3]]' },
+					{ name: 'heading4', text: '[[modules:composer.formatting.heading4]]' },
+					{ name: 'heading5', text: '[[modules:composer.formatting.heading5]]' },
+					{ name: 'heading6', text: '[[modules:composer.formatting.heading6]]' },
+				],
+			},
 			{ name: 'list', className: 'fa fa-list-ul', title: '[[modules:composer.formatting.list]]' },
 			{ name: 'strikethrough', className: 'fa fa-strikethrough', title: '[[modules:composer.formatting.strikethrough]]' },
 			{ name: 'code', className: 'fa fa-code', title: '[[modules:composer.formatting.code]]' },
@@ -432,7 +444,7 @@ const Markdown = {
 		const allowed = pathname => allowedRoots.some(root => pathname.toString().startsWith(root) || pathname.toString().startsWith(nconf.get('relative_path') + root));
 
 		try {
-			const urlObj = new URL(src);
+			const urlObj = new URL(src, nconf.get('url'));
 			return !(urlObj.host === null && !allowed(urlObj.pathname));
 		} catch (e) {
 			return false;
@@ -443,11 +455,7 @@ const Markdown = {
 		let urlObj;
 		let baseUrlObj;
 		try {
-			if (urlString.startsWith('//')) {
-				urlString = `${nconf.get('url_parsed').protocol}${urlString}`;
-			}
-
-			urlObj = new URL(urlString);
+			urlObj = new URL(urlString, nconf.get('url'));
 			baseUrlObj = nconf.get('url_parsed');
 		} catch (err) {
 			return false;

package/package.json

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

package/public/js/markdown.js

@@ -52,6 +52,23 @@ export function prepareFormattingTools() {
 	], function (formatting, controls, translator) {
 		if (formatting && controls) {
 			translator.getTranslations(window.config.userLang || window.config.defaultLang, 'markdown', function (strings) {
+				// used for h1,h2...h6
+				function formatHeading(heading, textarea, selectionStart, selectionEnd) {
+					if (selectionStart === selectionEnd) {
+						controls.insertIntoTextarea(textarea, `${heading} ${strings.heading}`);
+
+						controls.updateTextareaSelection(
+							textarea, selectionStart + heading.length + 1, selectionStart + strings.heading.length + heading.length + 1
+						);
+					} else {
+						const selectedText = $(textarea).val().substring(selectionStart, selectionEnd);
+						const newText = `${heading} ${selectedText}`;
+						controls.replaceSelectionInTextareaWith(textarea, newText);
+						controls.updateTextareaSelection(textarea, selectionStart + (heading.length + 1), selectionEnd + (newText.length - selectedText.length));
+					}
+				}
+
+
 				formatting.addButtonDispatch('bold', function (textarea, selectionStart, selectionEnd) {
 					if (selectionStart === selectionEnd) {
 						var block = controls.getBlockData(textarea, '**', selectionStart);
@@ -94,6 +111,12 @@ export function prepareFormattingTools() {
 					}
 				});
 
+				[1, 2, 3, 4, 5, 6].forEach((size) => {
+					formatting.addButtonDispatch(`heading${size}`, function (textarea, selectionStart, selectionEnd) {
+						formatHeading(new Array(size).fill('#').join(''), textarea, selectionStart, selectionEnd);
+					});
+				})
+
 				formatting.addButtonDispatch('list', function (textarea, selectionStart, selectionEnd) {
 					if (selectionStart === selectionEnd) {
 						controls.insertIntoTextarea(textarea, '\n* ' + strings.list_item);
@@ -106,7 +129,7 @@ export function prepareFormattingTools() {
 						const selectedText = $(textarea).val().substring(selectionStart, selectionEnd);
 						const newText = '* ' + selectedText.split('\n').join('\n* ');
 						controls.replaceSelectionInTextareaWith(textarea, newText);
-						controls.updateTextareaSelection(textarea, selectionStart, selectionEnd + (newText.length - selectedText.length));
+						controls.updateTextareaSelection(textarea, selectionStart + 2, selectionEnd + (newText.length - selectedText.length));
 					}
 				});
 

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

@@ -2,6 +2,7 @@
 	"bold": "bolded text",
 	"italic": "italicised text",
 	"list_item": "list item",
+	"heading": "heading",
 	"strikethrough_text": "strikethrough text",
 	"code_text": "code_text",
 	"link_text": "link text",