Compare commits
No commits in common. "51502bd694411fe34fe9f6dea90aead792eb94a6" and "1e42be3a4b974541dc6b34833cbef76866b8cebd" have entirely different histories.
51502bd694
...
1e42be3a4b
6
main.go
6
main.go
@ -80,12 +80,6 @@ func main() { // {{{
|
|||||||
}
|
}
|
||||||
logger.Info("application", "version", VERSION)
|
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)
|
service, err = webservice.New(flagConfig, VERSION, logger)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logger.Error("application", "error", err)
|
logger.Error("application", "error", err)
|
||||||
|
@ -311,7 +311,7 @@ class NodeContent extends Component {
|
|||||||
|
|
||||||
var element
|
var element
|
||||||
if (node.RenderMarkdown.value)
|
if (node.RenderMarkdown.value)
|
||||||
element = html`<${MarkdownContent} key='markdown-content' content=${content} />`
|
element = html`<div id="markdown"></div>`
|
||||||
else
|
else
|
||||||
element = html`
|
element = html`
|
||||||
<div class="grow-wrap">
|
<div class="grow-wrap">
|
||||||
@ -322,10 +322,18 @@ class NodeContent extends Component {
|
|||||||
return element
|
return element
|
||||||
}//}}}
|
}//}}}
|
||||||
componentDidMount() {//{{{
|
componentDidMount() {//{{{
|
||||||
|
const markdown = document.getElementById('markdown')
|
||||||
|
if (markdown)
|
||||||
|
markdown.innerHTML = marked.parse(this.props.node.content())
|
||||||
|
|
||||||
this.resize()
|
this.resize()
|
||||||
window.addEventListener('resize', () => this.resize())
|
window.addEventListener('resize', () => this.resize())
|
||||||
}//}}}
|
}//}}}
|
||||||
componentDidUpdate() {//{{{
|
componentDidUpdate() {//{{{
|
||||||
|
const markdown = document.getElementById('markdown')
|
||||||
|
if (markdown)
|
||||||
|
markdown.innerHTML = marked.parse(this.props.node.content())
|
||||||
|
|
||||||
this.resize()
|
this.resize()
|
||||||
}//}}}
|
}//}}}
|
||||||
contentChanged(evt) {//{{{
|
contentChanged(evt) {//{{{
|
||||||
@ -363,17 +371,6 @@ class NodeContent extends Component {
|
|||||||
}//}}}
|
}//}}}
|
||||||
}
|
}
|
||||||
|
|
||||||
class MarkdownContent extends Component {
|
|
||||||
render({ content }) {
|
|
||||||
return html`<div id="markdown"></div>`
|
|
||||||
}
|
|
||||||
componentDidMount() {//{{{
|
|
||||||
const markdown = document.getElementById('markdown')
|
|
||||||
if (markdown)
|
|
||||||
markdown.innerHTML = marked.parse(this.props.content)
|
|
||||||
}//}}}
|
|
||||||
}
|
|
||||||
|
|
||||||
class NodeFiles extends Component {
|
class NodeFiles extends Component {
|
||||||
render({ node }) {//{{{
|
render({ node }) {//{{{
|
||||||
if (node.Files === null || node.Files.length == 0)
|
if (node.Files === null || node.Files.length == 0)
|
||||||
|
Loading…
Reference in New Issue
Block a user