From 073a5d4d68980072a1d2777c1ddb79e38d61e10c Mon Sep 17 00:00:00 2001
From: Baptiste Augrain <daiyam@zokugun.org>
Date: Mon, 24 Dec 2018 09:50:14 +0100
Subject: [PATCH 1/2] `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)
     }
   }
 

From 50669f65bbb775df310095106dc9f4de2a4c9157 Mon Sep 17 00:00:00 2001
From: Baptiste Augrain <daiyam@zokugun.org>
Date: Mon, 24 Dec 2018 11:04:17 +0100
Subject: [PATCH 2/2] update preferences' labels

---
 browser/main/modals/PreferencesModal/HotkeyTab.js | 2 +-
 browser/main/modals/PreferencesModal/UiTab.js     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 {
             </div>
           </div>
           <div styleName='group-section'>
-            <div styleName='group-section-label'>{i18n.__('Paste Smartly')}</div>
+            <div styleName='group-section-label'>{i18n.__('Paste HTML')}</div>
             <div styleName='group-section-control'>
               <input styleName='group-section-control-input'
                 onChange={(e) => this.handleHotkeyChange(e)}
diff --git a/browser/main/modals/PreferencesModal/UiTab.js b/browser/main/modals/PreferencesModal/UiTab.js
index becd4f54..964209b2 100644
--- a/browser/main/modals/PreferencesModal/UiTab.js
+++ b/browser/main/modals/PreferencesModal/UiTab.js
@@ -561,7 +561,7 @@ class UiTab extends React.Component {
                 ref='enableSmartPaste'
                 type='checkbox'
               />&nbsp;
-              {i18n.__('Enable smart paste')}
+              {i18n.__('Enable HTML paste')}
             </label>
           </div>