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

Desktop: Resolves #3333: Improved escaping of Markdown titles in links

Browse Source
This commit is contained in:
Laurent Cozic 2020-06-07 12:55:40 +01:00
parent f36e0c2513
commit 40adbc5e9e
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ReactNativeClient/lib/markdownUtils.js
View File

@ -9,11 +9,6 @@ const listRegex = /^(\s*)([*+-] \[[x ]\]\s|[*+-]\s|(\d+)([.)]))(\s*)/;
const emptyListRegex = /^(\s*)([*+-] \[[x ]\]|[*+-]|(\d+)[.)])(\s*)$/; const emptyListRegex = /^(\s*)([*+-] \[[x ]\]|[*+-]|(\d+)[.)])(\s*)$/;
const markdownUtils = { const markdownUtils = {
// Not really escaping because that's not supported by marked.js
escapeLinkText(text) {
return text.replace(/(\[|\]|\(|\))/g, '_');
},
// Titles for markdown links only need escaping for [ and ] // Titles for markdown links only need escaping for [ and ]
escapeTitleText(text) { escapeTitleText(text) {
return text.replace(/(\[|\])/g, '\\$1'); return text.replace(/(\[|\])/g, '\\$1');

4
ReactNativeClient/lib/models/Resource.js
View File

@ -207,11 +207,11 @@ class Resource extends BaseItem {
const lines = []; const lines = [];
if (Resource.isSupportedImageMimeType(resource.mime)) { if (Resource.isSupportedImageMimeType(resource.mime)) {
lines.push('!['); lines.push('![');
lines.push(markdownUtils.escapeLinkText(tagAlt)); lines.push(markdownUtils.escapeTitleText(tagAlt));
lines.push(`](:/${resource.id})`); lines.push(`](:/${resource.id})`);
} else { } else {
lines.push('['); lines.push('[');
lines.push(markdownUtils.escapeLinkText(tagAlt)); lines.push(markdownUtils.escapeTitleText(tagAlt));
lines.push(`](:/${resource.id})`); lines.push(`](:/${resource.id})`);
} }
return lines.join(''); return lines.join('');

4
ReactNativeClient/lib/shim-init-node.js
View File

@ -211,7 +211,7 @@ function shimInit() {
}, options); }, options);
const { basename } = require('path'); const { basename } = require('path');
const { escapeLinkText } = require('lib/markdownUtils'); const { escapeTitleText } = require('lib/markdownUtils');
const { toFileProtocolPath } = require('lib/path-utils'); const { toFileProtocolPath } = require('lib/path-utils');
let resource = null; let resource = null;
@ -231,7 +231,7 @@ function shimInit() {
if (!options.createFileURL) { if (!options.createFileURL) {
newBody.push(Resource.markdownTag(resource)); newBody.push(Resource.markdownTag(resource));
} else { } else {
const filename = escapeLinkText(basename(filePath)); // to get same filename as standard drag and drop const filename = escapeTitleText(basename(filePath)); // to get same filename as standard drag and drop
const fileURL = `[${filename}](${toFileProtocolPath(filePath)})`; const fileURL = `[${filename}](${toFileProtocolPath(filePath)})`;
newBody.push(fileURL); newBody.push(fileURL);
} }