Add markdown support to descriptions using the 'marked' js library for rendering.

1 files changed, 7 insertions, 14 deletions

diff --git a/src/ws/node.js b/src/ws/node.js
index 5ecfdac..16eb9cc 100644
--- a/src/ws/node.js
+++ b/src/ws/node.js
@@ -298,10 +298,12 @@ function makeClickthrough(e)
 	var elements = e.getElementsByTagName("*");
 	for(let element of elements)
 	{
-		if(element.tagName != "A")
+		if(element.tagName == "A")
 		{
-			element.style.pointerEvents = "none"; // enable clickthrough to parent
+			element.style.pointerEvents = "initial"; // enable links
+			continue;
 		}
+		element.style.pointerEvents = "none"; // enable clickthrough to parent
 	}
 }
 
@@ -325,18 +327,9 @@ Node.prototype.setAttribute = function(name, value)
 		{
 			this.description_element.removeChild(this.description_element.firstChild);
 		}
-		if(checkHTML(value))
-		{
-			// Insert as HTML
-			this.description_element.innerHTML = value;
-			makeClickthrough(this.description_element);
-		}
-		else
-		{
-			// Not valid HTML, insert as plain text to avoid breaking things
-			var description_txt = document.createTextNode(value);
-			this.description_element.appendChild(description_txt);
-		}
+
+		this.description_element.innerHTML = marked(value);
+		makeClickthrough(this.description_element);
 	}
 
 	if(name == "dragged")