diff --git a/main.go b/main.go index f6b8e01..1684c84 100644 --- a/main.go +++ b/main.go @@ -80,12 +80,6 @@ func main() { // {{{ } logger.Info("application", "version", VERSION) - config, err = ConfigRead(flagConfig) - if err != nil { - logger.Error("application", "error", err) - os.Exit(1) - } - service, err = webservice.New(flagConfig, VERSION, logger) if err != nil { logger.Error("application", "error", err) diff --git a/static/js/node.mjs b/static/js/node.mjs index 4a3332f..aef40ce 100644 --- a/static/js/node.mjs +++ b/static/js/node.mjs @@ -311,7 +311,7 @@ class NodeContent extends Component { var element if (node.RenderMarkdown.value) - element = html`<${MarkdownContent} key='markdown-content' content=${content} />` + element = html`
` else element = html`
@@ -322,10 +322,18 @@ class NodeContent extends Component { return element }//}}} componentDidMount() {//{{{ + const markdown = document.getElementById('markdown') + if (markdown) + markdown.innerHTML = marked.parse(this.props.node.content()) + this.resize() window.addEventListener('resize', () => this.resize()) }//}}} componentDidUpdate() {//{{{ + const markdown = document.getElementById('markdown') + if (markdown) + markdown.innerHTML = marked.parse(this.props.node.content()) + this.resize() }//}}} contentChanged(evt) {//{{{ @@ -363,17 +371,6 @@ class NodeContent extends Component { }//}}} } -class MarkdownContent extends Component { - render({ content }) { - return html`
` - } - componentDidMount() {//{{{ - const markdown = document.getElementById('markdown') - if (markdown) - markdown.innerHTML = marked.parse(this.props.content) - }//}}} -} - class NodeFiles extends Component { render({ node }) {//{{{ if (node.Files === null || node.Files.length == 0) diff --git a/version b/version index 3f430af..703a257 100644 --- a/version +++ b/version @@ -1 +1 @@ -v18 +v17