Merge pull request #2747 from daiyam/fix-paste-image

fix paste image

Author: Rokt33r

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)
     }
   }
 

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)}

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')}
             </label>
           </div>