arti/markdown-macro-for-confluence
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixing broken JS for code blocks in url macro, adding js to modify tables for Confluence styling.

Browse Source
This commit is contained in:
Boris Berenberg
2018-12-19 10:40:12 -05:00
parent 9918002f3e
commit add4e0abbd
2 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/com/atlassian/plugins/confluence/markdown/MarkdownFromURLMacro.java
View File

@@ -79,8 +79,8 @@ public class MarkdownFromURLMacro extends BaseMacro implements Macro {
.set(TablesExtension.APPEND_MISSING_COLUMNS, true) .set(TablesExtension.APPEND_MISSING_COLUMNS, true)
.set(TablesExtension.DISCARD_EXTRA_COLUMNS, true) .set(TablesExtension.DISCARD_EXTRA_COLUMNS, true)
.set(TablesExtension.HEADER_SEPARATOR_COLUMN_MATCH, true) .set(TablesExtension.HEADER_SEPARATOR_COLUMN_MATCH, true)
.set(Parser.EXTENSIONS, Arrays.asList(TablesExtension.create())) .set(TablesExtension.CLASS_NAME, "confluenceTable")
; .set(Parser.EXTENSIONS, Arrays.asList(TablesExtension.create()));
options.set(Parser.EXTENSIONS, Arrays.asList( options.set(Parser.EXTENSIONS, Arrays.asList(
TablesExtension.create(), TablesExtension.create(),
@@ -99,11 +99,24 @@ public class MarkdownFromURLMacro extends BaseMacro implements Macro {
String highlightjs = "<script>\n" + String highlightjs = "<script>\n" +
"AJS.$('[data-macro-name=\"markdown\"] code').each(function(i, block) {\n" + "AJS.$('[data-macro-name=\"markdown-from-url\"] code').each(function(i, block) {\n" +
" hljs.highlightBlock(block);\n" + " hljs.highlightBlock(block);\n" +
" });\n" + " });\n" +
"</script>"; "</script>";
String highlightjscss = "<style>\n"+
".hljs {display: inline;}\n" +
"pre > code {display: block !important;}\n" +
"</style>";
String tableFixJs = "<script>AJS.$('[data-macro-name=\"markdown-from-url\"] table thead th').each(function(i, block) {\n" +
" block.classList.add(\"confluenceTh\");\n" +
"});\n" +
"\n" +
"AJS.$('[data-macro-name=\"markdown-from-url\"] table tbody tr td').each(function(i, block) {\n" +
" block.classList.add(\"confluenceTd\");\n" +
"});</script>";
class privateRepositoryException extends Exception { class privateRepositoryException extends Exception {
public privateRepositoryException(String message) { public privateRepositoryException(String message) {
super(message); super(message);
@@ -131,7 +144,7 @@ public class MarkdownFromURLMacro extends BaseMacro implements Macro {
throw new privateRepositoryException("Cannot import from private repository."); throw new privateRepositoryException("Cannot import from private repository.");
}else { }else {
Node document = parser.parse(toParse); Node document = parser.parse(toParse);
html = renderer.render(document) + highlightjs; html = renderer.render(document) + highlightjs + highlightjscss + tableFixJs;
} }
} }
catch (MalformedURLException u) { catch (MalformedURLException u) {

10
src/main/java/com/atlassian/plugins/confluence/markdown/MarkdownMacro.java
View File

@@ -69,6 +69,7 @@ public class MarkdownMacro extends BaseMacro implements Macro {
.set(TablesExtension.APPEND_MISSING_COLUMNS, true) .set(TablesExtension.APPEND_MISSING_COLUMNS, true)
.set(TablesExtension.DISCARD_EXTRA_COLUMNS, true) .set(TablesExtension.DISCARD_EXTRA_COLUMNS, true)
.set(TablesExtension.HEADER_SEPARATOR_COLUMN_MATCH, true) .set(TablesExtension.HEADER_SEPARATOR_COLUMN_MATCH, true)
.set(TablesExtension.CLASS_NAME, "confluenceTable")
.set(Parser.EXTENSIONS, Arrays.asList(TablesExtension.create())); .set(Parser.EXTENSIONS, Arrays.asList(TablesExtension.create()));
options.set(Parser.EXTENSIONS, Arrays.asList( options.set(Parser.EXTENSIONS, Arrays.asList(
@@ -98,6 +99,13 @@ public class MarkdownMacro extends BaseMacro implements Macro {
"pre > code {display: block !important;}\n" + "pre > code {display: block !important;}\n" +
"</style>"; "</style>";
String tableFixJs = "<script> AJS.$('[data-macro-name=\"markdown\"] table thead th').each(function(i, block) {\n" +
" block.classList.add(\"confluenceTh\");\n" +
"});\n" +
"\n" +
"AJS.$('[data-macro-name=\"markdown\"] table tbody tr td').each(function(i, block) {\n" +
" block.classList.add(\"confluenceTd\");\n" +
"});</script>";
Parser parser = Parser.builder(options).build(); Parser parser = Parser.builder(options).build();
@@ -105,7 +113,7 @@ public class MarkdownMacro extends BaseMacro implements Macro {
Node document = parser.parse(bodyContent); Node document = parser.parse(bodyContent);
String html = renderer.render(document ) + highlightjs + highlightjscss; // "<p>This is <em>Sparta</em></p>\n" String html = renderer.render(document ) + highlightjs + highlightjscss + tableFixJs; // "<p>This is <em>Sparta</em></p>\n"
return html; return html;