From 073a5d4d68980072a1d2777c1ddb79e38d61e10c Mon Sep 17 00:00:00 2001 From: Baptiste Augrain Date: Mon, 24 Dec 2018 09:50:14 +0100 Subject: [PATCH] `Ctrl+V` can paste an image --- browser/components/CodeEditor.js | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/browser/components/CodeEditor.js b/browser/components/CodeEditor.js index aa380e38..7cc30b62 100644 --- a/browser/components/CodeEditor.js +++ b/browser/components/CodeEditor.js @@ -749,7 +749,13 @@ export default class CodeEditor extends React.Component { this.handlePasteText(editor, pastedTxt) } else if (fetchUrlTitle && isURL(pastedTxt) && !isInLinkTag(editor)) { this.handlePasteUrl(editor, pastedTxt) - } else if (enableSmartPaste || forceSmartPaste) { + } else if (attachmentManagement.isAttachmentLink(pastedTxt)) { + attachmentManagement + .handleAttachmentLinkPaste(storageKey, noteKey, pastedTxt) + .then(modifiedText => { + this.editor.replaceSelection(modifiedText) + }) + } else { const image = clipboard.readImage() if (!image.isEmpty()) { attachmentManagement.handlePastNativeImage( @@ -758,22 +764,16 @@ export default class CodeEditor extends React.Component { noteKey, image ) - } else { + } else if (enableSmartPaste || forceSmartPaste) { const pastedHtml = clipboard.readHTML() if (pastedHtml.length > 0) { this.handlePasteHtml(editor, pastedHtml) } else { this.handlePasteText(editor, pastedTxt) } + } else { + this.handlePasteText(editor, pastedTxt) } - } else if (attachmentManagement.isAttachmentLink(pastedTxt)) { - attachmentManagement - .handleAttachmentLinkPaste(storageKey, noteKey, pastedTxt) - .then(modifiedText => { - this.editor.replaceSelection(modifiedText) - }) - } else { - this.handlePasteText(editor, pastedTxt) } }