diff --git a/browser/components/CodeEditor.js b/browser/components/CodeEditor.js
index 48634993..01a54aac 100644
--- a/browser/components/CodeEditor.js
+++ b/browser/components/CodeEditor.js
@@ -964,7 +964,7 @@ export default class CodeEditor extends React.Component {
} else {
const image = clipboard.readImage()
if (!image.isEmpty()) {
- attachmentManagement.handlePastNativeImage(
+ attachmentManagement.handlePasteNativeImage(
this,
storageKey,
noteKey,
diff --git a/browser/main/lib/dataApi/attachmentManagement.js b/browser/main/lib/dataApi/attachmentManagement.js
index fb3beac1..407fa659 100644
--- a/browser/main/lib/dataApi/attachmentManagement.js
+++ b/browser/main/lib/dataApi/attachmentManagement.js
@@ -227,7 +227,15 @@ function migrateAttachments (markdownContent, storagePath, noteKey) {
* @returns {String} postprocessed HTML in which all :storage references are mapped to the actual paths.
*/
function fixLocalURLS (renderedHTML, storagePath) {
- return renderedHTML.replace(new RegExp('/?' + STORAGE_FOLDER_PLACEHOLDER + '.*?"', 'g'), function (match) {
+ /*
+ A :storage reference is like `:storage/3b6f8bd6-4edd-4b15-96e0-eadc4475b564/f939b2c3.jpg`.
+
+ - `STORAGE_FOLDER_PLACEHOLDER` will match `:storage`
+ - `(?:(?:\\\/|%5C)[-.\\w]+)+` will match `/3b6f8bd6-4edd-4b15-96e0-eadc4475b564/f939b2c3.jpg`
+ - `(?:\\\/|%5C)[-.\\w]+` will either match `/3b6f8bd6-4edd-4b15-96e0-eadc4475b564` or `/f939b2c3.jpg`
+ - `(?:\\\/|%5C)` match the path seperator. `\\\/` for posix systems and `%5C` for windows.
+ */
+ return renderedHTML.replace(new RegExp('/?' + STORAGE_FOLDER_PLACEHOLDER + '(?:(?:\\\/|%5C)[-.\\w]+)+', 'g'), function (match) {
var encodedPathSeparators = new RegExp(mdurl.encode(path.win32.sep) + '|' + mdurl.encode(path.posix.sep), 'g')
return match.replace(encodedPathSeparators, path.sep).replace(new RegExp('/?' + STORAGE_FOLDER_PLACEHOLDER, 'g'), 'file:///' + path.join(storagePath, DESTINATION_FOLDER))
})
@@ -279,7 +287,7 @@ function handleAttachmentDrop (codeEditor, storageKey, noteKey, dropEvent) {
* @param {String} noteKey Key of the current note
* @param {DataTransferItem} dataTransferItem Part of the past-event
*/
-function handlePastImageEvent (codeEditor, storageKey, noteKey, dataTransferItem) {
+function handlePasteImageEvent (codeEditor, storageKey, noteKey, dataTransferItem) {
if (!codeEditor) {
throw new Error('codeEditor has to be given')
}
@@ -323,7 +331,7 @@ function handlePastImageEvent (codeEditor, storageKey, noteKey, dataTransferItem
* @param {String} noteKey Key of the current note
* @param {NativeImage} image The native image
*/
-function handlePastNativeImage (codeEditor, storageKey, noteKey, image) {
+function handlePasteNativeImage (codeEditor, storageKey, noteKey, image) {
if (!codeEditor) {
throw new Error('codeEditor has to be given')
}
@@ -583,8 +591,8 @@ module.exports = {
fixLocalURLS,
generateAttachmentMarkdown,
handleAttachmentDrop,
- handlePastImageEvent,
- handlePastNativeImage,
+ handlePasteImageEvent,
+ handlePasteNativeImage,
getAttachmentsInMarkdownContent,
getAbsolutePathsOfAttachmentsInContent,
removeStorageAndNoteReferences,
diff --git a/tests/dataApi/attachmentManagement.test.js b/tests/dataApi/attachmentManagement.test.js
index 470df436..53558de2 100644
--- a/tests/dataApi/attachmentManagement.test.js
+++ b/tests/dataApi/attachmentManagement.test.js
@@ -128,6 +128,7 @@ it('should test that copyAttachment don\'t uses a random file name if not intend
it('should replace the all ":storage" path with the actual storage path', function () {
const storageFolder = systemUnderTest.DESTINATION_FOLDER
+ const noteKey = '9c9c4ba3-bc1e-441f-9866-c1e9a806e31c'
const testInput =
'\n' +
' \n' +
@@ -136,14 +137,18 @@ it('should replace the all ":storage" path with the actual storage path', functi
' \n' +
' Headline
\n' +
' \n' +
- '  + '0.6r4zdgc22xp.png)
\n' +
+ '  + noteKey + mdurl.encode(path.sep) + '0.6r4zdgc22xp.png)
\n' +
'
\n' +
' \n' +
- ' dummyPDF.pdf\n' +
+ ' dummyPDF.pdf\n' +
'
\n' +
' \n' +
- '  + 'd6c5ee92.jpg)
\n' +
+ '  + noteKey + mdurl.encode(path.sep) + 'd6c5ee92.jpg)
\n' +
'
\n' +
+ ' \n' +
+ ' \n' +
+ ' :storage' + mdurl.encode(path.sep) + noteKey + mdurl.encode(path.sep) + 'f939b2c3.jpg
\n' +
+ '
\n' +
' \n' +
''
const storagePath = '<>'
@@ -155,14 +160,18 @@ it('should replace the all ":storage" path with the actual storage path', functi
' \n' +
' Headline
\n' +
' \n' +
- ' 
\n' +
+ ' 
\n' +
'
\n' +
' \n' +
- ' dummyPDF.pdf\n' +
+ ' dummyPDF.pdf\n' +
'
\n' +
' \n' +
- ' 
\n' +
+ ' 
\n' +
'
\n' +
+ ' \n' +
+ ' \n' +
+ ' file:///' + storagePath + path.sep + storageFolder + path.sep + noteKey + path.sep + 'f939b2c3.jpg
\n' +
+ '
\n' +
' \n' +
''
const actual = systemUnderTest.fixLocalURLS(testInput, storagePath)