Marty/qownnotes-scripts
1
0
Fork 0
mirror of https://github.com/marty-oehme/scripts.git synced 2024-12-22 07:58:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #30 from nikhilw/master

Browse source 
Issue-27: BugFix: html entities breaking rendering in plantuml. BugFi…
This commit is contained in:
Patrizio Bekerle 2018-05-01 22:05:22 +02:00 committed by GitHub
commit 0a949ae53e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
render-plantuml/render-plantuml.qml
View file

@ -66,6 +66,8 @@ QtObject {
var matchedUml = match[1].replace(/\n/gi, "\\n"); var matchedUml = match[1].replace(/\n/gi, "\\n");
var filePath = workDir + "/" + note.id + "_" + (++index); var filePath = workDir + "/" + note.id + "_" + (++index);
matchedUml = matchedUml.replace(/&gt;/g, ">").replace(/&lt;/g, "<").replace(/"/g, "\\\"").replace(/&quot;/g, "\\\"").replace(/&amp;/g, "&");
var params = ["-e", "require('fs').writeFileSync('" + filePath + "', \"" + matchedUml + "\", 'utf8');"]; var params = ["-e", "require('fs').writeFileSync('" + filePath + "', \"" + matchedUml + "\", 'utf8');"];
var result = script.startSynchronousProcess("node", params, html); var result = script.startSynchronousProcess("node", params, html);
@ -108,7 +110,7 @@ QtObject {
* @return {string} the modfied html or an empty string if nothing should be modified * @return {string} the modfied html or an empty string if nothing should be modified
*/ */
function noteToMarkdownHtmlHook(note, html) { function noteToMarkdownHtmlHook(note, html) {
var plantumlSectionRegex = /<pre><code class=\"language-plantuml\"\>([\s\S]*?)<\/pre>/gmi; var plantumlSectionRegex = /<pre><code class=\"language-plantuml\"\>([\s\S]*?)(<\/code>)?<\/pre>/gmi;
var plantumlFiles = extractPlantUmlText(html, plantumlSectionRegex, note); var plantumlFiles = extractPlantUmlText(html, plantumlSectionRegex, note);