diff --git a/browser/components/CodeEditor.js b/browser/components/CodeEditor.js index eb882002..e9d6badc 100644 --- a/browser/components/CodeEditor.js +++ b/browser/components/CodeEditor.js @@ -866,7 +866,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( @@ -875,22 +881,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) } } diff --git a/browser/main/modals/PreferencesModal/HotkeyTab.js b/browser/main/modals/PreferencesModal/HotkeyTab.js index a0f6a739..25098faa 100644 --- a/browser/main/modals/PreferencesModal/HotkeyTab.js +++ b/browser/main/modals/PreferencesModal/HotkeyTab.js @@ -151,7 +151,7 @@ class HotkeyTab extends React.Component {
-
{i18n.__('Paste Smartly')}
+
{i18n.__('Paste HTML')}
this.handleHotkeyChange(e)} diff --git a/browser/main/modals/PreferencesModal/UiTab.js b/browser/main/modals/PreferencesModal/UiTab.js index c7b21e2d..a371cac8 100644 --- a/browser/main/modals/PreferencesModal/UiTab.js +++ b/browser/main/modals/PreferencesModal/UiTab.js @@ -564,7 +564,7 @@ class UiTab extends React.Component { ref='enableSmartPaste' type='checkbox' />  - {i18n.__('Enable smart paste')} + {i18n.__('Enable HTML paste')}