Merge branch 'master' of https://github.com/lxsang/antd-web-apps

doc/controllers/doccontroller.lua

@@ -123,7 +123,12 @@ function DocController:index(...)
     end
     if path and ulib.exists(path) then
         local file = io.open(path, "r")
-        local content = file:read("*a")
+        local content = ""
+        local md = require("md")
+        local callback = function(s)
+            content = content..s
+        end
+        md.to_html(file:read("*a"), callback)
         file.close()
         -- replace some display plugins
         content = pre_process_md(content, self)

doc/views/default/index/index.ls

@@ -88,7 +88,9 @@
     ?>
 </div>
 <div class = "md-content" id = "renderer">
-    
+    <?lua
+        echo(data)
+    ?>
 </div>
 <div class = "pagenav">
     <?lua
@@ -103,18 +105,4 @@
             echo("</a>")
         end
     ?>
-</div>
-<script>
-    window.addEventListener('load', (event) => {
-        var markdown = `<?=std.b64encode(data)?>`;
-        var converter = new showdown.Converter();
-        var html = converter.makeHtml(atob(markdown));
-        document.getElementById("renderer").innerHTML = html;
-        // highlight and math display
-        renderMathInElement(document.getElementById("renderer"));
-        document.querySelectorAll("pre code").forEach(element => {
-            hljs.highlightBlock(element);
-            hljs.lineNumbersBlock(element);
-        });
-    });
-</script>
+</div>

doc/views/default/layout.ls

@@ -13,16 +13,17 @@ local elinks = __main__:get("elinks")
             rel="stylesheet"
             type="text/css"
             href="<?=HTTP_ROOT?>/rst/katex/katex.min.css" />
-        <script
+        <!--script
             type="text/javascript"
             src="<?=HTTP_ROOT?>/rst/gscripts/showdown.min.js"
-        ></script>
+        ></script-->
         <script
             src="<?=HTTP_ROOT?>/rst/hljs/highlight.pack.js"
         ></script>
         <script
             src="<?=HTTP_ROOT?>/rst/hljs/highlightjs-line-numbers.min.js"
         ></script>
+        <script>hljs.initHighlightingOnLoad();</script>
         <script
             src="<?=HTTP_ROOT?>/rst/katex/katex.min.js"
         ></script>