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

Merge branch 'master' into math-support

Browse Source
This commit is contained in:
Laurent Cozic
2018-02-02 20:35:32 +00:00
parent 53da63e371 70adbe5e76
commit e8416042d4
132 changed files with 6020 additions and 1039 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ReactNativeClient/lib/MdToHtml.js
View File

@ -28,7 +28,7 @@ class MdToHtml {
const r = resources[n];
k.push(r.id);
}
k.push(md5(body));
k.push(md5(escape(body))); // https://github.com/pvorb/node-md5/issues/41
k.push(md5(JSON.stringify(style)));
k.push(md5(JSON.stringify(options)));
return k.join('_');
@ -73,7 +73,7 @@ class MdToHtml {
renderImage_(attrs, options) {
const loadResource = async (id) => {
console.info('Loading resource: ' + id);
// console.info('Loading resource: ' + id);
// Initially set to to an empty object to make
// it clear that it is being loaded. Otherwise