This is an automated email from the ASF dual-hosted git repository. joergrade pushed a commit to branch CAUSEWAY-3428 in repository https://gitbox.apache.org/repos/asf/causeway.git
commit 877707dc08a00e913b5c794f573d7c062cb7d4c7 Author: Jörg Rade <[email protected]> AuthorDate: Fri Apr 14 14:04:04 2023 +0200 CAUSEWAY-3428 Ascii Doc display in html, conversion via asciidoctor --- incubator/clients/kroviz/build.gradle.kts | 2 +- .../causeway/client/kroviz/ui/builder/FieldSetBuilder.kt | 4 ++-- .../kroviz/utils/js/{ShowDown.kt => AsciiDoctor.kt} | 16 +++++++--------- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/incubator/clients/kroviz/build.gradle.kts b/incubator/clients/kroviz/build.gradle.kts index f5fdc8887c..60489b1317 100644 --- a/incubator/clients/kroviz/build.gradle.kts +++ b/incubator/clients/kroviz/build.gradle.kts @@ -110,7 +110,7 @@ kotlin { implementation(npm("vega", "5.22.1", false)) // implementation(npm("vega-lite", "5.6.0", true)) implementation(npm("element-resize-event", "3.0.6", false)) - implementation(npm("showdown", "2.1.0", false)) + implementation(npm("asciidoctor", "2.2.6", false)) } sourceSets["test"].dependencies { implementation(kotlin("test-js")) diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/builder/FieldSetBuilder.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/builder/FieldSetBuilder.kt index d1d5f34ecc..46fb3292f6 100644 --- a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/builder/FieldSetBuilder.kt +++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/ui/builder/FieldSetBuilder.kt @@ -25,7 +25,7 @@ import org.apache.causeway.client.kroviz.to.ValueType import org.apache.causeway.client.kroviz.to.bs.FieldSetBs import org.apache.causeway.client.kroviz.ui.core.FormItem import org.apache.causeway.client.kroviz.ui.core.FormPanelFactory -import org.apache.causeway.client.kroviz.utils.js.ShowDown +import org.apache.causeway.client.kroviz.utils.js.AsciiDoctor class FieldSetBuilder { @@ -47,7 +47,7 @@ class FieldSetBuilder { label = p.named if (memberType == ValueType.HTML && content is String) { when { - content.startsWith(":Notice:") -> content = ShowDown.convertMarkDown2Html(content) + content.startsWith(":Notice:") -> content = AsciiDoctor.convert(content) content.startsWith("link:") -> content = content.replace("link:", "") else -> {} } diff --git a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/utils/js/ShowDown.kt b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/utils/js/AsciiDoctor.kt similarity index 74% rename from incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/utils/js/ShowDown.kt rename to incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/utils/js/AsciiDoctor.kt index aa5264c668..70323fadae 100644 --- a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/utils/js/ShowDown.kt +++ b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/utils/js/AsciiDoctor.kt @@ -18,16 +18,14 @@ */ package org.apache.causeway.client.kroviz.utils.js -object ShowDown { - fun convertMarkDown2Html(text: String): dynamic { +object AsciiDoctor { + fun convert(content: String): dynamic { //TODO content.replace(":Notice:", "") - return js( - """ - var showdown = require('showdown'), - converter = new showdown.Converter(), - html = converter.makeHtml(text); - return html; - """ + return js(code = """ + var asciidoctor = require('asciidoctor')(); + var html = asciidoctor.convert(content); + return html; + """ ) } }
