deal with inline code elements properly

1 files changed, 11 insertions, 12 deletions

diff --git a/init.js b/init.js
index a2e2572..7b85086 100644
--- a/init.js
+++ b/init.js
@@ -1,24 +1,23 @@
+/* global require, PluginHost, hljs */
+
 require(['dojo/_base/kernel', 'dojo/ready', 'dojo/request/script'], function  (dojo, ready, script) {
 	ready(function() {
+		function highlight_all(row, hljs) {
+			row.querySelectorAll("code").forEach((elem) => {
+				hljs.highlightBlock(elem);
+				if (!elem.closest('pre')) elem.setStyle({display: 'inline', padding: 0});
+			});
+		}
+
 		script.get("plugins.local/highlightjs/highlight.pack.js",
 				{checkString: 'hljs'}).then(() => {
 
-			console.log('hljs loaded', hljs)
-
 			PluginHost.register(PluginHost.HOOK_ARTICLE_RENDERED_CDM, function(row) {
-				row.querySelectorAll("code").forEach((elem) => {
-					console.log('about to highlight', elem);
-
-					hljs.highlightBlock(elem);
-				});
+				highlight_all(row, hljs);
 			});
 
 			PluginHost.register(PluginHost.HOOK_ARTICLE_RENDERED, function(row) {
-				row.querySelectorAll("code").forEach((elem) => {
-					console.log('about to highlight', elem);
-
-					hljs.highlightBlock(elem);
-				});
+				highlight_all(row, hljs);
 			});
 		});
 	});