self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-01-23 18:53:36 +02:00
Code Issues Releases Activity

Clipper: Upgrade joplin-turndonw to fix import of literal HTML code

Browse Source
This commit is contained in:
Laurent Cozic 2018-06-30 16:12:01 +01:00
parent d27cbaa663
commit d5d0732bf3
5 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CliClient/package.json
View File

@ -38,7 +38,7 @@
"html-entities": "^1.2.1",
"html-minifier": "^3.5.15",
"image-type": "^3.0.0",
"joplin-turndown": "^4.0.7",
"joplin-turndown": "^4.0.8",
"joplin-turndown-plugin-gfm": "^1.0.7",
"jssha": "^2.3.0",
"levenshtein": "^1.0.5",

5
CliClient/tests/html_to_md/text_with_escaped_html.html Normal file
View File

@ -0,0 +1,5 @@
<p>Some text, not an image, so it should remain escaped:</p>
<p>&lt;img src="http://test.com/image.png" /&gt;</p>
<p>&lt;p class="testing"&gt;Paragraph example&lt;/p&gt;
<p>But this is code so it can be unescaped:</p>
<pre><code>&lt;img src="http://test.com/image.png" /&gt;</code></pre>

9
CliClient/tests/html_to_md/text_with_escaped_html.md Normal file
View File

@ -0,0 +1,9 @@
Some text, not an image, so it should remain escaped:
&lt;img src="http://test.com/image.png" /&gt;
&lt;p class="testing"&gt;Paragraph example&lt;/p&gt;
But this is code so it can be unescaped:
<img src="http://test.com/image.png" />

2
ElectronClient/app/gui/NoteText.jsx
View File

@ -720,7 +720,7 @@ class NoteTextComponent extends React.Component {
this.resourceLoadedTimeoutId_ = null;
this.updateHtml();
this.forceUpdate();
}, 1000);
}, 100);
},
postMessageSyntax: 'ipcRenderer.sendToHost',
};

2
ElectronClient/app/package.json
View File

@ -91,7 +91,7 @@
"highlight.js": "^9.12.0",
"html-entities": "^1.2.1",
"image-type": "^3.0.0",
"joplin-turndown": "^4.0.7",
"joplin-turndown": "^4.0.8",
"joplin-turndown-plugin-gfm": "^1.0.7",
"jssha": "^2.3.1",
"katex": "^0.9.0",