Merge pull request #34 from JohnDittmar/manual-code-highl

Language override for highlighting codeblocks.

Author: octalmage

assets/js/app.js

@@ -105,10 +105,20 @@ marked.setOptions(
 	sanitize: false,
 	smartLists: true,
 	smartypants: true,
-	highlight: function(code) //use highlight.js for syntax highlighting. 
-	{
-		return highlight.highlightAuto(code).value;
-	}
+	highlight: function(code, lang) //use highlight.js for syntax highlighting. 
+	{
+		if (!lang) return highlight.highlightAuto(code).value;
+        	
+        	try
+        	{
+            		content = highlight.highlight(lang, code).value;
+        	}
+        	catch (err)
+        	{
+            		content = highlight.highlightAuto(code).value;
+        	}
+        	return content;
+    	} 
 });
 
 $(document).on("click", "list-item", function()