higlight js fixes

This commit is contained in:
Boris Berenberg
2018-08-06 21:24:23 -04:00
parent 1253a02da9
commit 8aa88c0d09
2 changed files with 10 additions and 3 deletions

View File

@@ -9,7 +9,7 @@
</parent> </parent>
<groupId>com.atlassian.plugins.confluence.markdown</groupId> <groupId>com.atlassian.plugins.confluence.markdown</groupId>
<artifactId>confluence-markdown-macro</artifactId> <artifactId>confluence-markdown-macro</artifactId>
<version>1.3.2</version> <version>1.3.4</version>
<organization> <organization>
<name>Atlassian</name> <name>Atlassian</name>
<url>http://www.atlassian.com/</url> <url>http://www.atlassian.com/</url>

View File

@@ -89,7 +89,7 @@ public class MarkdownMacro extends BaseMacro implements Macro
FootnoteExtension.create(), FootnoteExtension.create(),
WikiLinkExtension.create(), WikiLinkExtension.create(),
DefinitionExtension.create(), DefinitionExtension.create(),
AnchorLinkExtension.create(), //AnchorLinkExtension.create(),
AutolinkExtension.create(), AutolinkExtension.create(),
SuperscriptExtension.create(), SuperscriptExtension.create(),
YouTubeLinkExtension.create() YouTubeLinkExtension.create()
@@ -103,11 +103,18 @@ public class MarkdownMacro extends BaseMacro implements Macro
" });\n" + " });\n" +
"</script>"; "</script>";
String highlightjscss = "<style>\n"+
".hljs {display: inline;}\n" +
"pre > code {display: block !important;}\n" +
"</style>";
Parser parser = Parser.builder(options).build(); Parser parser = Parser.builder(options).build();
HtmlRenderer renderer = HtmlRenderer.builder(options).build(); HtmlRenderer renderer = HtmlRenderer.builder(options).build();
Node document = parser.parse(bodyContent); Node document = parser.parse(bodyContent);
String html = renderer.render(document ) + highlightjs; // "<p>This is <em>Sparta</em></p>\n" String html = renderer.render(document ) + highlightjs + highlightjscss; // "<p>This is <em>Sparta</em></p>\n"
return html; return html;
} }