From d79b6e094af5648d8584deaab554c9636943ebe6 Mon Sep 17 00:00:00 2001
From: ehhc <ehhc@users.noreply.github.com>
Date: Sun, 9 Sep 2018 17:41:51 +0200
Subject: [PATCH 001/159] export folder should also export the attachments ->
 fixes #2374

---
 browser/components/MarkdownPreview.js    | 39 ++----------------------
 browser/main/SideNav/StorageItem.js      | 14 +++++++++
 browser/main/lib/dataApi/exportFolder.js |  8 ++---
 browser/main/lib/dataApi/exportNote.js   | 26 +++++++++++++---
 package.json                             |  2 +-
 yarn.lock                                |  6 ++--
 6 files changed, 46 insertions(+), 49 deletions(-)

diff --git a/browser/components/MarkdownPreview.js b/browser/components/MarkdownPreview.js
index 5376a773..ebf32ccd 100755
--- a/browser/components/MarkdownPreview.js
+++ b/browser/components/MarkdownPreview.js
@@ -251,26 +251,7 @@ export default class MarkdownPreview extends React.Component {
   }
 
   handleSaveAsMd () {
-    this.exportAsDocument('md', (noteContent, exportTasks) => {
-      let result = noteContent
-      if (this.props && this.props.storagePath && this.props.noteKey) {
-        const attachmentsAbsolutePaths = attachmentManagement.getAbsolutePathsOfAttachmentsInContent(
-          noteContent,
-          this.props.storagePath
-        )
-        attachmentsAbsolutePaths.forEach(attachment => {
-          exportTasks.push({
-            src: attachment,
-            dst: attachmentManagement.DESTINATION_FOLDER
-          })
-        })
-        result = attachmentManagement.removeStorageAndNoteReferences(
-          noteContent,
-          this.props.noteKey
-        )
-      }
-      return result
-    })
+    this.exportAsDocument('md')
   }
 
   handleSaveAsHtml () {
@@ -301,11 +282,6 @@ export default class MarkdownPreview extends React.Component {
         escapeHtmlCharacters(noteContent, { detectCodeBlock: true })
       )
       const files = [this.GetCodeThemeLink(codeBlockTheme), ...CSS_FILES]
-      const attachmentsAbsolutePaths = attachmentManagement.getAbsolutePathsOfAttachmentsInContent(
-        noteContent,
-        this.props.storagePath
-      )
-
       files.forEach(file => {
         if (global.process.platform === 'win32') {
           file = file.replace('file:///', '')
@@ -317,16 +293,6 @@ export default class MarkdownPreview extends React.Component {
           dst: 'css'
         })
       })
-      attachmentsAbsolutePaths.forEach(attachment => {
-        exportTasks.push({
-          src: attachment,
-          dst: attachmentManagement.DESTINATION_FOLDER
-        })
-      })
-      body = attachmentManagement.removeStorageAndNoteReferences(
-        body,
-        this.props.noteKey
-      )
 
       let styles = ''
       files.forEach(file => {
@@ -359,8 +325,9 @@ export default class MarkdownPreview extends React.Component {
       if (filename) {
         const content = this.props.value
         const storage = this.props.storagePath
+        const nodeKey = this.props.noteKey
 
-        exportNote(storage, content, filename, contentFormatter)
+        exportNote(nodeKey, storage, content, filename, contentFormatter)
           .then(res => {
             dialog.showMessageBox(remote.getCurrentWindow(), {
               type: 'info',
diff --git a/browser/main/SideNav/StorageItem.js b/browser/main/SideNav/StorageItem.js
index d72f0a8f..242bf328 100644
--- a/browser/main/SideNav/StorageItem.js
+++ b/browser/main/SideNav/StorageItem.js
@@ -164,6 +164,20 @@ class StorageItem extends React.Component {
               folderKey: data.folderKey,
               fileType: data.fileType
             })
+            return data
+          })
+          .then(data => {
+            dialog.showMessageBox(remote.getCurrentWindow(), {
+              type: 'info',
+              message: 'Exported to "' + data.exportDir + '"'
+            })
+          })
+          .catch(err => {
+            dialog.showErrorBox(
+              'Export error',
+              err ? err.message || err : 'Unexpected error during export'
+            )
+            throw err
           })
       }
     })
diff --git a/browser/main/lib/dataApi/exportFolder.js b/browser/main/lib/dataApi/exportFolder.js
index 3e998f15..771f77dc 100644
--- a/browser/main/lib/dataApi/exportFolder.js
+++ b/browser/main/lib/dataApi/exportFolder.js
@@ -1,9 +1,9 @@
 import { findStorage } from 'browser/lib/findStorage'
 import resolveStorageData from './resolveStorageData'
 import resolveStorageNotes from './resolveStorageNotes'
+import exportNote from './exportNote'
 import filenamify from 'filenamify'
 import * as path from 'path'
-import * as fs from 'fs'
 
 /**
  * @param {String} storageKey
@@ -45,9 +45,9 @@ function exportFolder (storageKey, folderKey, fileType, exportDir) {
 
       notes
         .filter(note => note.folder === folderKey && note.isTrashed === false && note.type === 'MARKDOWN_NOTE')
-        .forEach(snippet => {
-          const notePath = path.join(exportDir, `${filenamify(snippet.title, {replacement: '_'})}.${fileType}`)
-          fs.writeFileSync(notePath, snippet.content)
+        .forEach(note => {
+          const notePath = path.join(exportDir, `${filenamify(note.title, {replacement: '_'})}.${fileType}`)
+          exportNote(note.key, storage.path, note.content, notePath, null)
         })
 
       return {
diff --git a/browser/main/lib/dataApi/exportNote.js b/browser/main/lib/dataApi/exportNote.js
index e4fec5f4..b358e548 100755
--- a/browser/main/lib/dataApi/exportNote.js
+++ b/browser/main/lib/dataApi/exportNote.js
@@ -4,27 +4,43 @@ import { findStorage } from 'browser/lib/findStorage'
 const fs = require('fs')
 const path = require('path')
 
+const attachmentManagement = require('./attachmentManagement')
+
 /**
- * Export note together with images
+ * Export note together with attachments
  *
- * If images is stored in the storage, creates 'images' subfolder in target directory
- * and copies images to it. Changes links to images in the content of the note
+ * If attachments are stored in the storage, creates 'attachments' subfolder in target directory
+ * and copies attachments to it. Changes links to images in the content of the note
  *
+ * @param {String} nodeKey key of the node that should be exported
  * @param {String} storageKey or storage path
  * @param {String} noteContent Content to export
  * @param {String} targetPath Path to exported file
  * @param {function} outputFormatter
  * @return {Promise.<*[]>}
  */
-function exportNote (storageKey, noteContent, targetPath, outputFormatter) {
+function exportNote (nodeKey, storageKey, noteContent, targetPath, outputFormatter) {
   const storagePath = path.isAbsolute(storageKey) ? storageKey : findStorage(storageKey).path
   const exportTasks = []
 
   if (!storagePath) {
     throw new Error('Storage path is not found')
   }
+  const attachmentsAbsolutePaths = attachmentManagement.getAbsolutePathsOfAttachmentsInContent(
+    noteContent,
+    storagePath
+  )
+  attachmentsAbsolutePaths.forEach(attachment => {
+    exportTasks.push({
+      src: attachment,
+      dst: attachmentManagement.DESTINATION_FOLDER
+    })
+  })
 
-  let exportedData = noteContent
+  let exportedData = attachmentManagement.removeStorageAndNoteReferences(
+    noteContent,
+    nodeKey
+  )
 
   if (outputFormatter) {
     exportedData = outputFormatter(exportedData, exportTasks)
diff --git a/package.json b/package.json
index c9e22164..dd793f9e 100644
--- a/package.json
+++ b/package.json
@@ -59,7 +59,7 @@
     "electron-gh-releases": "^2.0.2",
     "escape-string-regexp": "^1.0.5",
     "file-url": "^2.0.2",
-    "filenamify": "^2.0.0",
+    "filenamify": "^2.1.0",
     "flowchart.js": "^1.6.5",
     "font-awesome": "^4.3.0",
     "fs-extra": "^5.0.0",
diff --git a/yarn.lock b/yarn.lock
index 4ecfa51b..0d919cf3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3514,9 +3514,9 @@ filename-reserved-regex@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz#abf73dfab735d045440abfea2d91f389ebbfa229"
 
-filenamify@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/filenamify/-/filenamify-2.0.0.tgz#bd162262c0b6e94bfbcdcf19a3bbb3764f785695"
+filenamify@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/filenamify/-/filenamify-2.1.0.tgz#88faf495fb1b47abfd612300002a16228c677ee9"
   dependencies:
     filename-reserved-regex "^2.0.0"
     strip-outer "^1.0.0"

From 6510152138e7a4a7e7d813b5100941f21a27275a Mon Sep 17 00:00:00 2001
From: Martin Price <martin.price@xtremepush.com>
Date: Mon, 17 Sep 2018 11:55:01 +0100
Subject: [PATCH 002/159] Always redirect to `/home` when jumping to a note by
 hash

The note which we are jumping to may not be available in the note list for a number of reasons (e.g. if there is an active search, or if another storage folder is selected, or if the note list is showing starred notes).

This affects both when we are creating a new note (which may not match the current search criteria), and when jumping to a note via a link in another note (and the linked note may not be available for any of the above reasons).

2241
---
 browser/main/NoteList/index.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/browser/main/NoteList/index.js b/browser/main/NoteList/index.js
index f7dd0764..27932d71 100644
--- a/browser/main/NoteList/index.js
+++ b/browser/main/NoteList/index.js
@@ -170,16 +170,15 @@ class NoteList extends React.Component {
     }
   }
 
-  focusNote (selectedNoteKeys, noteKey) {
+  focusNote (selectedNoteKeys, noteKey, pathname) {
     const { router } = this.context
-    const { location } = this.props
 
     this.setState({
       selectedNoteKeys
     })
 
     router.push({
-      pathname: location.pathname,
+      pathname,
       query: {
         key: noteKey
       }
@@ -198,6 +197,7 @@ class NoteList extends React.Component {
     }
     let { selectedNoteKeys } = this.state
     const { shiftKeyDown } = this.state
+    const { location } = this.props
 
     let targetIndex = this.getTargetIndex()
 
@@ -214,7 +214,7 @@ class NoteList extends React.Component {
       selectedNoteKeys.push(priorNoteKey)
     }
 
-    this.focusNote(selectedNoteKeys, priorNoteKey)
+    this.focusNote(selectedNoteKeys, priorNoteKey, location.pathname)
 
     ee.emit('list:moved')
   }
@@ -225,6 +225,7 @@ class NoteList extends React.Component {
     }
     let { selectedNoteKeys } = this.state
     const { shiftKeyDown } = this.state
+    const { location } = this.props
 
     let targetIndex = this.getTargetIndex()
     const isTargetLastNote = targetIndex === this.notes.length - 1
@@ -247,7 +248,7 @@ class NoteList extends React.Component {
       selectedNoteKeys.push(nextNoteKey)
     }
 
-    this.focusNote(selectedNoteKeys, nextNoteKey)
+    this.focusNote(selectedNoteKeys, nextNoteKey, location.pathname)
 
     ee.emit('list:moved')
   }
@@ -259,7 +260,7 @@ class NoteList extends React.Component {
     }
 
     const selectedNoteKeys = [noteHash]
-    this.focusNote(selectedNoteKeys, noteHash)
+    this.focusNote(selectedNoteKeys, noteHash, '/home')
 
     ee.emit('list:moved')
   }

From e9dac8c8f30719357b59fa03c54879ec3f95321a Mon Sep 17 00:00:00 2001
From: Baptiste Augrain <daiyam@zokugun.org>
Date: Mon, 1 Oct 2018 18:16:26 +0200
Subject: [PATCH 003/159] fix scrolling in note list

---
 browser/main/NoteList/index.js |  3 +--
 browser/main/TopBar/index.js   | 20 ++++++++++++--------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/browser/main/NoteList/index.js b/browser/main/NoteList/index.js
index 30ad93c3..a9818e4f 100644
--- a/browser/main/NoteList/index.js
+++ b/browser/main/NoteList/index.js
@@ -2,7 +2,6 @@
 import PropTypes from 'prop-types'
 import React from 'react'
 import CSSModules from 'browser/lib/CSSModules'
-import debounceRender from 'react-debounce-render'
 import styles from './NoteList.styl'
 import moment from 'moment'
 import _ from 'lodash'
@@ -1078,4 +1077,4 @@ NoteList.propTypes = {
   })
 }
 
-export default debounceRender(CSSModules(NoteList, styles))
+export default CSSModules(NoteList, styles)
diff --git a/browser/main/TopBar/index.js b/browser/main/TopBar/index.js
index a5687ecb..d1844532 100644
--- a/browser/main/TopBar/index.js
+++ b/browser/main/TopBar/index.js
@@ -6,6 +6,7 @@ import _ from 'lodash'
 import ee from 'browser/main/lib/eventEmitter'
 import NewNoteButton from 'browser/main/NewNoteButton'
 import i18n from 'browser/lib/i18n'
+import debounce from 'lodash/debounce'
 
 class TopBar extends React.Component {
   constructor (props) {
@@ -25,6 +26,10 @@ class TopBar extends React.Component {
     }
 
     this.codeInitHandler = this.handleCodeInit.bind(this)
+
+    this.updateKeyword = debounce(this.updateKeyword, 1000 / 60, {
+      maxWait: 1000 / 8
+    })
   }
 
   componentDidMount () {
@@ -94,7 +99,6 @@ class TopBar extends React.Component {
   }
 
   handleKeyUp (e) {
-    const { router } = this.context
     // reset states
     this.setState({
       isConfirmTranslation: false
@@ -106,21 +110,21 @@ class TopBar extends React.Component {
         isConfirmTranslation: true
       })
       const keyword = this.refs.searchInput.value
-      router.push(`/searched/${encodeURIComponent(keyword)}`)
-      this.setState({
-        search: keyword
-      })
+      this.updateKeyword(keyword)
     }
   }
 
   handleSearchChange (e) {
-    const { router } = this.context
-    const keyword = this.refs.searchInput.value
     if (this.state.isAlphabet || this.state.isConfirmTranslation) {
-      router.push(`/searched/${encodeURIComponent(keyword)}`)
+      const keyword = this.refs.searchInput.value
+      this.updateKeyword(keyword)
     } else {
       e.preventDefault()
     }
+  }
+
+  updateKeyword(keyword) {
+    this.context.router.push(`/searched/${encodeURIComponent(keyword)}`)
     this.setState({
       search: keyword
     })

From fa6c504b34934609edb9a99007a8811addabcdae Mon Sep 17 00:00:00 2001
From: Baptiste Augrain <daiyam@zokugun.org>
Date: Mon, 1 Oct 2018 18:42:18 +0200
Subject: [PATCH 004/159] fix lint error

---
 browser/main/TopBar/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser/main/TopBar/index.js b/browser/main/TopBar/index.js
index d1844532..91256daf 100644
--- a/browser/main/TopBar/index.js
+++ b/browser/main/TopBar/index.js
@@ -123,7 +123,7 @@ class TopBar extends React.Component {
     }
   }
 
-  updateKeyword(keyword) {
+  updateKeyword (keyword) {
     this.context.router.push(`/searched/${encodeURIComponent(keyword)}`)
     this.setState({
       search: keyword

From e52bcf33c579de9ddb80f7fb4bb5751adb39bb02 Mon Sep 17 00:00:00 2001
From: Baptiste Augrain <daiyam@zokugun.org>
Date: Mon, 1 Oct 2018 18:54:50 +0200
Subject: [PATCH 005/159] add `precommit` command

---
 package.json |   6 +++
 yarn.lock    | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 121 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f4e5f532..4fe3434a 100644
--- a/package.json
+++ b/package.json
@@ -132,6 +132,7 @@
     "grunt": "^0.4.5",
     "grunt-electron-installer": "2.1.0",
     "history": "^1.17.0",
+    "husky": "^1.1.0",
     "identity-obj-proxy": "^3.0.0",
     "jest": "^22.4.3",
     "jest-localstorage-mock": "^2.2.0",
@@ -179,5 +180,10 @@
       "<rootDir>/tests/jest.js",
       "jest-localstorage-mock"
     ]
+  },
+  "husky": {
+    "hooks": {
+      "pre-commit": "npm run lint"
+    }
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 687bb6de..5c9c1cc4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1677,6 +1677,10 @@ ci-info@^1.0.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.1.3.tgz#710193264bb05c77b8c90d02f5aaf22216a667b2"
 
+ci-info@^1.5.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.6.0.tgz#2ca20dbb9ceb32d4524a683303313f0304b1e497"
+
 circular-json@^0.3.1:
   version "0.3.3"
   resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.3.tgz#815c99ea84f6809529d2f45791bdf82711352d66"
@@ -2074,6 +2078,14 @@ core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
 
+cosmiconfig@^5.0.6:
+  version "5.0.6"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.0.6.tgz#dca6cf680a0bd03589aff684700858c81abeeb39"
+  dependencies:
+    is-directory "^0.3.1"
+    js-yaml "^3.9.0"
+    parse-json "^4.0.0"
+
 create-error-class@^3.0.0, create-error-class@^3.0.1:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/create-error-class/-/create-error-class-3.0.2.tgz#06be7abef947a3f14a30fd610671d401bca8b7b6"
@@ -3309,6 +3321,18 @@ execa@^0.7.0:
     signal-exit "^3.0.0"
     strip-eof "^1.0.0"
 
+execa@^0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-0.9.0.tgz#adb7ce62cf985071f60580deb4a88b9e34712d01"
+  dependencies:
+    cross-spawn "^5.0.1"
+    get-stream "^3.0.0"
+    is-stream "^1.1.0"
+    npm-run-path "^2.0.0"
+    p-finally "^1.0.0"
+    signal-exit "^3.0.0"
+    strip-eof "^1.0.0"
+
 exit-hook@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz#f05ca233b48c05d54fff07765df8507e95c02ff8"
@@ -3615,6 +3639,12 @@ find-up@^2.0.0, find-up@^2.1.0:
   dependencies:
     locate-path "^2.0.0"
 
+find-up@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
+  dependencies:
+    locate-path "^3.0.0"
+
 findup-sync@~0.1.2:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-0.1.3.tgz#7f3e7a97b82392c653bf06589bd85190e93c3683"
@@ -3870,6 +3900,10 @@ get-stdin@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-5.0.1.tgz#122e161591e21ff4c52530305693f20e6393a398"
 
+get-stdin@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-6.0.0.tgz#9e09bf712b360ab9225e812048f71fde9c89657b"
+
 get-stream@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
@@ -4411,6 +4445,21 @@ humanize-plus@^1.8.1:
   version "1.8.2"
   resolved "https://registry.yarnpkg.com/humanize-plus/-/humanize-plus-1.8.2.tgz#a65b34459ad6367adbb3707a82a3c9f916167030"
 
+husky@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/husky/-/husky-1.1.0.tgz#7271e85f5d98b54349788839b720c9a60cd95dba"
+  dependencies:
+    cosmiconfig "^5.0.6"
+    execa "^0.9.0"
+    find-up "^3.0.0"
+    get-stdin "^6.0.0"
+    is-ci "^1.2.1"
+    pkg-dir "^3.0.0"
+    please-upgrade-node "^3.1.1"
+    read-pkg "^4.0.1"
+    run-node "^1.0.0"
+    slash "^2.0.0"
+
 i18n-2@^0.7.2:
   version "0.7.2"
   resolved "https://registry.yarnpkg.com/i18n-2/-/i18n-2-0.7.2.tgz#7efb1a7adc67869adea0688951577464aa793aaf"
@@ -4617,6 +4666,12 @@ is-ci@^1.0.10, is-ci@^1.0.7:
   dependencies:
     ci-info "^1.0.0"
 
+is-ci@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.2.1.tgz#e3779c8ee17fccf428488f6e281187f2e632841c"
+  dependencies:
+    ci-info "^1.5.0"
+
 is-data-descriptor@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
@@ -4649,6 +4704,10 @@ is-descriptor@^1.0.0, is-descriptor@^1.0.2:
     is-data-descriptor "^1.0.0"
     kind-of "^6.0.2"
 
+is-directory@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
+
 is-dotfile@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"
@@ -5286,7 +5345,7 @@ js-yaml@^3.10.0, js-yaml@^3.5.1, js-yaml@^3.7.0:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
-js-yaml@^3.8.1:
+js-yaml@^3.8.1, js-yaml@^3.9.0:
   version "3.12.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1"
   dependencies:
@@ -5612,6 +5671,13 @@ locate-path@^2.0.0:
     p-locate "^2.0.0"
     path-exists "^3.0.0"
 
+locate-path@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
+  dependencies:
+    p-locate "^3.0.0"
+    path-exists "^3.0.0"
+
 lodash-es@^4.2.1:
   version "4.17.10"
   resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.10.tgz#62cd7104cdf5dd87f235a837f0ede0e8e5117e05"
@@ -6595,16 +6661,32 @@ p-limit@^1.1.0:
   dependencies:
     p-try "^1.0.0"
 
+p-limit@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.0.0.tgz#e624ed54ee8c460a778b3c9f3670496ff8a57aec"
+  dependencies:
+    p-try "^2.0.0"
+
 p-locate@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
   dependencies:
     p-limit "^1.1.0"
 
+p-locate@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
+  dependencies:
+    p-limit "^2.0.0"
+
 p-try@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
 
+p-try@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.0.0.tgz#85080bb87c64688fa47996fe8f7dfbe8211760b1"
+
 package-hash@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/package-hash/-/package-hash-1.2.0.tgz#003e56cd57b736a6ed6114cc2b81542672770e44"
@@ -6800,12 +6882,24 @@ pkg-dir@^2.0.0:
   dependencies:
     find-up "^2.1.0"
 
+pkg-dir@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3"
+  dependencies:
+    find-up "^3.0.0"
+
 pkg-up@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz#c819ac728059a461cab1c3889a2be3c49a004d7f"
   dependencies:
     find-up "^2.1.0"
 
+please-upgrade-node@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.1.1.tgz#ed320051dfcc5024fae696712c8288993595e8ac"
+  dependencies:
+    semver-compare "^1.0.0"
+
 plist@^2.0.0, plist@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/plist/-/plist-2.1.0.tgz#57ccdb7a0821df21831217a3cad54e3e146a1025"
@@ -7455,6 +7549,14 @@ read-pkg@^2.0.0:
     normalize-package-data "^2.3.2"
     path-type "^2.0.0"
 
+read-pkg@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-4.0.1.tgz#963625378f3e1c4d48c85872b5a6ec7d5d093237"
+  dependencies:
+    normalize-package-data "^2.3.2"
+    parse-json "^4.0.0"
+    pify "^3.0.0"
+
 readable-stream@^1.1.8, readable-stream@~1.1.9:
   version "1.1.14"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
@@ -7805,6 +7907,10 @@ run-async@^0.1.0:
   dependencies:
     once "^1.3.0"
 
+run-node@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/run-node/-/run-node-1.0.0.tgz#46b50b946a2aa2d4947ae1d886e9856fd9cabe5e"
+
 run-parallel@^1.1.2:
   version "1.1.9"
   resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.9.tgz#c9dd3a7cf9f4b2c4b6244e173a6ed866e61dd679"
@@ -7904,6 +8010,10 @@ section-iterator@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/section-iterator/-/section-iterator-2.0.0.tgz#bf444d7afeeb94ad43c39ad2fb26151627ccba2a"
 
+semver-compare@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
+
 semver-diff@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-2.1.0.tgz#4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36"
@@ -8057,6 +8167,10 @@ slash@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
 
+slash@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
+
 slice-ansi@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35"

From f308836264e8e438c2e111b8607c975fce3afe2c Mon Sep 17 00:00:00 2001
From: Baptiste Augrain <daiyam@zokugun.org>
Date: Tue, 2 Oct 2018 23:48:07 +0200
Subject: [PATCH 006/159] add new fenced block language: gallery

---
 browser/components/MarkdownPreview.js | 33 ++++++++++++++++++-
 browser/components/markdown.styl      | 46 ++++++++++++++++++++++++++-
 browser/lib/markdown.js               |  6 ++++
 package.json                          |  2 ++
 yarn.lock                             | 38 ++++++++++++++++++++++
 5 files changed, 123 insertions(+), 2 deletions(-)

diff --git a/browser/components/MarkdownPreview.js b/browser/components/MarkdownPreview.js
index eacc4e21..48951204 100755
--- a/browser/components/MarkdownPreview.js
+++ b/browser/components/MarkdownPreview.js
@@ -21,6 +21,8 @@ import yaml from 'js-yaml'
 import context from 'browser/lib/context'
 import i18n from 'browser/lib/i18n'
 import fs from 'fs'
+import { render } from 'react-dom'
+import Carousel from 'react-image-carousel'
 
 const { remote, shell } = require('electron')
 const attachmentManagement = require('../main/lib/dataApi/attachmentManagement')
@@ -39,7 +41,8 @@ const appPath = fileUrl(
 )
 const CSS_FILES = [
   `${appPath}/node_modules/katex/dist/katex.min.css`,
-  `${appPath}/node_modules/codemirror/lib/codemirror.css`
+  `${appPath}/node_modules/codemirror/lib/codemirror.css`,
+  `${appPath}/node_modules/react-image-carousel/lib/css/main.min.css`
 ]
 
 function buildStyle (
@@ -789,6 +792,34 @@ export default class MarkdownPreview extends React.Component {
         mermaidRender(el, htmlTextHelper.decodeEntities(el.innerHTML), theme)
       }
     )
+
+    _.forEach(
+      this.refs.root.contentWindow.document.querySelectorAll('.gallery'),
+      el => {
+        const images = el.innerHTML.split(/\n/g).filter(i => i.length > 0)
+        el.innerHTML = ''
+
+        const height = el.attributes.getNamedItem('data-height')
+        if (height && height.value !== 'undefined') {
+          el.style.height = height.value + 'vh'
+        }
+
+        let autoplay = el.attributes.getNamedItem('data-autoplay')
+        if (autoplay && autoplay.value !== 'undefined') {
+          autoplay = parseInt(autoplay.value, 10) || 0
+        } else {
+          autoplay = 0
+        }
+
+        render(
+          <Carousel
+            images={images}
+            autoplay={autoplay}
+          />,
+          el
+        )
+      }
+    )
   }
 
   focus () {
diff --git a/browser/components/markdown.styl b/browser/components/markdown.styl
index 2e17a75b..6e43273e 100644
--- a/browser/components/markdown.styl
+++ b/browser/components/markdown.styl
@@ -381,6 +381,26 @@ pre.fence
     canvas, svg
       max-width 100% !important
 
+  .gallery
+    width 100%
+    height 50vh
+
+    .carousel
+      .carousel-main img
+        min-width auto
+        max-width 100%
+        min-height auto
+        max-height 100%
+
+      .carousel-footer::-webkit-scrollbar-corner
+        background-color transparent
+
+      .carousel-main, .carousel-footer
+        background-color $ui-noteDetail-backgroundColor
+      .prev, .next
+        color $ui-text-color
+        background-color $ui-tag-backgroundColor
+
 themeDarkBackground = darken(#21252B, 10%)
 themeDarkText = #f9f9f9
 themeDarkBorder = lighten(themeDarkBackground, 20%)
@@ -432,6 +452,14 @@ body[data-theme="dark"]
     background-color themeDarkBorder
     color themeDarkText
 
+  pre.fence
+    .gallery
+      .carousel-main, .carousel-footer
+        background-color $ui-dark-noteDetail-backgroundColor
+      .prev, .next
+        color $ui-dark-text-color
+        background-color $ui-dark-tag-backgroundColor
+
 themeSolarizedDarkTableOdd = $ui-solarized-dark-noteDetail-backgroundColor
 themeSolarizedDarkTableEven = darken($ui-solarized-dark-noteDetail-backgroundColor, 10%)
 themeSolarizedDarkTableHead = themeSolarizedDarkTableEven
@@ -459,6 +487,14 @@ body[data-theme="solarized-dark"]
         &:last-child
           border-right solid 1px themeSolarizedDarkTableBorder
 
+  pre.fence
+    .gallery
+      .carousel-main, .carousel-footer
+        background-color $ui-solarized-dark-noteDetail-backgroundColor
+      .prev, .next
+        color $ui-solarized-dark-text-color
+        background-color $ui-solarized-dark-tag-backgroundColor
+
 themeMonokaiTableOdd = $ui-monokai-noteDetail-backgroundColor
 themeMonokaiTableEven = darken($ui-monokai-noteDetail-backgroundColor, 10%)
 themeMonokaiTableHead = themeMonokaiTableEven
@@ -486,4 +522,12 @@ body[data-theme="monokai"]
         &:last-child
           border-right solid 1px themeMonokaiTableBorder
   kbd
-    background-color themeDarkBackground
\ No newline at end of file
+    background-color themeDarkBackground
+
+  pre.fence
+    .gallery
+      .carousel-main, .carousel-footer
+        background-color $ui-monokai-noteDetail-backgroundColor
+      .prev, .next
+        color $ui-monokai-text-color
+        background-color $ui-monokai-tag-backgroundColor
diff --git a/browser/lib/markdown.js b/browser/lib/markdown.js
index f8ae7f05..52a13700 100644
--- a/browser/lib/markdown.js
+++ b/browser/lib/markdown.js
@@ -143,6 +143,12 @@ class Markdown {
           <div class="flowchart" data-height="${token.parameters.height}">${token.content}</div>
         </pre>`
       },
+      gallery: token => {
+        return `<pre class="fence" data-line="${token.map[0]}">
+          <span class="filename">${token.fileName}</span>
+          <div class="gallery" data-autoplay="${token.parameters.autoplay}" data-height="${token.parameters.height}">${token.content}</div>
+        </pre>`
+      },
       mermaid: token => {
         return `<pre class="fence" data-line="${token.map[0]}">
           <span class="filename">${token.fileName}</span>
diff --git a/package.json b/package.json
index 3e95603b..560a2e7d 100644
--- a/package.json
+++ b/package.json
@@ -95,8 +95,10 @@
     "react-codemirror": "^0.3.0",
     "react-debounce-render": "^4.0.1",
     "react-dom": "^15.0.2",
+    "react-image-carousel": "^2.0.18",
     "react-redux": "^4.4.5",
     "react-sortable-hoc": "^0.6.7",
+    "react-transition-group": "^2.5.0",
     "redux": "^3.5.2",
     "sander": "^0.5.1",
     "sanitize-html": "^1.18.2",
diff --git a/yarn.lock b/yarn.lock
index 5c426c92..55f4102a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2701,6 +2701,10 @@ doctrine@^2.0.0, doctrine@^2.0.2:
   dependencies:
     esutils "^2.0.2"
 
+dom-helpers@^3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-3.3.1.tgz#fc1a4e15ffdf60ddde03a480a9c0fece821dd4a6"
+
 dom-serializer@0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.0.tgz#073c697546ce0780ce23be4a28e293e40bc30c82"
@@ -5279,6 +5283,10 @@ js-tokens@^3.0.0, js-tokens@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
 
+"js-tokens@^3.0.0 || ^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
+
 js-yaml@^3.10.0, js-yaml@^3.5.1, js-yaml@^3.7.0:
   version "3.11.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.11.0.tgz#597c1a8bd57152f26d622ce4117851a51f5ebaef"
@@ -5729,6 +5737,12 @@ loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3
   dependencies:
     js-tokens "^3.0.0"
 
+loose-envify@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
+  dependencies:
+    js-tokens "^3.0.0 || ^4.0.0"
+
 loud-rejection@^1.0.0, loud-rejection@^1.2.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
@@ -7155,6 +7169,13 @@ prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.7, prop-types@^15.5.8,
     loose-envify "^1.3.1"
     object-assign "^4.1.1"
 
+prop-types@^15.6.2:
+  version "15.6.2"
+  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.2.tgz#05d5ca77b4453e985d60fc7ff8c859094a497102"
+  dependencies:
+    loose-envify "^1.3.1"
+    object-assign "^4.1.1"
+
 proxy-addr@~2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.3.tgz#355f262505a621646b3130a728eb647e22055341"
@@ -7330,6 +7351,10 @@ react-dom@^15.0.2:
     object-assign "^4.1.0"
     prop-types "^15.5.10"
 
+react-image-carousel@^2.0.18:
+  version "2.0.18"
+  resolved "https://registry.yarnpkg.com/react-image-carousel/-/react-image-carousel-2.0.18.tgz#5868ea09bd9cca09c4467d3d02695cd4e7792f28"
+
 react-input-autosize@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/react-input-autosize/-/react-input-autosize-1.2.0.tgz#87241071159f742123897691da6796ec33b57d05"
@@ -7337,6 +7362,10 @@ react-input-autosize@^1.1.0:
     create-react-class "^15.5.2"
     prop-types "^15.5.8"
 
+react-lifecycles-compat@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"
+
 react-proxy@^1.1.7:
   version "1.1.8"
   resolved "https://registry.yarnpkg.com/react-proxy/-/react-proxy-1.1.8.tgz#9dbfd9d927528c3aa9f444e4558c37830ab8c26a"
@@ -7402,6 +7431,15 @@ react-transform-hmr@^1.0.3:
     global "^4.3.0"
     react-proxy "^1.1.7"
 
+react-transition-group@^2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-2.5.0.tgz#70bca0e3546102c4dc5cf3f5f57f73447cce6874"
+  dependencies:
+    dom-helpers "^3.3.1"
+    loose-envify "^1.4.0"
+    prop-types "^15.6.2"
+    react-lifecycles-compat "^3.0.4"
+
 react@^15.5.4:
   version "15.6.2"
   resolved "https://registry.yarnpkg.com/react/-/react-15.6.2.tgz#dba0434ab439cfe82f108f0f511663908179aa72"

From 39eaed260a834e51283cbcc42c002f1152955a36 Mon Sep 17 00:00:00 2001
From: Baptiste Augrain <daiyam@zokugun.org>
Date: Mon, 8 Oct 2018 15:57:42 +0200
Subject: [PATCH 007/159] display correctly attached image

---
 browser/main/lib/dataApi/attachmentManagement.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser/main/lib/dataApi/attachmentManagement.js b/browser/main/lib/dataApi/attachmentManagement.js
index 912450c1..38648941 100644
--- a/browser/main/lib/dataApi/attachmentManagement.js
+++ b/browser/main/lib/dataApi/attachmentManagement.js
@@ -227,7 +227,7 @@ 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) {
+  return renderedHTML.replace(new RegExp('/?' + STORAGE_FOLDER_PLACEHOLDER + '[\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))
   })

From 7a5a821f8a8b8919d9c5ae0b0dca377485ec25f2 Mon Sep 17 00:00:00 2001
From: Baptiste Augrain <daiyam@zokugun.org>
Date: Tue, 9 Oct 2018 00:47:37 +0200
Subject: [PATCH 008/159] fix failing test

---
 browser/main/lib/dataApi/attachmentManagement.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser/main/lib/dataApi/attachmentManagement.js b/browser/main/lib/dataApi/attachmentManagement.js
index 38648941..a81d3bd4 100644
--- a/browser/main/lib/dataApi/attachmentManagement.js
+++ b/browser/main/lib/dataApi/attachmentManagement.js
@@ -227,7 +227,7 @@ 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 + '[\w\/]+', 'g'), function (match) {
+  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))
   })

From 5d9b1abe82a68c51b99564f6f117191c246f98b3 Mon Sep 17 00:00:00 2001
From: Baptiste Augrain <daiyam@zokugun.org>
Date: Tue, 9 Oct 2018 01:18:19 +0200
Subject: [PATCH 009/159] allow markdown image syntax

---
 browser/lib/markdown.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/browser/lib/markdown.js b/browser/lib/markdown.js
index 52a13700..cc5e86dc 100644
--- a/browser/lib/markdown.js
+++ b/browser/lib/markdown.js
@@ -144,9 +144,18 @@ class Markdown {
         </pre>`
       },
       gallery: token => {
+        const content = token.content.split('\n').slice(0, -1).map(line => {
+          const match = /!\[[^\]]*]\(([^\)]*)\)/.exec(line)
+          if (match) {
+            return match[1]
+          } else {
+            return line
+          }
+        }).join('\n')
+
         return `<pre class="fence" data-line="${token.map[0]}">
           <span class="filename">${token.fileName}</span>
-          <div class="gallery" data-autoplay="${token.parameters.autoplay}" data-height="${token.parameters.height}">${token.content}</div>
+          <div class="gallery" data-autoplay="${token.parameters.autoplay}" data-height="${token.parameters.height}">${content}</div>
         </pre>`
       },
       mermaid: token => {

From db97ab51acf97786048061929371d5f6141cd930 Mon Sep 17 00:00:00 2001
From: Guilherme Silva <guilhermejosesilva@gmail.com>
Date: Thu, 8 Nov 2018 11:44:03 +0000
Subject: [PATCH 010/159] Bracket matching option added to config

---
 browser/components/CodeEditor.js              | 373 ++++++++++++------
 browser/components/MarkdownEditor.js          |   1 +
 browser/components/MarkdownSplitEditor.js     |   1 +
 browser/main/Detail/SnippetNoteDetail.js      |   1 +
 browser/main/lib/ConfigManager.js             |   1 +
 .../modals/PreferencesModal/SnippetEditor.js  |  11 +-
 .../modals/PreferencesModal/SnippetTab.js     |   1 +
 browser/main/modals/PreferencesModal/UiTab.js |  17 +-
 8 files changed, 284 insertions(+), 122 deletions(-)

diff --git a/browser/components/CodeEditor.js b/browser/components/CodeEditor.js
index 41d71622..f4ce77b9 100644
--- a/browser/components/CodeEditor.js
+++ b/browser/components/CodeEditor.js
@@ -5,25 +5,35 @@ import CodeMirror from 'codemirror'
 import 'codemirror-mode-elixir'
 import attachmentManagement from 'browser/main/lib/dataApi/attachmentManagement'
 import convertModeName from 'browser/lib/convertModeName'
-import { options, TableEditor, Alignment } from '@susisu/mte-kernel'
+import {
+  options,
+  TableEditor,
+  Alignment
+} from '@susisu/mte-kernel'
 import TextEditorInterface from 'browser/lib/TextEditorInterface'
 import eventEmitter from 'browser/main/lib/eventEmitter'
 import iconv from 'iconv-lite'
 import crypto from 'crypto'
 import consts from 'browser/lib/consts'
 import fs from 'fs'
-const { ipcRenderer } = require('electron')
+const {
+  ipcRenderer
+} = require('electron')
 import normalizeEditorFontFamily from 'browser/lib/normalizeEditorFontFamily'
 import TurndownService from 'turndown'
-import { gfm } from 'turndown-plugin-gfm'
+import {
+  gfm
+} from 'turndown-plugin-gfm'
 
 CodeMirror.modeURL = '../node_modules/codemirror/mode/%N/%N.js'
 
 const buildCMRulers = (rulers, enableRulers) =>
-  (enableRulers ? rulers.map(ruler => ({ column: ruler })) : [])
+  (enableRulers ? rulers.map(ruler => ({
+    column: ruler
+  })) : [])
 
 export default class CodeEditor extends React.Component {
-  constructor (props) {
+  constructor(props) {
     super(props)
 
     this.scrollHandler = _.debounce(this.handleScroll.bind(this), 100, {
@@ -46,7 +56,10 @@ export default class CodeEditor extends React.Component {
       }
       this.props.onBlur != null && this.props.onBlur(e)
 
-      const { storageKey, noteKey } = this.props
+      const {
+        storageKey,
+        noteKey
+      } = this.props
       attachmentManagement.deleteAttachmentsNotPresentInNote(
         this.editor.getValue(),
         storageKey,
@@ -65,7 +78,7 @@ export default class CodeEditor extends React.Component {
     this.editorActivityHandler = () => this.handleEditorActivity()
   }
 
-  handleSearch (msg) {
+  handleSearch(msg) {
     const cm = this.editor
     const component = this
 
@@ -76,7 +89,7 @@ export default class CodeEditor extends React.Component {
       component.searchState = makeOverlay(msg, 'searching')
       cm.addOverlay(component.searchState)
 
-      function makeOverlay (query, style) {
+      function makeOverlay(query, style) {
         query = new RegExp(
           query.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, '\\$&'),
           'gi'
@@ -99,17 +112,19 @@ export default class CodeEditor extends React.Component {
     })
   }
 
-  handleFormatTable () {
-    this.tableEditor.formatAll(options({textWidthOptions: {}}))
+  handleFormatTable() {
+    this.tableEditor.formatAll(options({
+      textWidthOptions: {}
+    }))
   }
 
-  handleEditorActivity () {
+  handleEditorActivity() {
     if (!this.textEditorInterface.transaction) {
       this.updateTableEditorState()
     }
   }
 
-  updateTableEditorState () {
+  updateTableEditorState() {
     const active = this.tableEditor.cursorIsInTable(this.tableEditorOptions)
     if (active) {
       if (this.extraKeysMode !== 'editor') {
@@ -125,19 +140,20 @@ export default class CodeEditor extends React.Component {
     }
   }
 
-  componentDidMount () {
-    const { rulers, enableRulers } = this.props
+  componentDidMount() {
+    const {
+      rulers,
+      enableRulers
+    } = this.props
     const expandSnippet = this.expandSnippet.bind(this)
     eventEmitter.on('line:jump', this.scrollToLineHandeler)
 
-    const defaultSnippet = [
-      {
-        id: crypto.randomBytes(16).toString('hex'),
-        name: 'Dummy text',
-        prefix: ['lorem', 'ipsum'],
-        content: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.'
-      }
-    ]
+    const defaultSnippet = [{
+      id: crypto.randomBytes(16).toString('hex'),
+      name: 'Dummy text',
+      prefix: ['lorem', 'ipsum'],
+      content: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.'
+    }]
     if (!fs.existsSync(consts.SNIPPET_FILE)) {
       fs.writeFileSync(
         consts.SNIPPET_FILE,
@@ -215,12 +231,17 @@ export default class CodeEditor extends React.Component {
       dragDrop: false,
       foldGutter: true,
       gutters: ['CodeMirror-linenumbers', 'CodeMirror-foldgutter'],
-      autoCloseBrackets: {
-        pairs: '()[]{}\'\'""$$**``',
+      autoCloseBrackets: (this.props.enableBracketMatching ? {
+        pairs: '()[]{}\'\'""$$**``ll',
         triples: '```"""\'\'\'',
         explode: '[]{}``$$',
         override: true
-      },
+      } : {
+        pairs: '',
+        triples: '',
+        explode: '',
+        override: true
+      }),
       extraKeys: this.defaultKeyMap
     })
 
@@ -253,43 +274,117 @@ export default class CodeEditor extends React.Component {
     })
 
     this.editorKeyMap = CodeMirror.normalizeKeyMap({
-      'Tab': () => { this.tableEditor.nextCell(this.tableEditorOptions) },
-      'Shift-Tab': () => { this.tableEditor.previousCell(this.tableEditorOptions) },
-      'Enter': () => { this.tableEditor.nextRow(this.tableEditorOptions) },
-      'Ctrl-Enter': () => { this.tableEditor.escape(this.tableEditorOptions) },
-      'Cmd-Enter': () => { this.tableEditor.escape(this.tableEditorOptions) },
-      'Shift-Ctrl-Left': () => { this.tableEditor.alignColumn(Alignment.LEFT, this.tableEditorOptions) },
-      'Shift-Cmd-Left': () => { this.tableEditor.alignColumn(Alignment.LEFT, this.tableEditorOptions) },
-      'Shift-Ctrl-Right': () => { this.tableEditor.alignColumn(Alignment.RIGHT, this.tableEditorOptions) },
-      'Shift-Cmd-Right': () => { this.tableEditor.alignColumn(Alignment.RIGHT, this.tableEditorOptions) },
-      'Shift-Ctrl-Up': () => { this.tableEditor.alignColumn(Alignment.CENTER, this.tableEditorOptions) },
-      'Shift-Cmd-Up': () => { this.tableEditor.alignColumn(Alignment.CENTER, this.tableEditorOptions) },
-      'Shift-Ctrl-Down': () => { this.tableEditor.alignColumn(Alignment.NONE, this.tableEditorOptions) },
-      'Shift-Cmd-Down': () => { this.tableEditor.alignColumn(Alignment.NONE, this.tableEditorOptions) },
-      'Ctrl-Left': () => { this.tableEditor.moveFocus(0, -1, this.tableEditorOptions) },
-      'Cmd-Left': () => { this.tableEditor.moveFocus(0, -1, this.tableEditorOptions) },
-      'Ctrl-Right': () => { this.tableEditor.moveFocus(0, 1, this.tableEditorOptions) },
-      'Cmd-Right': () => { this.tableEditor.moveFocus(0, 1, this.tableEditorOptions) },
-      'Ctrl-Up': () => { this.tableEditor.moveFocus(-1, 0, this.tableEditorOptions) },
-      'Cmd-Up': () => { this.tableEditor.moveFocus(-1, 0, this.tableEditorOptions) },
-      'Ctrl-Down': () => { this.tableEditor.moveFocus(1, 0, this.tableEditorOptions) },
-      'Cmd-Down': () => { this.tableEditor.moveFocus(1, 0, this.tableEditorOptions) },
-      'Ctrl-K Ctrl-I': () => { this.tableEditor.insertRow(this.tableEditorOptions) },
-      'Cmd-K Cmd-I': () => { this.tableEditor.insertRow(this.tableEditorOptions) },
-      'Ctrl-L Ctrl-I': () => { this.tableEditor.deleteRow(this.tableEditorOptions) },
-      'Cmd-L Cmd-I': () => { this.tableEditor.deleteRow(this.tableEditorOptions) },
-      'Ctrl-K Ctrl-J': () => { this.tableEditor.insertColumn(this.tableEditorOptions) },
-      'Cmd-K Cmd-J': () => { this.tableEditor.insertColumn(this.tableEditorOptions) },
-      'Ctrl-L Ctrl-J': () => { this.tableEditor.deleteColumn(this.tableEditorOptions) },
-      'Cmd-L Cmd-J': () => { this.tableEditor.deleteColumn(this.tableEditorOptions) },
-      'Alt-Shift-Ctrl-Left': () => { this.tableEditor.moveColumn(-1, this.tableEditorOptions) },
-      'Alt-Shift-Cmd-Left': () => { this.tableEditor.moveColumn(-1, this.tableEditorOptions) },
-      'Alt-Shift-Ctrl-Right': () => { this.tableEditor.moveColumn(1, this.tableEditorOptions) },
-      'Alt-Shift-Cmd-Right': () => { this.tableEditor.moveColumn(1, this.tableEditorOptions) },
-      'Alt-Shift-Ctrl-Up': () => { this.tableEditor.moveRow(-1, this.tableEditorOptions) },
-      'Alt-Shift-Cmd-Up': () => { this.tableEditor.moveRow(-1, this.tableEditorOptions) },
-      'Alt-Shift-Ctrl-Down': () => { this.tableEditor.moveRow(1, this.tableEditorOptions) },
-      'Alt-Shift-Cmd-Down': () => { this.tableEditor.moveRow(1, this.tableEditorOptions) }
+      'Tab': () => {
+        this.tableEditor.nextCell(this.tableEditorOptions)
+      },
+      'Shift-Tab': () => {
+        this.tableEditor.previousCell(this.tableEditorOptions)
+      },
+      'Enter': () => {
+        this.tableEditor.nextRow(this.tableEditorOptions)
+      },
+      'Ctrl-Enter': () => {
+        this.tableEditor.escape(this.tableEditorOptions)
+      },
+      'Cmd-Enter': () => {
+        this.tableEditor.escape(this.tableEditorOptions)
+      },
+      'Shift-Ctrl-Left': () => {
+        this.tableEditor.alignColumn(Alignment.LEFT, this.tableEditorOptions)
+      },
+      'Shift-Cmd-Left': () => {
+        this.tableEditor.alignColumn(Alignment.LEFT, this.tableEditorOptions)
+      },
+      'Shift-Ctrl-Right': () => {
+        this.tableEditor.alignColumn(Alignment.RIGHT, this.tableEditorOptions)
+      },
+      'Shift-Cmd-Right': () => {
+        this.tableEditor.alignColumn(Alignment.RIGHT, this.tableEditorOptions)
+      },
+      'Shift-Ctrl-Up': () => {
+        this.tableEditor.alignColumn(Alignment.CENTER, this.tableEditorOptions)
+      },
+      'Shift-Cmd-Up': () => {
+        this.tableEditor.alignColumn(Alignment.CENTER, this.tableEditorOptions)
+      },
+      'Shift-Ctrl-Down': () => {
+        this.tableEditor.alignColumn(Alignment.NONE, this.tableEditorOptions)
+      },
+      'Shift-Cmd-Down': () => {
+        this.tableEditor.alignColumn(Alignment.NONE, this.tableEditorOptions)
+      },
+      'Ctrl-Left': () => {
+        this.tableEditor.moveFocus(0, -1, this.tableEditorOptions)
+      },
+      'Cmd-Left': () => {
+        this.tableEditor.moveFocus(0, -1, this.tableEditorOptions)
+      },
+      'Ctrl-Right': () => {
+        this.tableEditor.moveFocus(0, 1, this.tableEditorOptions)
+      },
+      'Cmd-Right': () => {
+        this.tableEditor.moveFocus(0, 1, this.tableEditorOptions)
+      },
+      'Ctrl-Up': () => {
+        this.tableEditor.moveFocus(-1, 0, this.tableEditorOptions)
+      },
+      'Cmd-Up': () => {
+        this.tableEditor.moveFocus(-1, 0, this.tableEditorOptions)
+      },
+      'Ctrl-Down': () => {
+        this.tableEditor.moveFocus(1, 0, this.tableEditorOptions)
+      },
+      'Cmd-Down': () => {
+        this.tableEditor.moveFocus(1, 0, this.tableEditorOptions)
+      },
+      'Ctrl-K Ctrl-I': () => {
+        this.tableEditor.insertRow(this.tableEditorOptions)
+      },
+      'Cmd-K Cmd-I': () => {
+        this.tableEditor.insertRow(this.tableEditorOptions)
+      },
+      'Ctrl-L Ctrl-I': () => {
+        this.tableEditor.deleteRow(this.tableEditorOptions)
+      },
+      'Cmd-L Cmd-I': () => {
+        this.tableEditor.deleteRow(this.tableEditorOptions)
+      },
+      'Ctrl-K Ctrl-J': () => {
+        this.tableEditor.insertColumn(this.tableEditorOptions)
+      },
+      'Cmd-K Cmd-J': () => {
+        this.tableEditor.insertColumn(this.tableEditorOptions)
+      },
+      'Ctrl-L Ctrl-J': () => {
+        this.tableEditor.deleteColumn(this.tableEditorOptions)
+      },
+      'Cmd-L Cmd-J': () => {
+        this.tableEditor.deleteColumn(this.tableEditorOptions)
+      },
+      'Alt-Shift-Ctrl-Left': () => {
+        this.tableEditor.moveColumn(-1, this.tableEditorOptions)
+      },
+      'Alt-Shift-Cmd-Left': () => {
+        this.tableEditor.moveColumn(-1, this.tableEditorOptions)
+      },
+      'Alt-Shift-Ctrl-Right': () => {
+        this.tableEditor.moveColumn(1, this.tableEditorOptions)
+      },
+      'Alt-Shift-Cmd-Right': () => {
+        this.tableEditor.moveColumn(1, this.tableEditorOptions)
+      },
+      'Alt-Shift-Ctrl-Up': () => {
+        this.tableEditor.moveRow(-1, this.tableEditorOptions)
+      },
+      'Alt-Shift-Cmd-Up': () => {
+        this.tableEditor.moveRow(-1, this.tableEditorOptions)
+      },
+      'Alt-Shift-Ctrl-Down': () => {
+        this.tableEditor.moveRow(1, this.tableEditorOptions)
+      },
+      'Alt-Shift-Cmd-Down': () => {
+        this.tableEditor.moveRow(1, this.tableEditorOptions)
+      }
     })
 
     if (this.props.enableTableEditor) {
@@ -302,7 +397,7 @@ export default class CodeEditor extends React.Component {
     })
   }
 
-  expandSnippet (line, cursor, cm, snippets) {
+  expandSnippet(line, cursor, cm, snippets) {
     const wordBeforeCursor = this.getWordBeforeCursor(
       line,
       cursor.line,
@@ -345,7 +440,7 @@ export default class CodeEditor extends React.Component {
     return false
   }
 
-  getWordBeforeCursor (line, lineNumber, cursorPosition) {
+  getWordBeforeCursor(line, lineNumber, cursorPosition) {
     let wordBeforeCursor = ''
     const originCursorPosition = cursorPosition
     const emptyChars = /\t|\s|\r|\n/
@@ -370,17 +465,23 @@ export default class CodeEditor extends React.Component {
     return {
       text: wordBeforeCursor,
       range: {
-        from: { line: lineNumber, ch: originCursorPosition },
-        to: { line: lineNumber, ch: cursorPosition }
+        from: {
+          line: lineNumber,
+          ch: originCursorPosition
+        },
+        to: {
+          line: lineNumber,
+          ch: cursorPosition
+        }
       }
     }
   }
 
-  quitEditor () {
+  quitEditor() {
     document.querySelector('textarea').blur()
   }
 
-  componentWillUnmount () {
+  componentWillUnmount() {
     this.editor.off('focus', this.focusHandler)
     this.editor.off('blur', this.blurHandler)
     this.editor.off('change', this.changeHandler)
@@ -393,9 +494,12 @@ export default class CodeEditor extends React.Component {
     eventEmitter.off('code:format-table', this.formatTable)
   }
 
-  componentDidUpdate (prevProps, prevState) {
+  componentDidUpdate(prevProps, prevState) {
     let needRefresh = false
-    const { rulers, enableRulers } = this.props
+    const {
+      rulers,
+      enableRulers
+    } = this.props
     if (prevProps.mode !== this.props.mode) {
       this.setMode(this.props.mode)
     }
@@ -436,6 +540,21 @@ export default class CodeEditor extends React.Component {
       this.editor.setOption('scrollPastEnd', this.props.scrollPastEnd)
     }
 
+    if (prevProps.enableBracketMatching !== this.props.enableBracketMatching) {
+      const bracketObject = (this.props.enableBracketMatching ? {
+        pairs: '()[]{}\'\'""$$**``ll',
+        triples: '```"""\'\'\'',
+        explode: '[]{}``$$',
+        override: true
+      } : {
+        pairs: '',
+        triples: '',
+        explode: '',
+        override: true
+      });
+      this.editor.setOption('autoCloseBrackets', bracketObject)
+    }
+
     if (prevProps.enableTableEditor !== this.props.enableTableEditor) {
       if (this.props.enableTableEditor) {
         this.editor.on('cursorActivity', this.editorActivityHandler)
@@ -462,7 +581,7 @@ export default class CodeEditor extends React.Component {
     }
   }
 
-  setMode (mode) {
+  setMode(mode) {
     let syntax = CodeMirror.findModeByName(convertModeName(mode))
     if (syntax == null) syntax = CodeMirror.findModeByName('Plain Text')
 
@@ -470,16 +589,16 @@ export default class CodeEditor extends React.Component {
     CodeMirror.autoLoadMode(this.editor, syntax.mode)
   }
 
-  handleChange (e) {
+  handleChange(e) {
     this.value = this.editor.getValue()
     if (this.props.onChange) {
       this.props.onChange(e)
     }
   }
 
-  moveCursorTo (row, col) {}
+  moveCursorTo(row, col) {}
 
-  scrollToLine (event, num) {
+  scrollToLine(event, num) {
     const cursor = {
       line: num,
       ch: 1
@@ -487,15 +606,15 @@ export default class CodeEditor extends React.Component {
     this.editor.setCursor(cursor)
   }
 
-  focus () {
+  focus() {
     this.editor.focus()
   }
 
-  blur () {
+  blur() {
     this.editor.blur()
   }
 
-  reload () {
+  reload() {
     // Change event shouldn't be fired when switch note
     this.editor.off('change', this.changeHandler)
     this.value = this.props.value
@@ -505,15 +624,18 @@ export default class CodeEditor extends React.Component {
     this.editor.refresh()
   }
 
-  setValue (value) {
+  setValue(value) {
     const cursor = this.editor.getCursor()
     this.editor.setValue(value)
     this.editor.setCursor(cursor)
   }
 
-  handleDropImage (dropEvent) {
+  handleDropImage(dropEvent) {
     dropEvent.preventDefault()
-    const { storageKey, noteKey } = this.props
+    const {
+      storageKey,
+      noteKey
+    } = this.props
     attachmentManagement.handleAttachmentDrop(
       this,
       storageKey,
@@ -522,13 +644,16 @@ export default class CodeEditor extends React.Component {
     )
   }
 
-  insertAttachmentMd (imageMd) {
+  insertAttachmentMd(imageMd) {
     this.editor.replaceSelection(imageMd)
   }
 
-  handlePaste (editor, e) {
+  handlePaste(editor, e) {
     const clipboardData = e.clipboardData
-    const { storageKey, noteKey } = this.props
+    const {
+      storageKey,
+      noteKey
+    } = this.props
     const dataTransferItem = clipboardData.items[0]
     const pastedTxt = clipboardData.getData('text')
     const isURL = str => {
@@ -537,15 +662,21 @@ export default class CodeEditor extends React.Component {
     }
     const isInLinkTag = editor => {
       const startCursor = editor.getCursor('start')
-      const prevChar = editor.getRange(
-        { line: startCursor.line, ch: startCursor.ch - 2 },
-        { line: startCursor.line, ch: startCursor.ch }
-      )
+      const prevChar = editor.getRange({
+        line: startCursor.line,
+        ch: startCursor.ch - 2
+      }, {
+        line: startCursor.line,
+        ch: startCursor.ch
+      })
       const endCursor = editor.getCursor('end')
-      const nextChar = editor.getRange(
-        { line: endCursor.line, ch: endCursor.ch },
-        { line: endCursor.line, ch: endCursor.ch + 1 }
-      )
+      const nextChar = editor.getRange({
+        line: endCursor.line,
+        ch: endCursor.ch
+      }, {
+        line: endCursor.line,
+        ch: endCursor.ch + 1
+      })
       return prevChar === '](' && nextChar === ')'
     }
 
@@ -576,13 +707,13 @@ export default class CodeEditor extends React.Component {
     }
   }
 
-  handleScroll (e) {
+  handleScroll(e) {
     if (this.props.onScroll) {
       this.props.onScroll(e)
     }
   }
 
-  handlePasteUrl (e, editor, pastedTxt) {
+  handlePasteUrl(e, editor, pastedTxt) {
     e.preventDefault()
     const taggedUrl = `<${pastedTxt}>`
     editor.replaceSelection(taggedUrl)
@@ -605,8 +736,8 @@ export default class CodeEditor extends React.Component {
     }
 
     fetch(pastedTxt, {
-      method: 'get'
-    })
+        method: 'get'
+      })
       .then(response => {
         if (isImageReponse(response)) {
           return this.mapImageResponse(response, pastedTxt)
@@ -622,13 +753,13 @@ export default class CodeEditor extends React.Component {
       })
   }
 
-  handlePasteHtml (e, editor, pastedHtml) {
+  handlePasteHtml(e, editor, pastedHtml) {
     e.preventDefault()
     const markdown = this.turndownService.turndown(pastedHtml)
     editor.replaceSelection(markdown)
   }
 
-  mapNormalResponse (response, pastedTxt) {
+  mapNormalResponse(response, pastedTxt) {
     return this.decodeResponse(response).then(body => {
       return new Promise((resolve, reject) => {
         try {
@@ -648,7 +779,7 @@ export default class CodeEditor extends React.Component {
     })
   }
 
-  mapImageResponse (response, pastedTxt) {
+  mapImageResponse(response, pastedTxt) {
     return new Promise((resolve, reject) => {
       try {
         const url = response.url
@@ -661,18 +792,18 @@ export default class CodeEditor extends React.Component {
     })
   }
 
-  decodeResponse (response) {
+  decodeResponse(response) {
     const headers = response.headers
-    const _charset = headers.has('content-type')
-      ? this.extractContentTypeCharset(headers.get('content-type'))
-      : undefined
+    const _charset = headers.has('content-type') ?
+      this.extractContentTypeCharset(headers.get('content-type')) :
+      undefined
     return response.arrayBuffer().then(buff => {
       return new Promise((resolve, reject) => {
         try {
           const charset = _charset !== undefined &&
-            iconv.encodingExists(_charset)
-            ? _charset
-            : 'utf-8'
+            iconv.encodingExists(_charset) ?
+            _charset :
+            'utf-8'
           resolve(iconv.decode(new Buffer(buff), charset).toString())
         } catch (e) {
           reject(e)
@@ -681,7 +812,7 @@ export default class CodeEditor extends React.Component {
     })
   }
 
-  extractContentTypeCharset (contentType) {
+  extractContentTypeCharset(contentType) {
     return contentType
       .split(';')
       .filter(str => {
@@ -692,21 +823,29 @@ export default class CodeEditor extends React.Component {
       })[0]
   }
 
-  render () {
-    const {className, fontSize} = this.props
+  render() {
+    const {
+      className,
+      fontSize
+    } = this.props
     const fontFamily = normalizeEditorFontFamily(this.props.fontFamily)
     const width = this.props.width
-    return (
-      <div
-        className={className == null ? 'CodeEditor' : `CodeEditor ${className}`}
-        ref='root'
-        tabIndex='-1'
-        style={{
+    return ( <
+      div className = {
+        className == null ? 'CodeEditor' : `CodeEditor ${className}`
+      }
+      ref = 'root'
+      tabIndex = '-1'
+      style = {
+        {
           fontFamily,
           fontSize: fontSize,
           width: width
-        }}
-        onDrop={e => this.handleDropImage(e)}
+        }
+      }
+      onDrop = {
+        e => this.handleDropImage(e)
+      }
       />
     )
   }
@@ -731,4 +870,4 @@ CodeEditor.defaultProps = {
   fontFamily: 'Monaco, Consolas',
   indentSize: 4,
   indentType: 'space'
-}
+}
\ No newline at end of file
diff --git a/browser/components/MarkdownEditor.js b/browser/components/MarkdownEditor.js
index 9c8a06d6..f10ea8bc 100644
--- a/browser/components/MarkdownEditor.js
+++ b/browser/components/MarkdownEditor.js
@@ -268,6 +268,7 @@ class MarkdownEditor extends React.Component {
           enableRulers={config.editor.enableRulers}
           rulers={config.editor.rulers}
           displayLineNumbers={config.editor.displayLineNumbers}
+          enableBracketMatching={config.editor.enableBracketMatching}
           scrollPastEnd={config.editor.scrollPastEnd}
           storageKey={storageKey}
           noteKey={noteKey}
diff --git a/browser/components/MarkdownSplitEditor.js b/browser/components/MarkdownSplitEditor.js
index ca2d3108..004a6eb0 100644
--- a/browser/components/MarkdownSplitEditor.js
+++ b/browser/components/MarkdownSplitEditor.js
@@ -158,6 +158,7 @@ class MarkdownSplitEditor extends React.Component {
           fontFamily={config.editor.fontFamily}
           fontSize={editorFontSize}
           displayLineNumbers={config.editor.displayLineNumbers}
+          enableBracketMatching={config.editor.enableBracketMatching}
           indentType={config.editor.indentType}
           indentSize={editorIndentSize}
           enableRulers={config.editor.enableRulers}
diff --git a/browser/main/Detail/SnippetNoteDetail.js b/browser/main/Detail/SnippetNoteDetail.js
index afd81102..90b8faa9 100644
--- a/browser/main/Detail/SnippetNoteDetail.js
+++ b/browser/main/Detail/SnippetNoteDetail.js
@@ -699,6 +699,7 @@ class SnippetNoteDetail extends React.Component {
             indentType={config.editor.indentType}
             indentSize={editorIndentSize}
             displayLineNumbers={config.editor.displayLineNumbers}
+            enableBracketMatching={config.editor.enableBracketMatching}
             keyMap={config.editor.keyMap}
             scrollPastEnd={config.editor.scrollPastEnd}
             fetchUrlTitle={config.editor.fetchUrlTitle}
diff --git a/browser/main/lib/ConfigManager.js b/browser/main/lib/ConfigManager.js
index 9611f21d..eddf0909 100644
--- a/browser/main/lib/ConfigManager.js
+++ b/browser/main/lib/ConfigManager.js
@@ -44,6 +44,7 @@ export const DEFAULT_CONFIG = {
     enableRulers: false,
     rulers: [80, 120],
     displayLineNumbers: true,
+    enableBracketMatching: true,
     switchPreview: 'BLUR', // 'BLUR', 'DBL_CLICK', 'RIGHTCLICK'
     delfaultStatus: 'PREVIEW', // 'PREVIEW', 'CODE'
     scrollPastEnd: false,
diff --git a/browser/main/modals/PreferencesModal/SnippetEditor.js b/browser/main/modals/PreferencesModal/SnippetEditor.js
index 4ce5dc34..ec3698c7 100644
--- a/browser/main/modals/PreferencesModal/SnippetEditor.js
+++ b/browser/main/modals/PreferencesModal/SnippetEditor.js
@@ -27,12 +27,17 @@ class SnippetEditor extends React.Component {
       dragDrop: false,
       foldGutter: true,
       gutters: ['CodeMirror-linenumbers', 'CodeMirror-foldgutter'],
-      autoCloseBrackets: {
-        pairs: '()[]{}\'\'""$$**``',
+      autoCloseBrackets: (this.enableBracketMatching ? {
+        pairs: '()[]{}\'\'""$$**``ll',
         triples: '```"""\'\'\'',
         explode: '[]{}``$$',
         override: true
-      },
+      }:  {
+        pairs: '',
+        triples: '',
+        explode: '',
+        override: true
+      }),
       mode: 'null'
     })
     this.cm.setSize('100%', '100%')
diff --git a/browser/main/modals/PreferencesModal/SnippetTab.js b/browser/main/modals/PreferencesModal/SnippetTab.js
index b83fa205..40b65d39 100644
--- a/browser/main/modals/PreferencesModal/SnippetTab.js
+++ b/browser/main/modals/PreferencesModal/SnippetTab.js
@@ -136,6 +136,7 @@ class SnippetTab extends React.Component {
               enableRulers={config.editor.enableRulers}
               rulers={config.editor.rulers}
               displayLineNumbers={config.editor.displayLineNumbers}
+              enableBracketMatching={config.editor.enableBracketMatching}
               scrollPastEnd={config.editor.scrollPastEnd}
               onRef={ref => { this.snippetEditor = ref }} />
           </div>
diff --git a/browser/main/modals/PreferencesModal/UiTab.js b/browser/main/modals/PreferencesModal/UiTab.js
index 6bc3b0a3..5c6110c3 100644
--- a/browser/main/modals/PreferencesModal/UiTab.js
+++ b/browser/main/modals/PreferencesModal/UiTab.js
@@ -62,7 +62,8 @@ class UiTab extends React.Component {
       checkHighLight.setAttribute('rel', 'stylesheet')
       document.head.appendChild(checkHighLight)
     }
-
+    console.log("This is a console log")
+    
     const newConfig = {
       ui: {
         theme: this.refs.uiTheme.value,
@@ -94,7 +95,8 @@ class UiTab extends React.Component {
         fetchUrlTitle: this.refs.editorFetchUrlTitle.checked,
         enableTableEditor: this.refs.enableTableEditor.checked,
         enableFrontMatterTitle: this.refs.enableFrontMatterTitle.checked,
-        frontMatterTitleField: this.refs.frontMatterTitleField.value
+        frontMatterTitleField: this.refs.frontMatterTitleField.value,
+        enableBracketMatching: this.refs.enableBracketMatching.checked
       },
       preview: {
         fontSize: this.refs.previewFontSize.value,
@@ -539,6 +541,17 @@ class UiTab extends React.Component {
             </label>
           </div>
 
+          <div styleName='group-checkBoxSection'>
+            <label>
+              <input onChange={(e) => this.handleUIChange(e)}
+                checked={this.state.config.editor.enableBracketMatching}
+                ref='enableBracketMatching'
+                type='checkbox'
+              />&nbsp;
+              {i18n.__('Enable bracket matching')}
+            </label>
+          </div>
+
           <div styleName='group-header2'>{i18n.__('Preview')}</div>
           <div styleName='group-section'>
             <div styleName='group-section-label'>

From 59d31c9a182bacda1a0b5db2b4211dff6f875bc1 Mon Sep 17 00:00:00 2001
From: Guilherme Silva <guilhermejosesilva@gmail.com>
Date: Thu, 8 Nov 2018 12:01:12 +0000
Subject: [PATCH 011/159] Deleted useless console log

---
 browser/main/modals/PreferencesModal/UiTab.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/browser/main/modals/PreferencesModal/UiTab.js b/browser/main/modals/PreferencesModal/UiTab.js
index 5c6110c3..ab72c914 100644
--- a/browser/main/modals/PreferencesModal/UiTab.js
+++ b/browser/main/modals/PreferencesModal/UiTab.js
@@ -62,7 +62,6 @@ class UiTab extends React.Component {
       checkHighLight.setAttribute('rel', 'stylesheet')
       document.head.appendChild(checkHighLight)
     }
-    console.log("This is a console log")
     
     const newConfig = {
       ui: {

From ab65fb7a5ca41b1bb3561d15b2d9259d64aea330 Mon Sep 17 00:00:00 2001
From: Guilherme Silva <guilhermejosesilva@gmail.com>
Date: Thu, 8 Nov 2018 13:18:13 +0000
Subject: [PATCH 012/159] Choosing which characters to match and explode

---
 browser/components/CodeEditor.js              | 993 ++++++++----------
 browser/components/MarkdownEditor.js          |   3 +
 browser/components/MarkdownSplitEditor.js     |   3 +
 browser/main/Detail/SnippetNoteDetail.js      |   3 +
 browser/main/lib/ConfigManager.js             |   3 +
 .../modals/PreferencesModal/SnippetTab.js     |   3 +
 browser/main/modals/PreferencesModal/UiTab.js |  48 +-
 7 files changed, 516 insertions(+), 540 deletions(-)

diff --git a/browser/components/CodeEditor.js b/browser/components/CodeEditor.js
index f4ce77b9..3e416ab2 100644
--- a/browser/components/CodeEditor.js
+++ b/browser/components/CodeEditor.js
@@ -1,121 +1,110 @@
+import 'codemirror-mode-elixir'
+
+import {Alignment, options, TableEditor} from '@susisu/mte-kernel'
+import consts from 'browser/lib/consts'
+import convertModeName from 'browser/lib/convertModeName'
+import TextEditorInterface from 'browser/lib/TextEditorInterface'
+import attachmentManagement from 'browser/main/lib/dataApi/attachmentManagement'
+import eventEmitter from 'browser/main/lib/eventEmitter'
+import CodeMirror from 'codemirror'
+import crypto from 'crypto'
+import fs from 'fs'
+import iconv from 'iconv-lite'
+import _ from 'lodash'
 import PropTypes from 'prop-types'
 import React from 'react'
-import _ from 'lodash'
-import CodeMirror from 'codemirror'
-import 'codemirror-mode-elixir'
-import attachmentManagement from 'browser/main/lib/dataApi/attachmentManagement'
-import convertModeName from 'browser/lib/convertModeName'
-import {
-  options,
-  TableEditor,
-  Alignment
-} from '@susisu/mte-kernel'
-import TextEditorInterface from 'browser/lib/TextEditorInterface'
-import eventEmitter from 'browser/main/lib/eventEmitter'
-import iconv from 'iconv-lite'
-import crypto from 'crypto'
-import consts from 'browser/lib/consts'
-import fs from 'fs'
-const {
-  ipcRenderer
-} = require('electron')
+
+const {ipcRenderer} = require('electron')
 import normalizeEditorFontFamily from 'browser/lib/normalizeEditorFontFamily'
 import TurndownService from 'turndown'
-import {
-  gfm
-} from 'turndown-plugin-gfm'
+import{gfm} from 'turndown-plugin-gfm'
 
 CodeMirror.modeURL = '../node_modules/codemirror/mode/%N/%N.js'
 
 const buildCMRulers = (rulers, enableRulers) =>
-  (enableRulers ? rulers.map(ruler => ({
-    column: ruler
-  })) : [])
+    (enableRulers ? rulers.map(ruler => ({column: ruler})) : [])
 
 export default class CodeEditor extends React.Component {
   constructor(props) {
     super(props)
 
-    this.scrollHandler = _.debounce(this.handleScroll.bind(this), 100, {
-      leading: false,
-      trailing: true
-    })
-    this.changeHandler = e => this.handleChange(e)
-    this.focusHandler = () => {
-      ipcRenderer.send('editor:focused', true)
-    }
-    this.blurHandler = (editor, e) => {
-      ipcRenderer.send('editor:focused', false)
-      if (e == null) return null
-      let el = e.relatedTarget
-      while (el != null) {
-        if (el === this.refs.root) {
-          return
-        }
-        el = el.parentNode
-      }
-      this.props.onBlur != null && this.props.onBlur(e)
+        this.scrollHandler =
+        _.debounce(
+             this.handleScroll.bind(this), 100,
+             {leading: false, trailing: true}) this.changeHandler = e =>
+            this.handleChange(e) this.focusHandler =
+                () => {
+                  ipcRenderer.send('editor:focused', true)
+                } this.blurHandler =
+                    (editor, e) => {
+                      ipcRenderer.send('editor:focused', false)
+                      if (e == null) return null
+                      let el = e.relatedTarget
+                      while (el != null) {
+                        if (el === this.refs.root) {
+                          return
+                        }
+                        el = el.parentNode
+                      }
+                      this.props.onBlur != null && this.props.onBlur(e)
 
-      const {
-        storageKey,
-        noteKey
-      } = this.props
-      attachmentManagement.deleteAttachmentsNotPresentInNote(
-        this.editor.getValue(),
-        storageKey,
-        noteKey
-      )
-    }
-    this.pasteHandler = (editor, e) => this.handlePaste(editor, e)
-    this.loadStyleHandler = e => {
-      this.editor.refresh()
-    }
-    this.searchHandler = (e, msg) => this.handleSearch(msg)
-    this.searchState = null
-    this.scrollToLineHandeler = this.scrollToLine.bind(this)
+                      const {storageKey, noteKey} = this.props
+                      attachmentManagement.deleteAttachmentsNotPresentInNote(
+                          this.editor.getValue(), storageKey, noteKey)
+                    } this.pasteHandler = (editor, e) =>
+                        this.handlePaste(editor, e) this.loadStyleHandler =
+                            e => {
+                              this.editor.refresh()
+                            } this.searchHandler = (e, msg) =>
+                                this.handleSearch(msg) this.searchState =
+                                    null this.scrollToLineHandeler =
+                                        this.scrollToLine
+                                            .bind(this)
 
-    this.formatTable = () => this.handleFormatTable()
-    this.editorActivityHandler = () => this.handleEditorActivity()
+                                                this.formatTable = () =>
+                                            this.handleFormatTable() this
+                                                .editorActivityHandler = () =>
+                                                this.handleEditorActivity()
   }
 
   handleSearch(msg) {
     const cm = this.editor
     const component = this
 
-    if (component.searchState) cm.removeOverlay(component.searchState)
+        if (component.searchState)
+    cm.removeOverlay(component.searchState)
     if (msg.length < 3) return
 
-    cm.operation(function () {
-      component.searchState = makeOverlay(msg, 'searching')
-      cm.addOverlay(component.searchState)
+        cm.operation(function() {
+          component.searchState = makeOverlay(msg, 'searching')
+          cm.addOverlay(component.searchState)
 
-      function makeOverlay(query, style) {
-        query = new RegExp(
-          query.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, '\\$&'),
-          'gi'
-        )
-        return {
-          token: function (stream) {
-            query.lastIndex = stream.pos
-            var match = query.exec(stream.string)
-            if (match && match.index === stream.pos) {
-              stream.pos += match[0].length || 1
-              return style
-            } else if (match) {
-              stream.pos = match.index
-            } else {
-              stream.skipToEnd()
+          function makeOverlay(query, style) {
+            query = new RegExp(
+                query.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, '\\$&'),
+                'gi')
+            return {
+              token: function(stream) {
+                query.lastIndex = stream.pos
+                var match = query.exec(stream.string)
+                if (match && match.index === stream.pos) {
+                  stream.pos += match[0].length || 1
+                  return style
+                }
+                else if (match) {
+                  stream.pos = match.index
+                }
+                else {
+                  stream.skipToEnd()
+                }
+              }
             }
           }
-        }
-      }
-    })
+        })
   }
 
   handleFormatTable() {
-    this.tableEditor.formatAll(options({
-      textWidthOptions: {}
-    }))
+    this.tableEditor.formatAll(options({textWidthOptions: {}}))
   }
 
   handleEditorActivity() {
@@ -128,23 +117,23 @@ export default class CodeEditor extends React.Component {
     const active = this.tableEditor.cursorIsInTable(this.tableEditorOptions)
     if (active) {
       if (this.extraKeysMode !== 'editor') {
-        this.extraKeysMode = 'editor'
-        this.editor.setOption('extraKeys', this.editorKeyMap)
+        this.extraKeysMode =
+            'editor' this.editor.setOption('extraKeys', this.editorKeyMap)
       }
-    } else {
+    }
+    else {
       if (this.extraKeysMode !== 'default') {
-        this.extraKeysMode = 'default'
-        this.editor.setOption('extraKeys', this.defaultKeyMap)
-        this.tableEditor.resetSmartCursor()
+        this.extraKeysMode =
+            'default' this.editor
+                .setOption(
+                    'extraKeys',
+                    this.defaultKeyMap) this.tableEditor.resetSmartCursor()
       }
     }
   }
 
   componentDidMount() {
-    const {
-      rulers,
-      enableRulers
-    } = this.props
+    const {rulers, enableRulers} = this.props
     const expandSnippet = this.expandSnippet.bind(this)
     eventEmitter.on('line:jump', this.scrollToLineHandeler)
 
@@ -152,109 +141,99 @@ export default class CodeEditor extends React.Component {
       id: crypto.randomBytes(16).toString('hex'),
       name: 'Dummy text',
       prefix: ['lorem', 'ipsum'],
-      content: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.'
-    }]
-    if (!fs.existsSync(consts.SNIPPET_FILE)) {
+      content:
+          'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.'
+    }] if (!fs.existsSync(consts.SNIPPET_FILE)) {
       fs.writeFileSync(
-        consts.SNIPPET_FILE,
-        JSON.stringify(defaultSnippet, null, 4),
-        'utf8'
-      )
+          consts.SNIPPET_FILE, JSON.stringify(defaultSnippet, null, 4), 'utf8')
     }
 
-    this.defaultKeyMap = CodeMirror.normalizeKeyMap({
-      Tab: function (cm) {
-        const cursor = cm.getCursor()
-        const line = cm.getLine(cursor.line)
-        const cursorPosition = cursor.ch
-        const charBeforeCursor = line.substr(cursorPosition - 1, 1)
-        if (cm.somethingSelected()) cm.indentSelection('add')
-        else {
-          const tabs = cm.getOption('indentWithTabs')
-          if (line.trimLeft().match(/^(-|\*|\+) (\[( |x)] )?$/)) {
-            cm.execCommand('goLineStart')
-            if (tabs) {
-              cm.execCommand('insertTab')
-            } else {
-              cm.execCommand('insertSoftTab')
-            }
-            cm.execCommand('goLineEnd')
-          } else if (
-            !charBeforeCursor.match(/\t|\s|\r|\n/) &&
-            cursor.ch > 1
-          ) {
-            // text expansion on tab key if the char before is alphabet
-            const snippets = JSON.parse(
-              fs.readFileSync(consts.SNIPPET_FILE, 'utf8')
-            )
-            if (expandSnippet(line, cursor, cm, snippets) === false) {
-              if (tabs) {
-                cm.execCommand('insertTab')
-              } else {
-                cm.execCommand('insertSoftTab')
+    this.defaultKeyMap =
+        CodeMirror
+            .normalizeKeyMap({
+              Tab: function(cm) {
+                const cursor = cm.getCursor()
+                const line = cm.getLine(cursor.line)
+                const cursorPosition = cursor.ch
+                const charBeforeCursor = line.substr(cursorPosition - 1, 1)
+                if (cm.somethingSelected()) cm.indentSelection('add') else {
+                  const tabs = cm.getOption('indentWithTabs')
+                  if (line.trimLeft().match(/^(-|\*|\+) (\[( |x)] )?$/)) {
+                    cm.execCommand('goLineStart')
+                    if (tabs) {
+                      cm.execCommand('insertTab')
+                    }
+                    else {cm.execCommand('insertSoftTab')} cm.execCommand(
+                        'goLineEnd')
+                  }
+                  else if (
+                      !charBeforeCursor.match(/\t|\s|\r|\n/) && cursor.ch > 1) {
+                    // text expansion on tab key if the char before is alphabet
+                    const snippets =
+                        JSON.parse(fs.readFileSync(consts.SNIPPET_FILE, 'utf8'))
+                    if (expandSnippet(line, cursor, cm, snippets) === false) {
+                      if (tabs) {
+                        cm.execCommand('insertTab')
+                      } else {
+                        cm.execCommand('insertSoftTab')
+                      }
+                    }
+                  }
+                  else {
+                    if (tabs) {
+                      cm.execCommand('insertTab')
+                    } else {
+                      cm.execCommand('insertSoftTab')
+                    }
+                  }
+                }
+              },
+              'Cmd-T': function(cm) {
+                // Do nothing
+              },
+              Enter: 'boostNewLineAndIndentContinueMarkdownList',
+              'Ctrl-C': cm => {
+                if (cm.getOption('keyMap').substr(0, 3) === 'vim') {
+                  document.execCommand('copy')
+                }
+                return CodeMirror.Pass
               }
-            }
-          } else {
-            if (tabs) {
-              cm.execCommand('insertTab')
-            } else {
-              cm.execCommand('insertSoftTab')
-            }
-          }
-        }
-      },
-      'Cmd-T': function (cm) {
-        // Do nothing
-      },
-      Enter: 'boostNewLineAndIndentContinueMarkdownList',
-      'Ctrl-C': cm => {
-        if (cm.getOption('keyMap').substr(0, 3) === 'vim') {
-          document.execCommand('copy')
-        }
-        return CodeMirror.Pass
-      }
-    })
+            })
 
-    this.value = this.props.value
-    this.editor = CodeMirror(this.refs.root, {
-      rulers: buildCMRulers(rulers, enableRulers),
-      value: this.props.value,
-      lineNumbers: this.props.displayLineNumbers,
-      lineWrapping: true,
-      theme: this.props.theme,
-      indentUnit: this.props.indentSize,
-      tabSize: this.props.indentSize,
-      indentWithTabs: this.props.indentType !== 'space',
-      keyMap: this.props.keyMap,
-      scrollPastEnd: this.props.scrollPastEnd,
-      inputStyle: 'textarea',
-      dragDrop: false,
-      foldGutter: true,
-      gutters: ['CodeMirror-linenumbers', 'CodeMirror-foldgutter'],
-      autoCloseBrackets: (this.props.enableBracketMatching ? {
-        pairs: '()[]{}\'\'""$$**``ll',
-        triples: '```"""\'\'\'',
-        explode: '[]{}``$$',
-        override: true
-      } : {
-        pairs: '',
-        triples: '',
-        explode: '',
-        override: true
-      }),
-      extraKeys: this.defaultKeyMap
-    })
+                this.value = this.props.value this.editor =
+            CodeMirror(this.refs.root, {
+              rulers: buildCMRulers(rulers, enableRulers),
+              value: this.props.value,
+              lineNumbers: this.props.displayLineNumbers,
+              lineWrapping: true,
+              theme: this.props.theme,
+              indentUnit: this.props.indentSize,
+              tabSize: this.props.indentSize,
+              indentWithTabs: this.props.indentType !== 'space',
+              keyMap: this.props.keyMap,
+              scrollPastEnd: this.props.scrollPastEnd,
+              inputStyle: 'textarea',
+              dragDrop: false,
+              foldGutter: true,
+              gutters: ['CodeMirror-linenumbers', 'CodeMirror-foldgutter'],
+              autoCloseBrackets: {
+                pairs: this.props.matchingPairs,
+                triples: this.props.matchingTriples,
+                explode: this.props.explodingPairs,
+                override: true
+              },
+              extraKeys: this.defaultKeyMap
+            })
 
-    this.setMode(this.props.mode)
+                this.setMode(this.props.mode)
 
-    this.editor.on('focus', this.focusHandler)
-    this.editor.on('blur', this.blurHandler)
-    this.editor.on('change', this.changeHandler)
-    this.editor.on('paste', this.pasteHandler)
+                    this.editor.on('focus', this.focusHandler) this.editor
+                        .on('blur', this.blurHandler) this.editor
+                        .on('change', this.changeHandler) this.editor.on(
+                            'paste', this.pasteHandler)
     eventEmitter.on('top:search', this.searchHandler)
 
-    eventEmitter.emit('code:init')
-    this.editor.on('scroll', this.scrollHandler)
+    eventEmitter.emit('code:init') this.editor.on('scroll', this.scrollHandler)
 
     const editorTheme = document.getElementById('editorTheme')
     editorTheme.addEventListener('load', this.loadStyleHandler)
@@ -263,146 +242,151 @@ export default class CodeEditor extends React.Component {
     CodeMirror.Vim.defineEx('q!', 'q!', this.quitEditor)
     CodeMirror.Vim.defineEx('wq', 'wq', this.quitEditor)
     CodeMirror.Vim.defineEx('qw', 'qw', this.quitEditor)
-    CodeMirror.Vim.map('ZZ', ':q', 'normal')
+    CodeMirror.Vim
+        .map('ZZ', ':q', 'normal')
 
-    this.textEditorInterface = new TextEditorInterface(this.editor)
-    this.tableEditor = new TableEditor(this.textEditorInterface)
-    eventEmitter.on('code:format-table', this.formatTable)
+            this.textEditorInterface =
+        new TextEditorInterface(this.editor) this.tableEditor =
+            new TableEditor(this.textEditorInterface)
+    eventEmitter
+        .on('code:format-table', this.formatTable)
 
-    this.tableEditorOptions = options({
-      smartCursor: true
-    })
+            this.tableEditorOptions = options({smartCursor: true})
 
-    this.editorKeyMap = CodeMirror.normalizeKeyMap({
-      'Tab': () => {
-        this.tableEditor.nextCell(this.tableEditorOptions)
-      },
-      'Shift-Tab': () => {
-        this.tableEditor.previousCell(this.tableEditorOptions)
-      },
-      'Enter': () => {
-        this.tableEditor.nextRow(this.tableEditorOptions)
-      },
-      'Ctrl-Enter': () => {
-        this.tableEditor.escape(this.tableEditorOptions)
-      },
-      'Cmd-Enter': () => {
-        this.tableEditor.escape(this.tableEditorOptions)
-      },
-      'Shift-Ctrl-Left': () => {
-        this.tableEditor.alignColumn(Alignment.LEFT, this.tableEditorOptions)
-      },
-      'Shift-Cmd-Left': () => {
-        this.tableEditor.alignColumn(Alignment.LEFT, this.tableEditorOptions)
-      },
-      'Shift-Ctrl-Right': () => {
-        this.tableEditor.alignColumn(Alignment.RIGHT, this.tableEditorOptions)
-      },
-      'Shift-Cmd-Right': () => {
-        this.tableEditor.alignColumn(Alignment.RIGHT, this.tableEditorOptions)
-      },
-      'Shift-Ctrl-Up': () => {
-        this.tableEditor.alignColumn(Alignment.CENTER, this.tableEditorOptions)
-      },
-      'Shift-Cmd-Up': () => {
-        this.tableEditor.alignColumn(Alignment.CENTER, this.tableEditorOptions)
-      },
-      'Shift-Ctrl-Down': () => {
-        this.tableEditor.alignColumn(Alignment.NONE, this.tableEditorOptions)
-      },
-      'Shift-Cmd-Down': () => {
-        this.tableEditor.alignColumn(Alignment.NONE, this.tableEditorOptions)
-      },
-      'Ctrl-Left': () => {
-        this.tableEditor.moveFocus(0, -1, this.tableEditorOptions)
-      },
-      'Cmd-Left': () => {
-        this.tableEditor.moveFocus(0, -1, this.tableEditorOptions)
-      },
-      'Ctrl-Right': () => {
-        this.tableEditor.moveFocus(0, 1, this.tableEditorOptions)
-      },
-      'Cmd-Right': () => {
-        this.tableEditor.moveFocus(0, 1, this.tableEditorOptions)
-      },
-      'Ctrl-Up': () => {
-        this.tableEditor.moveFocus(-1, 0, this.tableEditorOptions)
-      },
-      'Cmd-Up': () => {
-        this.tableEditor.moveFocus(-1, 0, this.tableEditorOptions)
-      },
-      'Ctrl-Down': () => {
-        this.tableEditor.moveFocus(1, 0, this.tableEditorOptions)
-      },
-      'Cmd-Down': () => {
-        this.tableEditor.moveFocus(1, 0, this.tableEditorOptions)
-      },
-      'Ctrl-K Ctrl-I': () => {
-        this.tableEditor.insertRow(this.tableEditorOptions)
-      },
-      'Cmd-K Cmd-I': () => {
-        this.tableEditor.insertRow(this.tableEditorOptions)
-      },
-      'Ctrl-L Ctrl-I': () => {
-        this.tableEditor.deleteRow(this.tableEditorOptions)
-      },
-      'Cmd-L Cmd-I': () => {
-        this.tableEditor.deleteRow(this.tableEditorOptions)
-      },
-      'Ctrl-K Ctrl-J': () => {
-        this.tableEditor.insertColumn(this.tableEditorOptions)
-      },
-      'Cmd-K Cmd-J': () => {
-        this.tableEditor.insertColumn(this.tableEditorOptions)
-      },
-      'Ctrl-L Ctrl-J': () => {
-        this.tableEditor.deleteColumn(this.tableEditorOptions)
-      },
-      'Cmd-L Cmd-J': () => {
-        this.tableEditor.deleteColumn(this.tableEditorOptions)
-      },
-      'Alt-Shift-Ctrl-Left': () => {
-        this.tableEditor.moveColumn(-1, this.tableEditorOptions)
-      },
-      'Alt-Shift-Cmd-Left': () => {
-        this.tableEditor.moveColumn(-1, this.tableEditorOptions)
-      },
-      'Alt-Shift-Ctrl-Right': () => {
-        this.tableEditor.moveColumn(1, this.tableEditorOptions)
-      },
-      'Alt-Shift-Cmd-Right': () => {
-        this.tableEditor.moveColumn(1, this.tableEditorOptions)
-      },
-      'Alt-Shift-Ctrl-Up': () => {
-        this.tableEditor.moveRow(-1, this.tableEditorOptions)
-      },
-      'Alt-Shift-Cmd-Up': () => {
-        this.tableEditor.moveRow(-1, this.tableEditorOptions)
-      },
-      'Alt-Shift-Ctrl-Down': () => {
-        this.tableEditor.moveRow(1, this.tableEditorOptions)
-      },
-      'Alt-Shift-Cmd-Down': () => {
-        this.tableEditor.moveRow(1, this.tableEditorOptions)
-      }
-    })
+                                          this.editorKeyMap =
+        CodeMirror.normalizeKeyMap({
+          'Tab': () => {
+            this.tableEditor.nextCell(this.tableEditorOptions)
+          },
+          'Shift-Tab': () => {
+            this.tableEditor.previousCell(this.tableEditorOptions)
+          },
+          'Enter': () => {
+            this.tableEditor.nextRow(this.tableEditorOptions)
+          },
+          'Ctrl-Enter': () => {
+            this.tableEditor.escape(this.tableEditorOptions)
+          },
+          'Cmd-Enter': () => {
+            this.tableEditor.escape(this.tableEditorOptions)
+          },
+          'Shift-Ctrl-Left': () => {
+            this.tableEditor.alignColumn(
+                Alignment.LEFT, this.tableEditorOptions)
+          },
+          'Shift-Cmd-Left': () => {
+            this.tableEditor.alignColumn(
+                Alignment.LEFT, this.tableEditorOptions)
+          },
+          'Shift-Ctrl-Right': () => {
+            this.tableEditor.alignColumn(
+                Alignment.RIGHT, this.tableEditorOptions)
+          },
+          'Shift-Cmd-Right': () => {
+            this.tableEditor.alignColumn(
+                Alignment.RIGHT, this.tableEditorOptions)
+          },
+          'Shift-Ctrl-Up': () => {
+            this.tableEditor.alignColumn(
+                Alignment.CENTER, this.tableEditorOptions)
+          },
+          'Shift-Cmd-Up': () => {
+            this.tableEditor.alignColumn(
+                Alignment.CENTER, this.tableEditorOptions)
+          },
+          'Shift-Ctrl-Down': () => {
+            this.tableEditor.alignColumn(
+                Alignment.NONE, this.tableEditorOptions)
+          },
+          'Shift-Cmd-Down': () => {
+            this.tableEditor.alignColumn(
+                Alignment.NONE, this.tableEditorOptions)
+          },
+          'Ctrl-Left': () => {
+            this.tableEditor.moveFocus(0, -1, this.tableEditorOptions)
+          },
+          'Cmd-Left': () => {
+            this.tableEditor.moveFocus(0, -1, this.tableEditorOptions)
+          },
+          'Ctrl-Right': () => {
+            this.tableEditor.moveFocus(0, 1, this.tableEditorOptions)
+          },
+          'Cmd-Right': () => {
+            this.tableEditor.moveFocus(0, 1, this.tableEditorOptions)
+          },
+          'Ctrl-Up': () => {
+            this.tableEditor.moveFocus(-1, 0, this.tableEditorOptions)
+          },
+          'Cmd-Up': () => {
+            this.tableEditor.moveFocus(-1, 0, this.tableEditorOptions)
+          },
+          'Ctrl-Down': () => {
+            this.tableEditor.moveFocus(1, 0, this.tableEditorOptions)
+          },
+          'Cmd-Down': () => {
+            this.tableEditor.moveFocus(1, 0, this.tableEditorOptions)
+          },
+          'Ctrl-K Ctrl-I': () => {
+            this.tableEditor.insertRow(this.tableEditorOptions)
+          },
+          'Cmd-K Cmd-I': () => {
+            this.tableEditor.insertRow(this.tableEditorOptions)
+          },
+          'Ctrl-L Ctrl-I': () => {
+            this.tableEditor.deleteRow(this.tableEditorOptions)
+          },
+          'Cmd-L Cmd-I': () => {
+            this.tableEditor.deleteRow(this.tableEditorOptions)
+          },
+          'Ctrl-K Ctrl-J': () => {
+            this.tableEditor.insertColumn(this.tableEditorOptions)
+          },
+          'Cmd-K Cmd-J': () => {
+            this.tableEditor.insertColumn(this.tableEditorOptions)
+          },
+          'Ctrl-L Ctrl-J': () => {
+            this.tableEditor.deleteColumn(this.tableEditorOptions)
+          },
+          'Cmd-L Cmd-J': () => {
+            this.tableEditor.deleteColumn(this.tableEditorOptions)
+          },
+          'Alt-Shift-Ctrl-Left': () => {
+            this.tableEditor.moveColumn(-1, this.tableEditorOptions)
+          },
+          'Alt-Shift-Cmd-Left': () => {
+            this.tableEditor.moveColumn(-1, this.tableEditorOptions)
+          },
+          'Alt-Shift-Ctrl-Right': () => {
+            this.tableEditor.moveColumn(1, this.tableEditorOptions)
+          },
+          'Alt-Shift-Cmd-Right': () => {
+            this.tableEditor.moveColumn(1, this.tableEditorOptions)
+          },
+          'Alt-Shift-Ctrl-Up': () => {
+            this.tableEditor.moveRow(-1, this.tableEditorOptions)
+          },
+          'Alt-Shift-Cmd-Up': () => {
+            this.tableEditor.moveRow(-1, this.tableEditorOptions)
+          },
+          'Alt-Shift-Ctrl-Down': () => {
+            this.tableEditor.moveRow(1, this.tableEditorOptions)
+          },
+          'Alt-Shift-Cmd-Down': () => {
+            this.tableEditor.moveRow(1, this.tableEditorOptions)
+          }
+        })
 
     if (this.props.enableTableEditor) {
-      this.editor.on('cursorActivity', this.editorActivityHandler)
-      this.editor.on('changes', this.editorActivityHandler)
+      this.editor.on('cursorActivity', this.editorActivityHandler) this.editor
+          .on('changes', this.editorActivityHandler)
     }
 
-    this.setState({
-      clientWidth: this.refs.root.clientWidth
-    })
+    this.setState({clientWidth: this.refs.root.clientWidth})
   }
 
   expandSnippet(line, cursor, cm, snippets) {
-    const wordBeforeCursor = this.getWordBeforeCursor(
-      line,
-      cursor.line,
-      cursor.ch
-    )
+    const wordBeforeCursor =
+        this.getWordBeforeCursor(line, cursor.line, cursor.ch)
     const templateCursorString = ':{}'
     for (let i = 0; i < snippets.length; i++) {
       if (snippets[i].prefix.indexOf(wordBeforeCursor.text) !== -1) {
@@ -416,10 +400,8 @@ export default class CodeEditor extends React.Component {
               cursorLineNumber = j
               cursorLinePosition = cursorIndex
               cm.replaceRange(
-                snippets[i].content.replace(templateCursorString, ''),
-                wordBeforeCursor.range.from,
-                wordBeforeCursor.range.to
-              )
+                  snippets[i].content.replace(templateCursorString, ''),
+                  wordBeforeCursor.range.from, wordBeforeCursor.range.to)
               cm.setCursor({
                 line: cursor.line + cursorLineNumber,
                 ch: cursorLinePosition
@@ -428,10 +410,8 @@ export default class CodeEditor extends React.Component {
           }
         } else {
           cm.replaceRange(
-            snippets[i].content,
-            wordBeforeCursor.range.from,
-            wordBeforeCursor.range.to
-          )
+              snippets[i].content, wordBeforeCursor.range.from,
+              wordBeforeCursor.range.to)
         }
         return true
       }
@@ -446,7 +426,8 @@ export default class CodeEditor extends React.Component {
     const emptyChars = /\t|\s|\r|\n/
 
     // to prevent the word to expand is long that will crash the whole app
-    // the safeStop is there to stop user to expand words that longer than 20 chars
+    // the safeStop is there to stop user to expand words that longer than 20
+    // chars
     const safeStop = 20
 
     while (cursorPosition > 0) {
@@ -454,25 +435,17 @@ export default class CodeEditor extends React.Component {
       // if char is not an empty char
       if (!emptyChars.test(currentChar)) {
         wordBeforeCursor = currentChar + wordBeforeCursor
-      } else if (wordBeforeCursor.length >= safeStop) {
-        throw new Error('Your snippet trigger is too long !')
-      } else {
-        break
       }
-      cursorPosition--
+      else if (wordBeforeCursor.length >= safeStop) {
+        throw new Error('Your snippet trigger is too long !')
+      }
+      else {break} cursorPosition--
     }
 
     return {
-      text: wordBeforeCursor,
-      range: {
-        from: {
-          line: lineNumber,
-          ch: originCursorPosition
-        },
-        to: {
-          line: lineNumber,
-          ch: cursorPosition
-        }
+      text: wordBeforeCursor, range: {
+        from: {line: lineNumber, ch: originCursorPosition},
+        to: {line: lineNumber, ch: cursorPosition}
       }
     }
   }
@@ -482,12 +455,12 @@ export default class CodeEditor extends React.Component {
   }
 
   componentWillUnmount() {
-    this.editor.off('focus', this.focusHandler)
-    this.editor.off('blur', this.blurHandler)
-    this.editor.off('change', this.changeHandler)
-    this.editor.off('paste', this.pasteHandler)
-    eventEmitter.off('top:search', this.searchHandler)
-    this.editor.off('scroll', this.scrollHandler)
+    this.editor.off('focus', this.focusHandler) this.editor
+        .off('blur', this.blurHandler) this.editor
+        .off('change', this.changeHandler) this.editor.off(
+            'paste', this.pasteHandler)
+    eventEmitter.off('top:search', this.searchHandler) this.editor.off(
+        'scroll', this.scrollHandler)
     const editorTheme = document.getElementById('editorTheme')
     editorTheme.removeEventListener('load', this.loadStyleHandler)
 
@@ -496,10 +469,7 @@ export default class CodeEditor extends React.Component {
 
   componentDidUpdate(prevProps, prevState) {
     let needRefresh = false
-    const {
-      rulers,
-      enableRulers
-    } = this.props
+    const {rulers, enableRulers} = this.props
     if (prevProps.mode !== this.props.mode) {
       this.setMode(this.props.mode)
     }
@@ -517,16 +487,14 @@ export default class CodeEditor extends React.Component {
       needRefresh = true
     }
 
-    if (
-      prevProps.enableRulers !== enableRulers ||
-      prevProps.rulers !== rulers
-    ) {
+    if (prevProps.enableRulers !== enableRulers ||
+        prevProps.rulers !== rulers) {
       this.editor.setOption('rulers', buildCMRulers(rulers, enableRulers))
     }
 
     if (prevProps.indentSize !== this.props.indentSize) {
-      this.editor.setOption('indentUnit', this.props.indentSize)
-      this.editor.setOption('tabSize', this.props.indentSize)
+      this.editor.setOption('indentUnit', this.props.indentSize) this.editor
+          .setOption('tabSize', this.props.indentSize)
     }
     if (prevProps.indentType !== this.props.indentType) {
       this.editor.setOption('indentWithTabs', this.props.indentType !== 'space')
@@ -540,38 +508,33 @@ export default class CodeEditor extends React.Component {
       this.editor.setOption('scrollPastEnd', this.props.scrollPastEnd)
     }
 
-    if (prevProps.enableBracketMatching !== this.props.enableBracketMatching) {
-      const bracketObject = (this.props.enableBracketMatching ? {
-        pairs: '()[]{}\'\'""$$**``ll',
-        triples: '```"""\'\'\'',
-        explode: '[]{}``$$',
+    if (prevProps.matchingPairs !== this.props.matchingPairs ||
+        prevProps.matchingTriples !== this.props.matchingTriples ||
+        prevProps.explodingPairs !== this.props.explodingPairs) {
+      const bracketObject = {
+        pairs: this.props.matchingPairs,
+        triples: this.props.matchingTriples,
+        explode: this.props.explodingPairs,
         override: true
-      } : {
-        pairs: '',
-        triples: '',
-        explode: '',
-        override: true
-      });
+      }
       this.editor.setOption('autoCloseBrackets', bracketObject)
     }
 
     if (prevProps.enableTableEditor !== this.props.enableTableEditor) {
       if (this.props.enableTableEditor) {
-        this.editor.on('cursorActivity', this.editorActivityHandler)
-        this.editor.on('changes', this.editorActivityHandler)
+        this.editor.on('cursorActivity', this.editorActivityHandler) this.editor
+            .on('changes', this.editorActivityHandler)
       } else {
-        this.editor.off('cursorActivity', this.editorActivityHandler)
-        this.editor.off('changes', this.editorActivityHandler)
+        this.editor.off('cursorActivity', this.editorActivityHandler) this
+            .editor.off('changes', this.editorActivityHandler)
       }
 
-      this.extraKeysMode = 'default'
-      this.editor.setOption('extraKeys', this.defaultKeyMap)
+      this.extraKeysMode =
+          'default' this.editor.setOption('extraKeys', this.defaultKeyMap)
     }
 
     if (this.state.clientWidth !== this.refs.root.clientWidth) {
-      this.setState({
-        clientWidth: this.refs.root.clientWidth
-      })
+      this.setState({clientWidth: this.refs.root.clientWidth})
 
       needRefresh = true
     }
@@ -583,9 +546,11 @@ export default class CodeEditor extends React.Component {
 
   setMode(mode) {
     let syntax = CodeMirror.findModeByName(convertModeName(mode))
-    if (syntax == null) syntax = CodeMirror.findModeByName('Plain Text')
+    if (syntax == null) syntax =
+        CodeMirror
+            .findModeByName('Plain Text')
 
-    this.editor.setOption('mode', syntax.mime)
+                this.editor.setOption('mode', syntax.mime)
     CodeMirror.autoLoadMode(this.editor, syntax.mode)
   }
 
@@ -599,11 +564,7 @@ export default class CodeEditor extends React.Component {
   moveCursorTo(row, col) {}
 
   scrollToLine(event, num) {
-    const cursor = {
-      line: num,
-      ch: 1
-    }
-    this.editor.setCursor(cursor)
+    const cursor = { line: num, ch: 1 } this.editor.setCursor(cursor)
   }
 
   focus() {
@@ -616,32 +577,22 @@ export default class CodeEditor extends React.Component {
 
   reload() {
     // Change event shouldn't be fired when switch note
-    this.editor.off('change', this.changeHandler)
-    this.value = this.props.value
-    this.editor.setValue(this.props.value)
-    this.editor.clearHistory()
-    this.editor.on('change', this.changeHandler)
-    this.editor.refresh()
+    this.editor.off('change', this.changeHandler) this.value =
+        this.props.value this.editor.setValue(this.props.value) this.editor
+            .clearHistory() this.editor.on('change', this.changeHandler) this
+            .editor.refresh()
   }
 
   setValue(value) {
-    const cursor = this.editor.getCursor()
-    this.editor.setValue(value)
-    this.editor.setCursor(cursor)
+    const cursor = this.editor.getCursor() this.editor.setValue(value) this
+                       .editor.setCursor(cursor)
   }
 
   handleDropImage(dropEvent) {
     dropEvent.preventDefault()
-    const {
-      storageKey,
-      noteKey
-    } = this.props
+    const {storageKey, noteKey} = this.props
     attachmentManagement.handleAttachmentDrop(
-      this,
-      storageKey,
-      noteKey,
-      dropEvent
-    )
+        this, storageKey, noteKey, dropEvent)
   }
 
   insertAttachmentMd(imageMd) {
@@ -650,59 +601,43 @@ export default class CodeEditor extends React.Component {
 
   handlePaste(editor, e) {
     const clipboardData = e.clipboardData
-    const {
-      storageKey,
-      noteKey
-    } = this.props
-    const dataTransferItem = clipboardData.items[0]
-    const pastedTxt = clipboardData.getData('text')
-    const isURL = str => {
-      const matcher = /^(?:\w+:)?\/\/([^\s\.]+\.\S{2}|localhost[\:?\d]*)\S*$/
-      return matcher.test(str)
-    }
-    const isInLinkTag = editor => {
-      const startCursor = editor.getCursor('start')
-      const prevChar = editor.getRange({
-        line: startCursor.line,
-        ch: startCursor.ch - 2
-      }, {
-        line: startCursor.line,
-        ch: startCursor.ch
-      })
-      const endCursor = editor.getCursor('end')
-      const nextChar = editor.getRange({
-        line: endCursor.line,
-        ch: endCursor.ch
-      }, {
-        line: endCursor.line,
-        ch: endCursor.ch + 1
-      })
-      return prevChar === '](' && nextChar === ')'
-    }
+    const {storageKey, noteKey} = this.props
+    const dataTransferItem = clipboardData.items[0] const pastedTxt =
+        clipboardData.getData('text')
+    const isURL =
+        str => {
+          const matcher =
+              /^(?:\w+:)?\/\/([^\s\.]+\.\S{2}|localhost[\:?\d]*)\S*$/
+          return matcher.test(str)
+        } const isInLinkTag =
+            editor => {
+              const startCursor = editor.getCursor('start')
+              const prevChar = editor.getRange(
+                  {line: startCursor.line, ch: startCursor.ch - 2},
+                  {line: startCursor.line, ch: startCursor.ch})
+              const endCursor = editor.getCursor('end')
+              const nextChar = editor.getRange(
+                  {line: endCursor.line, ch: endCursor.ch},
+                  {line: endCursor.line, ch: endCursor.ch + 1})
+              return prevChar === '](' && nextChar === ')'
+            }
 
     const pastedHtml = clipboardData.getData('text/html')
     if (pastedHtml !== '') {
       this.handlePasteHtml(e, editor, pastedHtml)
-    } else if (dataTransferItem.type.match('image')) {
+    }
+    else if (dataTransferItem.type.match('image')) {
       attachmentManagement.handlePastImageEvent(
-        this,
-        storageKey,
-        noteKey,
-        dataTransferItem
-      )
-    } else if (
-      this.props.fetchUrlTitle &&
-      isURL(pastedTxt) &&
-      !isInLinkTag(editor)
-    ) {
+          this, storageKey, noteKey, dataTransferItem)
+    }
+    else if (
+        this.props.fetchUrlTitle && isURL(pastedTxt) && !isInLinkTag(editor)) {
       this.handlePasteUrl(e, editor, pastedTxt)
     }
     if (attachmentManagement.isAttachmentLink(pastedTxt)) {
       attachmentManagement
-        .handleAttachmentLinkPaste(storageKey, noteKey, pastedTxt)
-        .then(modifiedText => {
-          this.editor.replaceSelection(modifiedText)
-        })
+          .handleAttachmentLinkPaste(storageKey, noteKey, pastedTxt)
+          .then(modifiedText => {this.editor.replaceSelection(modifiedText)})
       e.preventDefault()
     }
   }
@@ -718,39 +653,36 @@ export default class CodeEditor extends React.Component {
     const taggedUrl = `<${pastedTxt}>`
     editor.replaceSelection(taggedUrl)
 
-    const isImageReponse = response => {
-      return (
-        response.headers.has('content-type') &&
-        response.headers.get('content-type').match(/^image\/.+$/)
-      )
-    }
-    const replaceTaggedUrl = replacement => {
-      const value = editor.getValue()
-      const cursor = editor.getCursor()
-      const newValue = value.replace(taggedUrl, replacement)
-      const newCursor = Object.assign({}, cursor, {
-        ch: cursor.ch + newValue.length - value.length
-      })
-      editor.setValue(newValue)
-      editor.setCursor(newCursor)
-    }
+    const isImageReponse =
+        response => {
+          return (
+              response.headers.has('content-type') &&
+              response.headers.get('content-type').match(/^image\/.+$/))
+        } const replaceTaggedUrl =
+            replacement => {
+              const value = editor.getValue()
+              const cursor = editor.getCursor()
+              const newValue = value.replace(taggedUrl, replacement)
+              const newCursor = Object.assign(
+                  {}, cursor, {ch: cursor.ch + newValue.length - value.length})
+              editor.setValue(newValue)
+              editor.setCursor(newCursor)
+            }
 
-    fetch(pastedTxt, {
-        method: 'get'
-      })
-      .then(response => {
-        if (isImageReponse(response)) {
-          return this.mapImageResponse(response, pastedTxt)
-        } else {
-          return this.mapNormalResponse(response, pastedTxt)
-        }
-      })
-      .then(replacement => {
-        replaceTaggedUrl(replacement)
-      })
-      .catch(e => {
-        replaceTaggedUrl(pastedTxt)
-      })
+                           fetch(pastedTxt, {method: 'get'})
+                               .then(response => {
+                                 if (isImageReponse(response)) {
+                                   return this.mapImageResponse(
+                                       response, pastedTxt)
+                                 } else {
+                                   return this.mapNormalResponse(
+                                       response, pastedTxt)
+                                 }
+                               })
+                               .then(
+                                   replacement => {
+                                       replaceTaggedUrl(replacement)})
+                               .catch(e => {replaceTaggedUrl(pastedTxt)})
   }
 
   handlePasteHtml(e, editor, pastedHtml) {
@@ -760,23 +692,21 @@ export default class CodeEditor extends React.Component {
   }
 
   mapNormalResponse(response, pastedTxt) {
-    return this.decodeResponse(response).then(body => {
-      return new Promise((resolve, reject) => {
-        try {
-          const parsedBody = new window.DOMParser().parseFromString(
-            body,
-            'text/html'
-          )
-          const escapePipe = (str) => {
-            return str.replace('|', '\\|')
+    return this.decodeResponse(response).then(
+        body => {return new Promise((resolve, reject) => {
+          try {
+            const parsedBody =
+                new window.DOMParser().parseFromString(body, 'text/html')
+            const escapePipe =
+                (str) => {
+                  return str.replace('|', '\\|')
+                } const linkWithTitle =
+                    `[${escapePipe(parsedBody.title)}](${pastedTxt})`
+            resolve(linkWithTitle)
+          } catch (e) {
+            reject(e)
           }
-          const linkWithTitle = `[${escapePipe(parsedBody.title)}](${pastedTxt})`
-          resolve(linkWithTitle)
-        } catch (e) {
-          reject(e)
-        }
-      })
-    })
+        })})
   }
 
   mapImageResponse(response, pastedTxt) {
@@ -795,39 +725,30 @@ export default class CodeEditor extends React.Component {
   decodeResponse(response) {
     const headers = response.headers
     const _charset = headers.has('content-type') ?
-      this.extractContentTypeCharset(headers.get('content-type')) :
-      undefined
-    return response.arrayBuffer().then(buff => {
-      return new Promise((resolve, reject) => {
-        try {
-          const charset = _charset !== undefined &&
-            iconv.encodingExists(_charset) ?
-            _charset :
-            'utf-8'
-          resolve(iconv.decode(new Buffer(buff), charset).toString())
-        } catch (e) {
-          reject(e)
-        }
-      })
-    })
+        this.extractContentTypeCharset(headers.get('content-type')) :
+        undefined
+    return response.arrayBuffer().then(
+        buff => {return new Promise((resolve, reject) => {
+          try {
+            const charset =
+                _charset !== undefined && iconv.encodingExists(_charset) ?
+                _charset :
+                'utf-8'
+            resolve(iconv.decode(new Buffer(buff), charset).toString())
+          } catch (e) {
+            reject(e)
+          }
+        })})
   }
 
   extractContentTypeCharset(contentType) {
-    return contentType
-      .split(';')
-      .filter(str => {
-        return str.trim().toLowerCase().startsWith('charset')
-      })
-      .map(str => {
-        return str.replace(/['"]/g, '').split('=')[1]
-      })[0]
+    return contentType.split(';')
+        .filter(str => {return str.trim().toLowerCase().startsWith('charset')})
+        .map(str => {return str.replace(/['"]/g, '').split('=')[1]})[0]
   }
 
   render() {
-    const {
-      className,
-      fontSize
-    } = this.props
+    const {className, fontSize} = this.props
     const fontFamily = normalizeEditorFontFamily(this.props.fontFamily)
     const width = this.props.width
     return ( <
@@ -835,18 +756,12 @@ export default class CodeEditor extends React.Component {
         className == null ? 'CodeEditor' : `CodeEditor ${className}`
       }
       ref = 'root'
-      tabIndex = '-1'
-      style = {
-        {
-          fontFamily,
-          fontSize: fontSize,
-          width: width
-        }
-      }
-      onDrop = {
-        e => this.handleDropImage(e)
-      }
-      />
+    tabIndex = '-1'
+    style = {
+      { fontFamily, fontSize: fontSize, width: width }
+    } onDrop = {
+      e => this.handleDropImage(e)
+    } />
     )
   }
 }
diff --git a/browser/components/MarkdownEditor.js b/browser/components/MarkdownEditor.js
index f10ea8bc..dcb1b5ea 100644
--- a/browser/components/MarkdownEditor.js
+++ b/browser/components/MarkdownEditor.js
@@ -269,6 +269,9 @@ class MarkdownEditor extends React.Component {
           rulers={config.editor.rulers}
           displayLineNumbers={config.editor.displayLineNumbers}
           enableBracketMatching={config.editor.enableBracketMatching}
+          matchingPairs={config.editor.matchingPairs}
+          matchingTriples={config.editor.matchingTriples}
+          explodingPairs={config.editor.explodingPairs}
           scrollPastEnd={config.editor.scrollPastEnd}
           storageKey={storageKey}
           noteKey={noteKey}
diff --git a/browser/components/MarkdownSplitEditor.js b/browser/components/MarkdownSplitEditor.js
index 004a6eb0..689799c8 100644
--- a/browser/components/MarkdownSplitEditor.js
+++ b/browser/components/MarkdownSplitEditor.js
@@ -159,6 +159,9 @@ class MarkdownSplitEditor extends React.Component {
           fontSize={editorFontSize}
           displayLineNumbers={config.editor.displayLineNumbers}
           enableBracketMatching={config.editor.enableBracketMatching}
+          matchingPairs={config.editor.matchingPairs}
+          matchingTriples={config.editor.matchingTriples}
+          explodingPairs={config.editor.explodingPairs}
           indentType={config.editor.indentType}
           indentSize={editorIndentSize}
           enableRulers={config.editor.enableRulers}
diff --git a/browser/main/Detail/SnippetNoteDetail.js b/browser/main/Detail/SnippetNoteDetail.js
index 90b8faa9..86ce2c7a 100644
--- a/browser/main/Detail/SnippetNoteDetail.js
+++ b/browser/main/Detail/SnippetNoteDetail.js
@@ -700,6 +700,9 @@ class SnippetNoteDetail extends React.Component {
             indentSize={editorIndentSize}
             displayLineNumbers={config.editor.displayLineNumbers}
             enableBracketMatching={config.editor.enableBracketMatching}
+            matchingPairs={config.editor.matchingPairs}
+            matchingTriples={config.editor.matchingTriples}
+            explodingPairs={config.editor.explodingPairs}
             keyMap={config.editor.keyMap}
             scrollPastEnd={config.editor.scrollPastEnd}
             fetchUrlTitle={config.editor.fetchUrlTitle}
diff --git a/browser/main/lib/ConfigManager.js b/browser/main/lib/ConfigManager.js
index eddf0909..c86e9288 100644
--- a/browser/main/lib/ConfigManager.js
+++ b/browser/main/lib/ConfigManager.js
@@ -45,6 +45,9 @@ export const DEFAULT_CONFIG = {
     rulers: [80, 120],
     displayLineNumbers: true,
     enableBracketMatching: true,
+    matchingPairs:'()[]{}\'\'""$$**``',
+    matchingTriples:'```"""\'\'\'',
+    explodingPairs:'[]{}``$$',
     switchPreview: 'BLUR', // 'BLUR', 'DBL_CLICK', 'RIGHTCLICK'
     delfaultStatus: 'PREVIEW', // 'PREVIEW', 'CODE'
     scrollPastEnd: false,
diff --git a/browser/main/modals/PreferencesModal/SnippetTab.js b/browser/main/modals/PreferencesModal/SnippetTab.js
index 40b65d39..ebd4012e 100644
--- a/browser/main/modals/PreferencesModal/SnippetTab.js
+++ b/browser/main/modals/PreferencesModal/SnippetTab.js
@@ -137,6 +137,9 @@ class SnippetTab extends React.Component {
               rulers={config.editor.rulers}
               displayLineNumbers={config.editor.displayLineNumbers}
               enableBracketMatching={config.editor.enableBracketMatching}
+              matchingPairs={config.editor.matchingPairs}
+              matchingTriples={config.editor.matchingTriples}
+              explodingPairs={config.editor.explodingPairs}
               scrollPastEnd={config.editor.scrollPastEnd}
               onRef={ref => { this.snippetEditor = ref }} />
           </div>
diff --git a/browser/main/modals/PreferencesModal/UiTab.js b/browser/main/modals/PreferencesModal/UiTab.js
index ab72c914..2bd0c9d0 100644
--- a/browser/main/modals/PreferencesModal/UiTab.js
+++ b/browser/main/modals/PreferencesModal/UiTab.js
@@ -95,7 +95,10 @@ class UiTab extends React.Component {
         enableTableEditor: this.refs.enableTableEditor.checked,
         enableFrontMatterTitle: this.refs.enableFrontMatterTitle.checked,
         frontMatterTitleField: this.refs.frontMatterTitleField.value,
-        enableBracketMatching: this.refs.enableBracketMatching.checked
+        enableBracketMatching: this.refs.enableBracketMatching.checked,
+        matchingPairs: this.refs.matchingPairs.value,
+        matchingTriples: this.refs.matchingTriples.value,
+        explodingPairs: this.refs.explodingPairs.value
       },
       preview: {
         fontSize: this.refs.previewFontSize.value,
@@ -551,6 +554,48 @@ class UiTab extends React.Component {
             </label>
           </div>
 
+          <div styleName='group-section'>            
+            <div styleName='group-section-label'>
+              {i18n.__('Matching character pairs')}
+            </div>
+            <div styleName='group-section-control'>
+              <input styleName='group-section-control-input'
+                value={this.state.config.editor.matchingPairs}
+                ref='matchingPairs'
+                onChange={(e) => this.handleUIChange(e)}
+                type='text'
+              />
+            </div>
+          </div>
+
+          <div styleName='group-section'>            
+            <div styleName='group-section-label'>
+              {i18n.__('Matching character triples')}
+            </div>
+            <div styleName='group-section-control'>
+              <input styleName='group-section-control-input'
+                value={this.state.config.editor.matchingTriples}
+                ref='matchingTriples'
+                onChange={(e) => this.handleUIChange(e)}
+                type='text'
+              />
+            </div>
+          </div>
+
+          <div styleName='group-section'>            
+            <div styleName='group-section-label'>
+              {i18n.__('Exploding character pairs')}
+            </div>
+            <div styleName='group-section-control'>
+              <input styleName='group-section-control-input'
+                value={this.state.config.editor.explodingPairs}
+                ref='explodingPairs'
+                onChange={(e) => this.handleUIChange(e)}
+                type='text'
+              />
+            </div>
+          </div>
+
           <div styleName='group-header2'>{i18n.__('Preview')}</div>
           <div styleName='group-section'>
             <div styleName='group-section-label'>
@@ -578,6 +623,7 @@ class UiTab extends React.Component {
               />
             </div>
           </div>
+          
           <div styleName='group-section'>
             <div styleName='group-section-label'>{i18n.__('Code Block Theme')}</div>
             <div styleName='group-section-control'>

From 441c70b388e7505cdacb7286c6bd40676326a164 Mon Sep 17 00:00:00 2001
From: Guilherme Silva <guilhermejosesilva@gmail.com>
Date: Thu, 8 Nov 2018 13:25:22 +0000
Subject: [PATCH 013/159] Removing checkmark and fixed Code Editor indentation

---
 browser/components/CodeEditor.js              | 973 ++++++++++--------
 browser/components/MarkdownEditor.js          |   1 -
 browser/components/MarkdownSplitEditor.js     |   1 -
 browser/main/Detail/SnippetNoteDetail.js      |   1 -
 browser/main/lib/ConfigManager.js             |   1 -
 .../modals/PreferencesModal/SnippetEditor.js  |  15 +-
 .../modals/PreferencesModal/SnippetTab.js     |   1 -
 browser/main/modals/PreferencesModal/UiTab.js |  12 -
 8 files changed, 530 insertions(+), 475 deletions(-)

diff --git a/browser/components/CodeEditor.js b/browser/components/CodeEditor.js
index 3e416ab2..83f64a18 100644
--- a/browser/components/CodeEditor.js
+++ b/browser/components/CodeEditor.js
@@ -1,110 +1,121 @@
-import 'codemirror-mode-elixir'
-
-import {Alignment, options, TableEditor} from '@susisu/mte-kernel'
-import consts from 'browser/lib/consts'
-import convertModeName from 'browser/lib/convertModeName'
-import TextEditorInterface from 'browser/lib/TextEditorInterface'
-import attachmentManagement from 'browser/main/lib/dataApi/attachmentManagement'
-import eventEmitter from 'browser/main/lib/eventEmitter'
-import CodeMirror from 'codemirror'
-import crypto from 'crypto'
-import fs from 'fs'
-import iconv from 'iconv-lite'
-import _ from 'lodash'
 import PropTypes from 'prop-types'
 import React from 'react'
-
-const {ipcRenderer} = require('electron')
+import _ from 'lodash'
+import CodeMirror from 'codemirror'
+import 'codemirror-mode-elixir'
+import attachmentManagement from 'browser/main/lib/dataApi/attachmentManagement'
+import convertModeName from 'browser/lib/convertModeName'
+import {
+  options,
+  TableEditor,
+  Alignment
+} from '@susisu/mte-kernel'
+import TextEditorInterface from 'browser/lib/TextEditorInterface'
+import eventEmitter from 'browser/main/lib/eventEmitter'
+import iconv from 'iconv-lite'
+import crypto from 'crypto'
+import consts from 'browser/lib/consts'
+import fs from 'fs'
+const {
+  ipcRenderer
+} = require('electron')
 import normalizeEditorFontFamily from 'browser/lib/normalizeEditorFontFamily'
 import TurndownService from 'turndown'
-import{gfm} from 'turndown-plugin-gfm'
+import {
+  gfm
+} from 'turndown-plugin-gfm'
 
 CodeMirror.modeURL = '../node_modules/codemirror/mode/%N/%N.js'
 
 const buildCMRulers = (rulers, enableRulers) =>
-    (enableRulers ? rulers.map(ruler => ({column: ruler})) : [])
+  (enableRulers ? rulers.map(ruler => ({
+    column: ruler
+  })) : [])
 
 export default class CodeEditor extends React.Component {
   constructor(props) {
     super(props)
 
-        this.scrollHandler =
-        _.debounce(
-             this.handleScroll.bind(this), 100,
-             {leading: false, trailing: true}) this.changeHandler = e =>
-            this.handleChange(e) this.focusHandler =
-                () => {
-                  ipcRenderer.send('editor:focused', true)
-                } this.blurHandler =
-                    (editor, e) => {
-                      ipcRenderer.send('editor:focused', false)
-                      if (e == null) return null
-                      let el = e.relatedTarget
-                      while (el != null) {
-                        if (el === this.refs.root) {
-                          return
-                        }
-                        el = el.parentNode
-                      }
-                      this.props.onBlur != null && this.props.onBlur(e)
+    this.scrollHandler = _.debounce(this.handleScroll.bind(this), 100, {
+      leading: false,
+      trailing: true
+    })
+    this.changeHandler = e => this.handleChange(e)
+    this.focusHandler = () => {
+      ipcRenderer.send('editor:focused', true)
+    }
+    this.blurHandler = (editor, e) => {
+      ipcRenderer.send('editor:focused', false)
+      if (e == null) return null
+      let el = e.relatedTarget
+      while (el != null) {
+        if (el === this.refs.root) {
+          return
+        }
+        el = el.parentNode
+      }
+      this.props.onBlur != null && this.props.onBlur(e)
 
-                      const {storageKey, noteKey} = this.props
-                      attachmentManagement.deleteAttachmentsNotPresentInNote(
-                          this.editor.getValue(), storageKey, noteKey)
-                    } this.pasteHandler = (editor, e) =>
-                        this.handlePaste(editor, e) this.loadStyleHandler =
-                            e => {
-                              this.editor.refresh()
-                            } this.searchHandler = (e, msg) =>
-                                this.handleSearch(msg) this.searchState =
-                                    null this.scrollToLineHandeler =
-                                        this.scrollToLine
-                                            .bind(this)
+      const {
+        storageKey,
+        noteKey
+      } = this.props
+      attachmentManagement.deleteAttachmentsNotPresentInNote(
+        this.editor.getValue(),
+        storageKey,
+        noteKey
+      )
+    }
+    this.pasteHandler = (editor, e) => this.handlePaste(editor, e)
+    this.loadStyleHandler = e => {
+      this.editor.refresh()
+    }
+    this.searchHandler = (e, msg) => this.handleSearch(msg)
+    this.searchState = null
+    this.scrollToLineHandeler = this.scrollToLine.bind(this)
 
-                                                this.formatTable = () =>
-                                            this.handleFormatTable() this
-                                                .editorActivityHandler = () =>
-                                                this.handleEditorActivity()
+    this.formatTable = () => this.handleFormatTable()
+    this.editorActivityHandler = () => this.handleEditorActivity()
   }
 
   handleSearch(msg) {
     const cm = this.editor
     const component = this
 
-        if (component.searchState)
-    cm.removeOverlay(component.searchState)
+    if (component.searchState) cm.removeOverlay(component.searchState)
     if (msg.length < 3) return
 
-        cm.operation(function() {
-          component.searchState = makeOverlay(msg, 'searching')
-          cm.addOverlay(component.searchState)
+    cm.operation(function () {
+      component.searchState = makeOverlay(msg, 'searching')
+      cm.addOverlay(component.searchState)
 
-          function makeOverlay(query, style) {
-            query = new RegExp(
-                query.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, '\\$&'),
-                'gi')
-            return {
-              token: function(stream) {
-                query.lastIndex = stream.pos
-                var match = query.exec(stream.string)
-                if (match && match.index === stream.pos) {
-                  stream.pos += match[0].length || 1
-                  return style
-                }
-                else if (match) {
-                  stream.pos = match.index
-                }
-                else {
-                  stream.skipToEnd()
-                }
-              }
+      function makeOverlay(query, style) {
+        query = new RegExp(
+          query.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, '\\$&'),
+          'gi'
+        )
+        return {
+          token: function (stream) {
+            query.lastIndex = stream.pos
+            var match = query.exec(stream.string)
+            if (match && match.index === stream.pos) {
+              stream.pos += match[0].length || 1
+              return style
+            } else if (match) {
+              stream.pos = match.index
+            } else {
+              stream.skipToEnd()
             }
           }
-        })
+        }
+      }
+    })
   }
 
   handleFormatTable() {
-    this.tableEditor.formatAll(options({textWidthOptions: {}}))
+    this.tableEditor.formatAll(options({
+      textWidthOptions: {}
+    }))
   }
 
   handleEditorActivity() {
@@ -117,23 +128,23 @@ export default class CodeEditor extends React.Component {
     const active = this.tableEditor.cursorIsInTable(this.tableEditorOptions)
     if (active) {
       if (this.extraKeysMode !== 'editor') {
-        this.extraKeysMode =
-            'editor' this.editor.setOption('extraKeys', this.editorKeyMap)
+        this.extraKeysMode = 'editor'
+        this.editor.setOption('extraKeys', this.editorKeyMap)
       }
-    }
-    else {
+    } else {
       if (this.extraKeysMode !== 'default') {
-        this.extraKeysMode =
-            'default' this.editor
-                .setOption(
-                    'extraKeys',
-                    this.defaultKeyMap) this.tableEditor.resetSmartCursor()
+        this.extraKeysMode = 'default'
+        this.editor.setOption('extraKeys', this.defaultKeyMap)
+        this.tableEditor.resetSmartCursor()
       }
     }
   }
 
   componentDidMount() {
-    const {rulers, enableRulers} = this.props
+    const {
+      rulers,
+      enableRulers
+    } = this.props
     const expandSnippet = this.expandSnippet.bind(this)
     eventEmitter.on('line:jump', this.scrollToLineHandeler)
 
@@ -141,99 +152,104 @@ export default class CodeEditor extends React.Component {
       id: crypto.randomBytes(16).toString('hex'),
       name: 'Dummy text',
       prefix: ['lorem', 'ipsum'],
-      content:
-          'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.'
-    }] if (!fs.existsSync(consts.SNIPPET_FILE)) {
+      content: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.'
+    }]
+    if (!fs.existsSync(consts.SNIPPET_FILE)) {
       fs.writeFileSync(
-          consts.SNIPPET_FILE, JSON.stringify(defaultSnippet, null, 4), 'utf8')
+        consts.SNIPPET_FILE,
+        JSON.stringify(defaultSnippet, null, 4),
+        'utf8'
+      )
     }
 
-    this.defaultKeyMap =
-        CodeMirror
-            .normalizeKeyMap({
-              Tab: function(cm) {
-                const cursor = cm.getCursor()
-                const line = cm.getLine(cursor.line)
-                const cursorPosition = cursor.ch
-                const charBeforeCursor = line.substr(cursorPosition - 1, 1)
-                if (cm.somethingSelected()) cm.indentSelection('add') else {
-                  const tabs = cm.getOption('indentWithTabs')
-                  if (line.trimLeft().match(/^(-|\*|\+) (\[( |x)] )?$/)) {
-                    cm.execCommand('goLineStart')
-                    if (tabs) {
-                      cm.execCommand('insertTab')
-                    }
-                    else {cm.execCommand('insertSoftTab')} cm.execCommand(
-                        'goLineEnd')
-                  }
-                  else if (
-                      !charBeforeCursor.match(/\t|\s|\r|\n/) && cursor.ch > 1) {
-                    // text expansion on tab key if the char before is alphabet
-                    const snippets =
-                        JSON.parse(fs.readFileSync(consts.SNIPPET_FILE, 'utf8'))
-                    if (expandSnippet(line, cursor, cm, snippets) === false) {
-                      if (tabs) {
-                        cm.execCommand('insertTab')
-                      } else {
-                        cm.execCommand('insertSoftTab')
-                      }
-                    }
-                  }
-                  else {
-                    if (tabs) {
-                      cm.execCommand('insertTab')
-                    } else {
-                      cm.execCommand('insertSoftTab')
-                    }
-                  }
-                }
-              },
-              'Cmd-T': function(cm) {
-                // Do nothing
-              },
-              Enter: 'boostNewLineAndIndentContinueMarkdownList',
-              'Ctrl-C': cm => {
-                if (cm.getOption('keyMap').substr(0, 3) === 'vim') {
-                  document.execCommand('copy')
-                }
-                return CodeMirror.Pass
+    this.defaultKeyMap = CodeMirror.normalizeKeyMap({
+      Tab: function (cm) {
+        const cursor = cm.getCursor()
+        const line = cm.getLine(cursor.line)
+        const cursorPosition = cursor.ch
+        const charBeforeCursor = line.substr(cursorPosition - 1, 1)
+        if (cm.somethingSelected()) cm.indentSelection('add')
+        else {
+          const tabs = cm.getOption('indentWithTabs')
+          if (line.trimLeft().match(/^(-|\*|\+) (\[( |x)] )?$/)) {
+            cm.execCommand('goLineStart')
+            if (tabs) {
+              cm.execCommand('insertTab')
+            } else {
+              cm.execCommand('insertSoftTab')
+            }
+            cm.execCommand('goLineEnd')
+          } else if (
+            !charBeforeCursor.match(/\t|\s|\r|\n/) &&
+            cursor.ch > 1
+          ) {
+            // text expansion on tab key if the char before is alphabet
+            const snippets = JSON.parse(
+              fs.readFileSync(consts.SNIPPET_FILE, 'utf8')
+            )
+            if (expandSnippet(line, cursor, cm, snippets) === false) {
+              if (tabs) {
+                cm.execCommand('insertTab')
+              } else {
+                cm.execCommand('insertSoftTab')
               }
-            })
+            }
+          } else {
+            if (tabs) {
+              cm.execCommand('insertTab')
+            } else {
+              cm.execCommand('insertSoftTab')
+            }
+          }
+        }
+      },
+      'Cmd-T': function (cm) {
+        // Do nothing
+      },
+      Enter: 'boostNewLineAndIndentContinueMarkdownList',
+      'Ctrl-C': cm => {
+        if (cm.getOption('keyMap').substr(0, 3) === 'vim') {
+          document.execCommand('copy')
+        }
+        return CodeMirror.Pass
+      }
+    })
 
-                this.value = this.props.value this.editor =
-            CodeMirror(this.refs.root, {
-              rulers: buildCMRulers(rulers, enableRulers),
-              value: this.props.value,
-              lineNumbers: this.props.displayLineNumbers,
-              lineWrapping: true,
-              theme: this.props.theme,
-              indentUnit: this.props.indentSize,
-              tabSize: this.props.indentSize,
-              indentWithTabs: this.props.indentType !== 'space',
-              keyMap: this.props.keyMap,
-              scrollPastEnd: this.props.scrollPastEnd,
-              inputStyle: 'textarea',
-              dragDrop: false,
-              foldGutter: true,
-              gutters: ['CodeMirror-linenumbers', 'CodeMirror-foldgutter'],
-              autoCloseBrackets: {
-                pairs: this.props.matchingPairs,
-                triples: this.props.matchingTriples,
-                explode: this.props.explodingPairs,
-                override: true
-              },
-              extraKeys: this.defaultKeyMap
-            })
+    this.value = this.props.value
+    this.editor = CodeMirror(this.refs.root, {
+      rulers: buildCMRulers(rulers, enableRulers),
+      value: this.props.value,
+      lineNumbers: this.props.displayLineNumbers,
+      lineWrapping: true,
+      theme: this.props.theme,
+      indentUnit: this.props.indentSize,
+      tabSize: this.props.indentSize,
+      indentWithTabs: this.props.indentType !== 'space',
+      keyMap: this.props.keyMap,
+      scrollPastEnd: this.props.scrollPastEnd,
+      inputStyle: 'textarea',
+      dragDrop: false,
+      foldGutter: true,
+      gutters: ['CodeMirror-linenumbers', 'CodeMirror-foldgutter'],
+      autoCloseBrackets: {
+        pairs: this.props.matchingPairs,
+        triples: this.props.matchingTriples,
+        explode: this.props.explodingPairs,
+        override: true
+      },
+      extraKeys: this.defaultKeyMap
+    })
 
-                this.setMode(this.props.mode)
+    this.setMode(this.props.mode)
 
-                    this.editor.on('focus', this.focusHandler) this.editor
-                        .on('blur', this.blurHandler) this.editor
-                        .on('change', this.changeHandler) this.editor.on(
-                            'paste', this.pasteHandler)
+    this.editor.on('focus', this.focusHandler)
+    this.editor.on('blur', this.blurHandler)
+    this.editor.on('change', this.changeHandler)
+    this.editor.on('paste', this.pasteHandler)
     eventEmitter.on('top:search', this.searchHandler)
 
-    eventEmitter.emit('code:init') this.editor.on('scroll', this.scrollHandler)
+    eventEmitter.emit('code:init')
+    this.editor.on('scroll', this.scrollHandler)
 
     const editorTheme = document.getElementById('editorTheme')
     editorTheme.addEventListener('load', this.loadStyleHandler)
@@ -242,151 +258,146 @@ export default class CodeEditor extends React.Component {
     CodeMirror.Vim.defineEx('q!', 'q!', this.quitEditor)
     CodeMirror.Vim.defineEx('wq', 'wq', this.quitEditor)
     CodeMirror.Vim.defineEx('qw', 'qw', this.quitEditor)
-    CodeMirror.Vim
-        .map('ZZ', ':q', 'normal')
+    CodeMirror.Vim.map('ZZ', ':q', 'normal')
 
-            this.textEditorInterface =
-        new TextEditorInterface(this.editor) this.tableEditor =
-            new TableEditor(this.textEditorInterface)
-    eventEmitter
-        .on('code:format-table', this.formatTable)
+    this.textEditorInterface = new TextEditorInterface(this.editor)
+    this.tableEditor = new TableEditor(this.textEditorInterface)
+    eventEmitter.on('code:format-table', this.formatTable)
 
-            this.tableEditorOptions = options({smartCursor: true})
+    this.tableEditorOptions = options({
+      smartCursor: true
+    })
 
-                                          this.editorKeyMap =
-        CodeMirror.normalizeKeyMap({
-          'Tab': () => {
-            this.tableEditor.nextCell(this.tableEditorOptions)
-          },
-          'Shift-Tab': () => {
-            this.tableEditor.previousCell(this.tableEditorOptions)
-          },
-          'Enter': () => {
-            this.tableEditor.nextRow(this.tableEditorOptions)
-          },
-          'Ctrl-Enter': () => {
-            this.tableEditor.escape(this.tableEditorOptions)
-          },
-          'Cmd-Enter': () => {
-            this.tableEditor.escape(this.tableEditorOptions)
-          },
-          'Shift-Ctrl-Left': () => {
-            this.tableEditor.alignColumn(
-                Alignment.LEFT, this.tableEditorOptions)
-          },
-          'Shift-Cmd-Left': () => {
-            this.tableEditor.alignColumn(
-                Alignment.LEFT, this.tableEditorOptions)
-          },
-          'Shift-Ctrl-Right': () => {
-            this.tableEditor.alignColumn(
-                Alignment.RIGHT, this.tableEditorOptions)
-          },
-          'Shift-Cmd-Right': () => {
-            this.tableEditor.alignColumn(
-                Alignment.RIGHT, this.tableEditorOptions)
-          },
-          'Shift-Ctrl-Up': () => {
-            this.tableEditor.alignColumn(
-                Alignment.CENTER, this.tableEditorOptions)
-          },
-          'Shift-Cmd-Up': () => {
-            this.tableEditor.alignColumn(
-                Alignment.CENTER, this.tableEditorOptions)
-          },
-          'Shift-Ctrl-Down': () => {
-            this.tableEditor.alignColumn(
-                Alignment.NONE, this.tableEditorOptions)
-          },
-          'Shift-Cmd-Down': () => {
-            this.tableEditor.alignColumn(
-                Alignment.NONE, this.tableEditorOptions)
-          },
-          'Ctrl-Left': () => {
-            this.tableEditor.moveFocus(0, -1, this.tableEditorOptions)
-          },
-          'Cmd-Left': () => {
-            this.tableEditor.moveFocus(0, -1, this.tableEditorOptions)
-          },
-          'Ctrl-Right': () => {
-            this.tableEditor.moveFocus(0, 1, this.tableEditorOptions)
-          },
-          'Cmd-Right': () => {
-            this.tableEditor.moveFocus(0, 1, this.tableEditorOptions)
-          },
-          'Ctrl-Up': () => {
-            this.tableEditor.moveFocus(-1, 0, this.tableEditorOptions)
-          },
-          'Cmd-Up': () => {
-            this.tableEditor.moveFocus(-1, 0, this.tableEditorOptions)
-          },
-          'Ctrl-Down': () => {
-            this.tableEditor.moveFocus(1, 0, this.tableEditorOptions)
-          },
-          'Cmd-Down': () => {
-            this.tableEditor.moveFocus(1, 0, this.tableEditorOptions)
-          },
-          'Ctrl-K Ctrl-I': () => {
-            this.tableEditor.insertRow(this.tableEditorOptions)
-          },
-          'Cmd-K Cmd-I': () => {
-            this.tableEditor.insertRow(this.tableEditorOptions)
-          },
-          'Ctrl-L Ctrl-I': () => {
-            this.tableEditor.deleteRow(this.tableEditorOptions)
-          },
-          'Cmd-L Cmd-I': () => {
-            this.tableEditor.deleteRow(this.tableEditorOptions)
-          },
-          'Ctrl-K Ctrl-J': () => {
-            this.tableEditor.insertColumn(this.tableEditorOptions)
-          },
-          'Cmd-K Cmd-J': () => {
-            this.tableEditor.insertColumn(this.tableEditorOptions)
-          },
-          'Ctrl-L Ctrl-J': () => {
-            this.tableEditor.deleteColumn(this.tableEditorOptions)
-          },
-          'Cmd-L Cmd-J': () => {
-            this.tableEditor.deleteColumn(this.tableEditorOptions)
-          },
-          'Alt-Shift-Ctrl-Left': () => {
-            this.tableEditor.moveColumn(-1, this.tableEditorOptions)
-          },
-          'Alt-Shift-Cmd-Left': () => {
-            this.tableEditor.moveColumn(-1, this.tableEditorOptions)
-          },
-          'Alt-Shift-Ctrl-Right': () => {
-            this.tableEditor.moveColumn(1, this.tableEditorOptions)
-          },
-          'Alt-Shift-Cmd-Right': () => {
-            this.tableEditor.moveColumn(1, this.tableEditorOptions)
-          },
-          'Alt-Shift-Ctrl-Up': () => {
-            this.tableEditor.moveRow(-1, this.tableEditorOptions)
-          },
-          'Alt-Shift-Cmd-Up': () => {
-            this.tableEditor.moveRow(-1, this.tableEditorOptions)
-          },
-          'Alt-Shift-Ctrl-Down': () => {
-            this.tableEditor.moveRow(1, this.tableEditorOptions)
-          },
-          'Alt-Shift-Cmd-Down': () => {
-            this.tableEditor.moveRow(1, this.tableEditorOptions)
-          }
-        })
+    this.editorKeyMap = CodeMirror.normalizeKeyMap({
+      'Tab': () => {
+        this.tableEditor.nextCell(this.tableEditorOptions)
+      },
+      'Shift-Tab': () => {
+        this.tableEditor.previousCell(this.tableEditorOptions)
+      },
+      'Enter': () => {
+        this.tableEditor.nextRow(this.tableEditorOptions)
+      },
+      'Ctrl-Enter': () => {
+        this.tableEditor.escape(this.tableEditorOptions)
+      },
+      'Cmd-Enter': () => {
+        this.tableEditor.escape(this.tableEditorOptions)
+      },
+      'Shift-Ctrl-Left': () => {
+        this.tableEditor.alignColumn(Alignment.LEFT, this.tableEditorOptions)
+      },
+      'Shift-Cmd-Left': () => {
+        this.tableEditor.alignColumn(Alignment.LEFT, this.tableEditorOptions)
+      },
+      'Shift-Ctrl-Right': () => {
+        this.tableEditor.alignColumn(Alignment.RIGHT, this.tableEditorOptions)
+      },
+      'Shift-Cmd-Right': () => {
+        this.tableEditor.alignColumn(Alignment.RIGHT, this.tableEditorOptions)
+      },
+      'Shift-Ctrl-Up': () => {
+        this.tableEditor.alignColumn(Alignment.CENTER, this.tableEditorOptions)
+      },
+      'Shift-Cmd-Up': () => {
+        this.tableEditor.alignColumn(Alignment.CENTER, this.tableEditorOptions)
+      },
+      'Shift-Ctrl-Down': () => {
+        this.tableEditor.alignColumn(Alignment.NONE, this.tableEditorOptions)
+      },
+      'Shift-Cmd-Down': () => {
+        this.tableEditor.alignColumn(Alignment.NONE, this.tableEditorOptions)
+      },
+      'Ctrl-Left': () => {
+        this.tableEditor.moveFocus(0, -1, this.tableEditorOptions)
+      },
+      'Cmd-Left': () => {
+        this.tableEditor.moveFocus(0, -1, this.tableEditorOptions)
+      },
+      'Ctrl-Right': () => {
+        this.tableEditor.moveFocus(0, 1, this.tableEditorOptions)
+      },
+      'Cmd-Right': () => {
+        this.tableEditor.moveFocus(0, 1, this.tableEditorOptions)
+      },
+      'Ctrl-Up': () => {
+        this.tableEditor.moveFocus(-1, 0, this.tableEditorOptions)
+      },
+      'Cmd-Up': () => {
+        this.tableEditor.moveFocus(-1, 0, this.tableEditorOptions)
+      },
+      'Ctrl-Down': () => {
+        this.tableEditor.moveFocus(1, 0, this.tableEditorOptions)
+      },
+      'Cmd-Down': () => {
+        this.tableEditor.moveFocus(1, 0, this.tableEditorOptions)
+      },
+      'Ctrl-K Ctrl-I': () => {
+        this.tableEditor.insertRow(this.tableEditorOptions)
+      },
+      'Cmd-K Cmd-I': () => {
+        this.tableEditor.insertRow(this.tableEditorOptions)
+      },
+      'Ctrl-L Ctrl-I': () => {
+        this.tableEditor.deleteRow(this.tableEditorOptions)
+      },
+      'Cmd-L Cmd-I': () => {
+        this.tableEditor.deleteRow(this.tableEditorOptions)
+      },
+      'Ctrl-K Ctrl-J': () => {
+        this.tableEditor.insertColumn(this.tableEditorOptions)
+      },
+      'Cmd-K Cmd-J': () => {
+        this.tableEditor.insertColumn(this.tableEditorOptions)
+      },
+      'Ctrl-L Ctrl-J': () => {
+        this.tableEditor.deleteColumn(this.tableEditorOptions)
+      },
+      'Cmd-L Cmd-J': () => {
+        this.tableEditor.deleteColumn(this.tableEditorOptions)
+      },
+      'Alt-Shift-Ctrl-Left': () => {
+        this.tableEditor.moveColumn(-1, this.tableEditorOptions)
+      },
+      'Alt-Shift-Cmd-Left': () => {
+        this.tableEditor.moveColumn(-1, this.tableEditorOptions)
+      },
+      'Alt-Shift-Ctrl-Right': () => {
+        this.tableEditor.moveColumn(1, this.tableEditorOptions)
+      },
+      'Alt-Shift-Cmd-Right': () => {
+        this.tableEditor.moveColumn(1, this.tableEditorOptions)
+      },
+      'Alt-Shift-Ctrl-Up': () => {
+        this.tableEditor.moveRow(-1, this.tableEditorOptions)
+      },
+      'Alt-Shift-Cmd-Up': () => {
+        this.tableEditor.moveRow(-1, this.tableEditorOptions)
+      },
+      'Alt-Shift-Ctrl-Down': () => {
+        this.tableEditor.moveRow(1, this.tableEditorOptions)
+      },
+      'Alt-Shift-Cmd-Down': () => {
+        this.tableEditor.moveRow(1, this.tableEditorOptions)
+      }
+    })
 
     if (this.props.enableTableEditor) {
-      this.editor.on('cursorActivity', this.editorActivityHandler) this.editor
-          .on('changes', this.editorActivityHandler)
+      this.editor.on('cursorActivity', this.editorActivityHandler)
+      this.editor.on('changes', this.editorActivityHandler)
     }
 
-    this.setState({clientWidth: this.refs.root.clientWidth})
+    this.setState({
+      clientWidth: this.refs.root.clientWidth
+    })
   }
 
   expandSnippet(line, cursor, cm, snippets) {
-    const wordBeforeCursor =
-        this.getWordBeforeCursor(line, cursor.line, cursor.ch)
+    const wordBeforeCursor = this.getWordBeforeCursor(
+      line,
+      cursor.line,
+      cursor.ch
+    )
     const templateCursorString = ':{}'
     for (let i = 0; i < snippets.length; i++) {
       if (snippets[i].prefix.indexOf(wordBeforeCursor.text) !== -1) {
@@ -400,8 +411,10 @@ export default class CodeEditor extends React.Component {
               cursorLineNumber = j
               cursorLinePosition = cursorIndex
               cm.replaceRange(
-                  snippets[i].content.replace(templateCursorString, ''),
-                  wordBeforeCursor.range.from, wordBeforeCursor.range.to)
+                snippets[i].content.replace(templateCursorString, ''),
+                wordBeforeCursor.range.from,
+                wordBeforeCursor.range.to
+              )
               cm.setCursor({
                 line: cursor.line + cursorLineNumber,
                 ch: cursorLinePosition
@@ -410,8 +423,10 @@ export default class CodeEditor extends React.Component {
           }
         } else {
           cm.replaceRange(
-              snippets[i].content, wordBeforeCursor.range.from,
-              wordBeforeCursor.range.to)
+            snippets[i].content,
+            wordBeforeCursor.range.from,
+            wordBeforeCursor.range.to
+          )
         }
         return true
       }
@@ -426,8 +441,7 @@ export default class CodeEditor extends React.Component {
     const emptyChars = /\t|\s|\r|\n/
 
     // to prevent the word to expand is long that will crash the whole app
-    // the safeStop is there to stop user to expand words that longer than 20
-    // chars
+    // the safeStop is there to stop user to expand words that longer than 20 chars
     const safeStop = 20
 
     while (cursorPosition > 0) {
@@ -435,17 +449,25 @@ export default class CodeEditor extends React.Component {
       // if char is not an empty char
       if (!emptyChars.test(currentChar)) {
         wordBeforeCursor = currentChar + wordBeforeCursor
-      }
-      else if (wordBeforeCursor.length >= safeStop) {
+      } else if (wordBeforeCursor.length >= safeStop) {
         throw new Error('Your snippet trigger is too long !')
+      } else {
+        break
       }
-      else {break} cursorPosition--
+      cursorPosition--
     }
 
     return {
-      text: wordBeforeCursor, range: {
-        from: {line: lineNumber, ch: originCursorPosition},
-        to: {line: lineNumber, ch: cursorPosition}
+      text: wordBeforeCursor,
+      range: {
+        from: {
+          line: lineNumber,
+          ch: originCursorPosition
+        },
+        to: {
+          line: lineNumber,
+          ch: cursorPosition
+        }
       }
     }
   }
@@ -455,12 +477,12 @@ export default class CodeEditor extends React.Component {
   }
 
   componentWillUnmount() {
-    this.editor.off('focus', this.focusHandler) this.editor
-        .off('blur', this.blurHandler) this.editor
-        .off('change', this.changeHandler) this.editor.off(
-            'paste', this.pasteHandler)
-    eventEmitter.off('top:search', this.searchHandler) this.editor.off(
-        'scroll', this.scrollHandler)
+    this.editor.off('focus', this.focusHandler)
+    this.editor.off('blur', this.blurHandler)
+    this.editor.off('change', this.changeHandler)
+    this.editor.off('paste', this.pasteHandler)
+    eventEmitter.off('top:search', this.searchHandler)
+    this.editor.off('scroll', this.scrollHandler)
     const editorTheme = document.getElementById('editorTheme')
     editorTheme.removeEventListener('load', this.loadStyleHandler)
 
@@ -469,7 +491,10 @@ export default class CodeEditor extends React.Component {
 
   componentDidUpdate(prevProps, prevState) {
     let needRefresh = false
-    const {rulers, enableRulers} = this.props
+    const {
+      rulers,
+      enableRulers
+    } = this.props
     if (prevProps.mode !== this.props.mode) {
       this.setMode(this.props.mode)
     }
@@ -487,14 +512,16 @@ export default class CodeEditor extends React.Component {
       needRefresh = true
     }
 
-    if (prevProps.enableRulers !== enableRulers ||
-        prevProps.rulers !== rulers) {
+    if (
+      prevProps.enableRulers !== enableRulers ||
+      prevProps.rulers !== rulers
+    ) {
       this.editor.setOption('rulers', buildCMRulers(rulers, enableRulers))
     }
 
     if (prevProps.indentSize !== this.props.indentSize) {
-      this.editor.setOption('indentUnit', this.props.indentSize) this.editor
-          .setOption('tabSize', this.props.indentSize)
+      this.editor.setOption('indentUnit', this.props.indentSize)
+      this.editor.setOption('tabSize', this.props.indentSize)
     }
     if (prevProps.indentType !== this.props.indentType) {
       this.editor.setOption('indentWithTabs', this.props.indentType !== 'space')
@@ -509,9 +536,9 @@ export default class CodeEditor extends React.Component {
     }
 
     if (prevProps.matchingPairs !== this.props.matchingPairs ||
-        prevProps.matchingTriples !== this.props.matchingTriples ||
-        prevProps.explodingPairs !== this.props.explodingPairs) {
-      const bracketObject = {
+      prevProps.matchingTriples !== this.props.matchingTriples ||
+      prevProps.explodingPairs !== this.props.explodingPairs) {
+      const bracketObject ={
         pairs: this.props.matchingPairs,
         triples: this.props.matchingTriples,
         explode: this.props.explodingPairs,
@@ -522,19 +549,21 @@ export default class CodeEditor extends React.Component {
 
     if (prevProps.enableTableEditor !== this.props.enableTableEditor) {
       if (this.props.enableTableEditor) {
-        this.editor.on('cursorActivity', this.editorActivityHandler) this.editor
-            .on('changes', this.editorActivityHandler)
+        this.editor.on('cursorActivity', this.editorActivityHandler)
+        this.editor.on('changes', this.editorActivityHandler)
       } else {
-        this.editor.off('cursorActivity', this.editorActivityHandler) this
-            .editor.off('changes', this.editorActivityHandler)
+        this.editor.off('cursorActivity', this.editorActivityHandler)
+        this.editor.off('changes', this.editorActivityHandler)
       }
 
-      this.extraKeysMode =
-          'default' this.editor.setOption('extraKeys', this.defaultKeyMap)
+      this.extraKeysMode = 'default'
+      this.editor.setOption('extraKeys', this.defaultKeyMap)
     }
 
     if (this.state.clientWidth !== this.refs.root.clientWidth) {
-      this.setState({clientWidth: this.refs.root.clientWidth})
+      this.setState({
+        clientWidth: this.refs.root.clientWidth
+      })
 
       needRefresh = true
     }
@@ -546,11 +575,9 @@ export default class CodeEditor extends React.Component {
 
   setMode(mode) {
     let syntax = CodeMirror.findModeByName(convertModeName(mode))
-    if (syntax == null) syntax =
-        CodeMirror
-            .findModeByName('Plain Text')
+    if (syntax == null) syntax = CodeMirror.findModeByName('Plain Text')
 
-                this.editor.setOption('mode', syntax.mime)
+    this.editor.setOption('mode', syntax.mime)
     CodeMirror.autoLoadMode(this.editor, syntax.mode)
   }
 
@@ -564,7 +591,11 @@ export default class CodeEditor extends React.Component {
   moveCursorTo(row, col) {}
 
   scrollToLine(event, num) {
-    const cursor = { line: num, ch: 1 } this.editor.setCursor(cursor)
+    const cursor = {
+      line: num,
+      ch: 1
+    }
+    this.editor.setCursor(cursor)
   }
 
   focus() {
@@ -577,22 +608,32 @@ export default class CodeEditor extends React.Component {
 
   reload() {
     // Change event shouldn't be fired when switch note
-    this.editor.off('change', this.changeHandler) this.value =
-        this.props.value this.editor.setValue(this.props.value) this.editor
-            .clearHistory() this.editor.on('change', this.changeHandler) this
-            .editor.refresh()
+    this.editor.off('change', this.changeHandler)
+    this.value = this.props.value
+    this.editor.setValue(this.props.value)
+    this.editor.clearHistory()
+    this.editor.on('change', this.changeHandler)
+    this.editor.refresh()
   }
 
   setValue(value) {
-    const cursor = this.editor.getCursor() this.editor.setValue(value) this
-                       .editor.setCursor(cursor)
+    const cursor = this.editor.getCursor()
+    this.editor.setValue(value)
+    this.editor.setCursor(cursor)
   }
 
   handleDropImage(dropEvent) {
     dropEvent.preventDefault()
-    const {storageKey, noteKey} = this.props
+    const {
+      storageKey,
+      noteKey
+    } = this.props
     attachmentManagement.handleAttachmentDrop(
-        this, storageKey, noteKey, dropEvent)
+      this,
+      storageKey,
+      noteKey,
+      dropEvent
+    )
   }
 
   insertAttachmentMd(imageMd) {
@@ -601,43 +642,59 @@ export default class CodeEditor extends React.Component {
 
   handlePaste(editor, e) {
     const clipboardData = e.clipboardData
-    const {storageKey, noteKey} = this.props
-    const dataTransferItem = clipboardData.items[0] const pastedTxt =
-        clipboardData.getData('text')
-    const isURL =
-        str => {
-          const matcher =
-              /^(?:\w+:)?\/\/([^\s\.]+\.\S{2}|localhost[\:?\d]*)\S*$/
-          return matcher.test(str)
-        } const isInLinkTag =
-            editor => {
-              const startCursor = editor.getCursor('start')
-              const prevChar = editor.getRange(
-                  {line: startCursor.line, ch: startCursor.ch - 2},
-                  {line: startCursor.line, ch: startCursor.ch})
-              const endCursor = editor.getCursor('end')
-              const nextChar = editor.getRange(
-                  {line: endCursor.line, ch: endCursor.ch},
-                  {line: endCursor.line, ch: endCursor.ch + 1})
-              return prevChar === '](' && nextChar === ')'
-            }
+    const {
+      storageKey,
+      noteKey
+    } = this.props
+    const dataTransferItem = clipboardData.items[0]
+    const pastedTxt = clipboardData.getData('text')
+    const isURL = str => {
+      const matcher = /^(?:\w+:)?\/\/([^\s\.]+\.\S{2}|localhost[\:?\d]*)\S*$/
+      return matcher.test(str)
+    }
+    const isInLinkTag = editor => {
+      const startCursor = editor.getCursor('start')
+      const prevChar = editor.getRange({
+        line: startCursor.line,
+        ch: startCursor.ch - 2
+      }, {
+        line: startCursor.line,
+        ch: startCursor.ch
+      })
+      const endCursor = editor.getCursor('end')
+      const nextChar = editor.getRange({
+        line: endCursor.line,
+        ch: endCursor.ch
+      }, {
+        line: endCursor.line,
+        ch: endCursor.ch + 1
+      })
+      return prevChar === '](' && nextChar === ')'
+    }
 
     const pastedHtml = clipboardData.getData('text/html')
     if (pastedHtml !== '') {
       this.handlePasteHtml(e, editor, pastedHtml)
-    }
-    else if (dataTransferItem.type.match('image')) {
+    } else if (dataTransferItem.type.match('image')) {
       attachmentManagement.handlePastImageEvent(
-          this, storageKey, noteKey, dataTransferItem)
-    }
-    else if (
-        this.props.fetchUrlTitle && isURL(pastedTxt) && !isInLinkTag(editor)) {
+        this,
+        storageKey,
+        noteKey,
+        dataTransferItem
+      )
+    } else if (
+      this.props.fetchUrlTitle &&
+      isURL(pastedTxt) &&
+      !isInLinkTag(editor)
+    ) {
       this.handlePasteUrl(e, editor, pastedTxt)
     }
     if (attachmentManagement.isAttachmentLink(pastedTxt)) {
       attachmentManagement
-          .handleAttachmentLinkPaste(storageKey, noteKey, pastedTxt)
-          .then(modifiedText => {this.editor.replaceSelection(modifiedText)})
+        .handleAttachmentLinkPaste(storageKey, noteKey, pastedTxt)
+        .then(modifiedText => {
+          this.editor.replaceSelection(modifiedText)
+        })
       e.preventDefault()
     }
   }
@@ -653,36 +710,39 @@ export default class CodeEditor extends React.Component {
     const taggedUrl = `<${pastedTxt}>`
     editor.replaceSelection(taggedUrl)
 
-    const isImageReponse =
-        response => {
-          return (
-              response.headers.has('content-type') &&
-              response.headers.get('content-type').match(/^image\/.+$/))
-        } const replaceTaggedUrl =
-            replacement => {
-              const value = editor.getValue()
-              const cursor = editor.getCursor()
-              const newValue = value.replace(taggedUrl, replacement)
-              const newCursor = Object.assign(
-                  {}, cursor, {ch: cursor.ch + newValue.length - value.length})
-              editor.setValue(newValue)
-              editor.setCursor(newCursor)
-            }
+    const isImageReponse = response => {
+      return (
+        response.headers.has('content-type') &&
+        response.headers.get('content-type').match(/^image\/.+$/)
+      )
+    }
+    const replaceTaggedUrl = replacement => {
+      const value = editor.getValue()
+      const cursor = editor.getCursor()
+      const newValue = value.replace(taggedUrl, replacement)
+      const newCursor = Object.assign({}, cursor, {
+        ch: cursor.ch + newValue.length - value.length
+      })
+      editor.setValue(newValue)
+      editor.setCursor(newCursor)
+    }
 
-                           fetch(pastedTxt, {method: 'get'})
-                               .then(response => {
-                                 if (isImageReponse(response)) {
-                                   return this.mapImageResponse(
-                                       response, pastedTxt)
-                                 } else {
-                                   return this.mapNormalResponse(
-                                       response, pastedTxt)
-                                 }
-                               })
-                               .then(
-                                   replacement => {
-                                       replaceTaggedUrl(replacement)})
-                               .catch(e => {replaceTaggedUrl(pastedTxt)})
+    fetch(pastedTxt, {
+        method: 'get'
+      })
+      .then(response => {
+        if (isImageReponse(response)) {
+          return this.mapImageResponse(response, pastedTxt)
+        } else {
+          return this.mapNormalResponse(response, pastedTxt)
+        }
+      })
+      .then(replacement => {
+        replaceTaggedUrl(replacement)
+      })
+      .catch(e => {
+        replaceTaggedUrl(pastedTxt)
+      })
   }
 
   handlePasteHtml(e, editor, pastedHtml) {
@@ -692,21 +752,23 @@ export default class CodeEditor extends React.Component {
   }
 
   mapNormalResponse(response, pastedTxt) {
-    return this.decodeResponse(response).then(
-        body => {return new Promise((resolve, reject) => {
-          try {
-            const parsedBody =
-                new window.DOMParser().parseFromString(body, 'text/html')
-            const escapePipe =
-                (str) => {
-                  return str.replace('|', '\\|')
-                } const linkWithTitle =
-                    `[${escapePipe(parsedBody.title)}](${pastedTxt})`
-            resolve(linkWithTitle)
-          } catch (e) {
-            reject(e)
+    return this.decodeResponse(response).then(body => {
+      return new Promise((resolve, reject) => {
+        try {
+          const parsedBody = new window.DOMParser().parseFromString(
+            body,
+            'text/html'
+          )
+          const escapePipe = (str) => {
+            return str.replace('|', '\\|')
           }
-        })})
+          const linkWithTitle = `[${escapePipe(parsedBody.title)}](${pastedTxt})`
+          resolve(linkWithTitle)
+        } catch (e) {
+          reject(e)
+        }
+      })
+    })
   }
 
   mapImageResponse(response, pastedTxt) {
@@ -725,30 +787,39 @@ export default class CodeEditor extends React.Component {
   decodeResponse(response) {
     const headers = response.headers
     const _charset = headers.has('content-type') ?
-        this.extractContentTypeCharset(headers.get('content-type')) :
-        undefined
-    return response.arrayBuffer().then(
-        buff => {return new Promise((resolve, reject) => {
-          try {
-            const charset =
-                _charset !== undefined && iconv.encodingExists(_charset) ?
-                _charset :
-                'utf-8'
-            resolve(iconv.decode(new Buffer(buff), charset).toString())
-          } catch (e) {
-            reject(e)
-          }
-        })})
+      this.extractContentTypeCharset(headers.get('content-type')) :
+      undefined
+    return response.arrayBuffer().then(buff => {
+      return new Promise((resolve, reject) => {
+        try {
+          const charset = _charset !== undefined &&
+            iconv.encodingExists(_charset) ?
+            _charset :
+            'utf-8'
+          resolve(iconv.decode(new Buffer(buff), charset).toString())
+        } catch (e) {
+          reject(e)
+        }
+      })
+    })
   }
 
   extractContentTypeCharset(contentType) {
-    return contentType.split(';')
-        .filter(str => {return str.trim().toLowerCase().startsWith('charset')})
-        .map(str => {return str.replace(/['"]/g, '').split('=')[1]})[0]
+    return contentType
+      .split(';')
+      .filter(str => {
+        return str.trim().toLowerCase().startsWith('charset')
+      })
+      .map(str => {
+        return str.replace(/['"]/g, '').split('=')[1]
+      })[0]
   }
 
   render() {
-    const {className, fontSize} = this.props
+    const {
+      className,
+      fontSize
+    } = this.props
     const fontFamily = normalizeEditorFontFamily(this.props.fontFamily)
     const width = this.props.width
     return ( <
@@ -756,12 +827,18 @@ export default class CodeEditor extends React.Component {
         className == null ? 'CodeEditor' : `CodeEditor ${className}`
       }
       ref = 'root'
-    tabIndex = '-1'
-    style = {
-      { fontFamily, fontSize: fontSize, width: width }
-    } onDrop = {
-      e => this.handleDropImage(e)
-    } />
+      tabIndex = '-1'
+      style = {
+        {
+          fontFamily,
+          fontSize: fontSize,
+          width: width
+        }
+      }
+      onDrop = {
+        e => this.handleDropImage(e)
+      }
+      />
     )
   }
 }
diff --git a/browser/components/MarkdownEditor.js b/browser/components/MarkdownEditor.js
index dcb1b5ea..fcfc636e 100644
--- a/browser/components/MarkdownEditor.js
+++ b/browser/components/MarkdownEditor.js
@@ -268,7 +268,6 @@ class MarkdownEditor extends React.Component {
           enableRulers={config.editor.enableRulers}
           rulers={config.editor.rulers}
           displayLineNumbers={config.editor.displayLineNumbers}
-          enableBracketMatching={config.editor.enableBracketMatching}
           matchingPairs={config.editor.matchingPairs}
           matchingTriples={config.editor.matchingTriples}
           explodingPairs={config.editor.explodingPairs}
diff --git a/browser/components/MarkdownSplitEditor.js b/browser/components/MarkdownSplitEditor.js
index 689799c8..58867bac 100644
--- a/browser/components/MarkdownSplitEditor.js
+++ b/browser/components/MarkdownSplitEditor.js
@@ -158,7 +158,6 @@ class MarkdownSplitEditor extends React.Component {
           fontFamily={config.editor.fontFamily}
           fontSize={editorFontSize}
           displayLineNumbers={config.editor.displayLineNumbers}
-          enableBracketMatching={config.editor.enableBracketMatching}
           matchingPairs={config.editor.matchingPairs}
           matchingTriples={config.editor.matchingTriples}
           explodingPairs={config.editor.explodingPairs}
diff --git a/browser/main/Detail/SnippetNoteDetail.js b/browser/main/Detail/SnippetNoteDetail.js
index 86ce2c7a..d252d274 100644
--- a/browser/main/Detail/SnippetNoteDetail.js
+++ b/browser/main/Detail/SnippetNoteDetail.js
@@ -699,7 +699,6 @@ class SnippetNoteDetail extends React.Component {
             indentType={config.editor.indentType}
             indentSize={editorIndentSize}
             displayLineNumbers={config.editor.displayLineNumbers}
-            enableBracketMatching={config.editor.enableBracketMatching}
             matchingPairs={config.editor.matchingPairs}
             matchingTriples={config.editor.matchingTriples}
             explodingPairs={config.editor.explodingPairs}
diff --git a/browser/main/lib/ConfigManager.js b/browser/main/lib/ConfigManager.js
index c86e9288..942ce93d 100644
--- a/browser/main/lib/ConfigManager.js
+++ b/browser/main/lib/ConfigManager.js
@@ -44,7 +44,6 @@ export const DEFAULT_CONFIG = {
     enableRulers: false,
     rulers: [80, 120],
     displayLineNumbers: true,
-    enableBracketMatching: true,
     matchingPairs:'()[]{}\'\'""$$**``',
     matchingTriples:'```"""\'\'\'',
     explodingPairs:'[]{}``$$',
diff --git a/browser/main/modals/PreferencesModal/SnippetEditor.js b/browser/main/modals/PreferencesModal/SnippetEditor.js
index ec3698c7..071f265f 100644
--- a/browser/main/modals/PreferencesModal/SnippetEditor.js
+++ b/browser/main/modals/PreferencesModal/SnippetEditor.js
@@ -27,17 +27,12 @@ class SnippetEditor extends React.Component {
       dragDrop: false,
       foldGutter: true,
       gutters: ['CodeMirror-linenumbers', 'CodeMirror-foldgutter'],
-      autoCloseBrackets: (this.enableBracketMatching ? {
-        pairs: '()[]{}\'\'""$$**``ll',
-        triples: '```"""\'\'\'',
-        explode: '[]{}``$$',
+      autoCloseBrackets: {
+        pairs: this.props.matchingPairs,
+        triples: this.props.matchingTriples,
+        explode: this.props.explodingPairs,
         override: true
-      }:  {
-        pairs: '',
-        triples: '',
-        explode: '',
-        override: true
-      }),
+      },
       mode: 'null'
     })
     this.cm.setSize('100%', '100%')
diff --git a/browser/main/modals/PreferencesModal/SnippetTab.js b/browser/main/modals/PreferencesModal/SnippetTab.js
index ebd4012e..5f5b0aac 100644
--- a/browser/main/modals/PreferencesModal/SnippetTab.js
+++ b/browser/main/modals/PreferencesModal/SnippetTab.js
@@ -136,7 +136,6 @@ class SnippetTab extends React.Component {
               enableRulers={config.editor.enableRulers}
               rulers={config.editor.rulers}
               displayLineNumbers={config.editor.displayLineNumbers}
-              enableBracketMatching={config.editor.enableBracketMatching}
               matchingPairs={config.editor.matchingPairs}
               matchingTriples={config.editor.matchingTriples}
               explodingPairs={config.editor.explodingPairs}
diff --git a/browser/main/modals/PreferencesModal/UiTab.js b/browser/main/modals/PreferencesModal/UiTab.js
index 2bd0c9d0..ac020238 100644
--- a/browser/main/modals/PreferencesModal/UiTab.js
+++ b/browser/main/modals/PreferencesModal/UiTab.js
@@ -95,7 +95,6 @@ class UiTab extends React.Component {
         enableTableEditor: this.refs.enableTableEditor.checked,
         enableFrontMatterTitle: this.refs.enableFrontMatterTitle.checked,
         frontMatterTitleField: this.refs.frontMatterTitleField.value,
-        enableBracketMatching: this.refs.enableBracketMatching.checked,
         matchingPairs: this.refs.matchingPairs.value,
         matchingTriples: this.refs.matchingTriples.value,
         explodingPairs: this.refs.explodingPairs.value
@@ -543,17 +542,6 @@ class UiTab extends React.Component {
             </label>
           </div>
 
-          <div styleName='group-checkBoxSection'>
-            <label>
-              <input onChange={(e) => this.handleUIChange(e)}
-                checked={this.state.config.editor.enableBracketMatching}
-                ref='enableBracketMatching'
-                type='checkbox'
-              />&nbsp;
-              {i18n.__('Enable bracket matching')}
-            </label>
-          </div>
-
           <div styleName='group-section'>            
             <div styleName='group-section-label'>
               {i18n.__('Matching character pairs')}

From a46c51945973710be2159969256a05ea2db31ed3 Mon Sep 17 00:00:00 2001
From: Guilherme Silva <guilhermejosesilva@gmail.com>
Date: Thu, 8 Nov 2018 14:03:21 +0000
Subject: [PATCH 014/159] Fixing indentations

---
 browser/components/CodeEditor.js | 104 +++++++++++++++----------------
 1 file changed, 52 insertions(+), 52 deletions(-)

diff --git a/browser/components/CodeEditor.js b/browser/components/CodeEditor.js
index 83f64a18..9037c2e2 100644
--- a/browser/components/CodeEditor.js
+++ b/browser/components/CodeEditor.js
@@ -33,7 +33,7 @@ const buildCMRulers = (rulers, enableRulers) =>
   })) : [])
 
 export default class CodeEditor extends React.Component {
-  constructor(props) {
+  constructor (props) {
     super(props)
 
     this.scrollHandler = _.debounce(this.handleScroll.bind(this), 100, {
@@ -78,7 +78,7 @@ export default class CodeEditor extends React.Component {
     this.editorActivityHandler = () => this.handleEditorActivity()
   }
 
-  handleSearch(msg) {
+  handleSearch (msg) {
     const cm = this.editor
     const component = this
 
@@ -89,7 +89,7 @@ export default class CodeEditor extends React.Component {
       component.searchState = makeOverlay(msg, 'searching')
       cm.addOverlay(component.searchState)
 
-      function makeOverlay(query, style) {
+      function makeOverlay (query, style) {
         query = new RegExp(
           query.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, '\\$&'),
           'gi'
@@ -112,19 +112,19 @@ export default class CodeEditor extends React.Component {
     })
   }
 
-  handleFormatTable() {
+  handleFormatTable () {
     this.tableEditor.formatAll(options({
       textWidthOptions: {}
     }))
   }
 
-  handleEditorActivity() {
+  handleEditorActivity () {
     if (!this.textEditorInterface.transaction) {
       this.updateTableEditorState()
     }
   }
 
-  updateTableEditorState() {
+  updateTableEditorState () {
     const active = this.tableEditor.cursorIsInTable(this.tableEditorOptions)
     if (active) {
       if (this.extraKeysMode !== 'editor') {
@@ -140,7 +140,7 @@ export default class CodeEditor extends React.Component {
     }
   }
 
-  componentDidMount() {
+  componentDidMount () {
     const {
       rulers,
       enableRulers
@@ -392,7 +392,7 @@ export default class CodeEditor extends React.Component {
     })
   }
 
-  expandSnippet(line, cursor, cm, snippets) {
+  expandSnippet (line, cursor, cm, snippets) {
     const wordBeforeCursor = this.getWordBeforeCursor(
       line,
       cursor.line,
@@ -435,7 +435,7 @@ export default class CodeEditor extends React.Component {
     return false
   }
 
-  getWordBeforeCursor(line, lineNumber, cursorPosition) {
+  getWordBeforeCursor (line, lineNumber, cursorPosition) {
     let wordBeforeCursor = ''
     const originCursorPosition = cursorPosition
     const emptyChars = /\t|\s|\r|\n/
@@ -472,11 +472,11 @@ export default class CodeEditor extends React.Component {
     }
   }
 
-  quitEditor() {
+  quitEditor () {
     document.querySelector('textarea').blur()
   }
 
-  componentWillUnmount() {
+  componentWillUnmount () {
     this.editor.off('focus', this.focusHandler)
     this.editor.off('blur', this.blurHandler)
     this.editor.off('change', this.changeHandler)
@@ -489,7 +489,7 @@ export default class CodeEditor extends React.Component {
     eventEmitter.off('code:format-table', this.formatTable)
   }
 
-  componentDidUpdate(prevProps, prevState) {
+  componentDidUpdate (prevProps, prevState) {
     let needRefresh = false
     const {
       rulers,
@@ -538,7 +538,7 @@ export default class CodeEditor extends React.Component {
     if (prevProps.matchingPairs !== this.props.matchingPairs ||
       prevProps.matchingTriples !== this.props.matchingTriples ||
       prevProps.explodingPairs !== this.props.explodingPairs) {
-      const bracketObject ={
+      const bracketObject = {
         pairs: this.props.matchingPairs,
         triples: this.props.matchingTriples,
         explode: this.props.explodingPairs,
@@ -573,7 +573,7 @@ export default class CodeEditor extends React.Component {
     }
   }
 
-  setMode(mode) {
+  setMode (mode) {
     let syntax = CodeMirror.findModeByName(convertModeName(mode))
     if (syntax == null) syntax = CodeMirror.findModeByName('Plain Text')
 
@@ -581,16 +581,16 @@ export default class CodeEditor extends React.Component {
     CodeMirror.autoLoadMode(this.editor, syntax.mode)
   }
 
-  handleChange(e) {
+  handleChange (e) {
     this.value = this.editor.getValue()
     if (this.props.onChange) {
       this.props.onChange(e)
     }
   }
 
-  moveCursorTo(row, col) {}
+  moveCursorTo (row, col) {}
 
-  scrollToLine(event, num) {
+  scrollToLine (event, num) {
     const cursor = {
       line: num,
       ch: 1
@@ -598,15 +598,15 @@ export default class CodeEditor extends React.Component {
     this.editor.setCursor(cursor)
   }
 
-  focus() {
+  focus () {
     this.editor.focus()
   }
 
-  blur() {
+  blur () {
     this.editor.blur()
   }
 
-  reload() {
+  reload () {
     // Change event shouldn't be fired when switch note
     this.editor.off('change', this.changeHandler)
     this.value = this.props.value
@@ -616,13 +616,13 @@ export default class CodeEditor extends React.Component {
     this.editor.refresh()
   }
 
-  setValue(value) {
+  setValue (value) {
     const cursor = this.editor.getCursor()
     this.editor.setValue(value)
     this.editor.setCursor(cursor)
   }
 
-  handleDropImage(dropEvent) {
+  handleDropImage (dropEvent) {
     dropEvent.preventDefault()
     const {
       storageKey,
@@ -636,11 +636,11 @@ export default class CodeEditor extends React.Component {
     )
   }
 
-  insertAttachmentMd(imageMd) {
+  insertAttachmentMd (imageMd) {
     this.editor.replaceSelection(imageMd)
   }
 
-  handlePaste(editor, e) {
+  handlePaste (editor, e) {
     const clipboardData = e.clipboardData
     const {
       storageKey,
@@ -699,13 +699,13 @@ export default class CodeEditor extends React.Component {
     }
   }
 
-  handleScroll(e) {
+  handleScroll (e) {
     if (this.props.onScroll) {
       this.props.onScroll(e)
     }
   }
 
-  handlePasteUrl(e, editor, pastedTxt) {
+  handlePasteUrl (e, editor, pastedTxt) {
     e.preventDefault()
     const taggedUrl = `<${pastedTxt}>`
     editor.replaceSelection(taggedUrl)
@@ -728,8 +728,8 @@ export default class CodeEditor extends React.Component {
     }
 
     fetch(pastedTxt, {
-        method: 'get'
-      })
+      method: 'get'
+    })
       .then(response => {
         if (isImageReponse(response)) {
           return this.mapImageResponse(response, pastedTxt)
@@ -745,13 +745,13 @@ export default class CodeEditor extends React.Component {
       })
   }
 
-  handlePasteHtml(e, editor, pastedHtml) {
+  handlePasteHtml (e, editor, pastedHtml) {
     e.preventDefault()
     const markdown = this.turndownService.turndown(pastedHtml)
     editor.replaceSelection(markdown)
   }
 
-  mapNormalResponse(response, pastedTxt) {
+  mapNormalResponse (response, pastedTxt) {
     return this.decodeResponse(response).then(body => {
       return new Promise((resolve, reject) => {
         try {
@@ -771,7 +771,7 @@ export default class CodeEditor extends React.Component {
     })
   }
 
-  mapImageResponse(response, pastedTxt) {
+  mapImageResponse (response, pastedTxt) {
     return new Promise((resolve, reject) => {
       try {
         const url = response.url
@@ -784,18 +784,18 @@ export default class CodeEditor extends React.Component {
     })
   }
 
-  decodeResponse(response) {
+  decodeResponse (response) {
     const headers = response.headers
-    const _charset = headers.has('content-type') ?
-      this.extractContentTypeCharset(headers.get('content-type')) :
-      undefined
+    const _charset = headers.has('content-type')
+      ? this.extractContentTypeCharset(headers.get('content-type'))
+      : undefined
     return response.arrayBuffer().then(buff => {
       return new Promise((resolve, reject) => {
         try {
           const charset = _charset !== undefined &&
-            iconv.encodingExists(_charset) ?
-            _charset :
-            'utf-8'
+            iconv.encodingExists(_charset)
+            ? _charset
+            : 'utf-8'
           resolve(iconv.decode(new Buffer(buff), charset).toString())
         } catch (e) {
           reject(e)
@@ -804,7 +804,7 @@ export default class CodeEditor extends React.Component {
     })
   }
 
-  extractContentTypeCharset(contentType) {
+  extractContentTypeCharset (contentType) {
     return contentType
       .split(';')
       .filter(str => {
@@ -815,27 +815,27 @@ export default class CodeEditor extends React.Component {
       })[0]
   }
 
-  render() {
+  render () {
     const {
       className,
       fontSize
     } = this.props
     const fontFamily = normalizeEditorFontFamily(this.props.fontFamily)
     const width = this.props.width
-    return ( <
-      div className = {
+    return (<
+      div className ={
         className == null ? 'CodeEditor' : `CodeEditor ${className}`
       }
-      ref = 'root'
-      tabIndex = '-1'
-      style = {
-        {
-          fontFamily,
-          fontSize: fontSize,
-          width: width
-        }
+      ref= 'root'
+      tabIndex= '-1'
+      style= {
+      {
+        fontFamily,
+        fontSize: fontSize,
+        width: width
       }
-      onDrop = {
+      }
+      onDrop= {
         e => this.handleDropImage(e)
       }
       />
@@ -862,4 +862,4 @@ CodeEditor.defaultProps = {
   fontFamily: 'Monaco, Consolas',
   indentSize: 4,
   indentType: 'space'
-}
\ No newline at end of file
+}

From 8361106660fc78ef4cda5bc55cc04bf5e91c0ae6 Mon Sep 17 00:00:00 2001
From: Guilherme Silva <guilhermejosesilva@gmail.com>
Date: Thu, 8 Nov 2018 14:07:35 +0000
Subject: [PATCH 015/159] Removing trailing spaces and added spaces in config

---
 browser/main/lib/ConfigManager.js             |  6 +++---
 browser/main/modals/PreferencesModal/UiTab.js | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/browser/main/lib/ConfigManager.js b/browser/main/lib/ConfigManager.js
index 942ce93d..7973d95f 100644
--- a/browser/main/lib/ConfigManager.js
+++ b/browser/main/lib/ConfigManager.js
@@ -44,9 +44,9 @@ export const DEFAULT_CONFIG = {
     enableRulers: false,
     rulers: [80, 120],
     displayLineNumbers: true,
-    matchingPairs:'()[]{}\'\'""$$**``',
-    matchingTriples:'```"""\'\'\'',
-    explodingPairs:'[]{}``$$',
+    matchingPairs: '()[]{}\'\'""$$**``',
+    matchingTriples: '```"""\'\'\'',
+    explodingPairs: '[]{}``$$',
     switchPreview: 'BLUR', // 'BLUR', 'DBL_CLICK', 'RIGHTCLICK'
     delfaultStatus: 'PREVIEW', // 'PREVIEW', 'CODE'
     scrollPastEnd: false,
diff --git a/browser/main/modals/PreferencesModal/UiTab.js b/browser/main/modals/PreferencesModal/UiTab.js
index ac020238..5b68d456 100644
--- a/browser/main/modals/PreferencesModal/UiTab.js
+++ b/browser/main/modals/PreferencesModal/UiTab.js
@@ -62,7 +62,7 @@ class UiTab extends React.Component {
       checkHighLight.setAttribute('rel', 'stylesheet')
       document.head.appendChild(checkHighLight)
     }
-    
+
     const newConfig = {
       ui: {
         theme: this.refs.uiTheme.value,
@@ -542,7 +542,7 @@ class UiTab extends React.Component {
             </label>
           </div>
 
-          <div styleName='group-section'>            
+          <div styleName='group-section'>
             <div styleName='group-section-label'>
               {i18n.__('Matching character pairs')}
             </div>
@@ -556,7 +556,7 @@ class UiTab extends React.Component {
             </div>
           </div>
 
-          <div styleName='group-section'>            
+          <div styleName='group-section'>
             <div styleName='group-section-label'>
               {i18n.__('Matching character triples')}
             </div>
@@ -570,7 +570,7 @@ class UiTab extends React.Component {
             </div>
           </div>
 
-          <div styleName='group-section'>            
+          <div styleName='group-section'>
             <div styleName='group-section-label'>
               {i18n.__('Exploding character pairs')}
             </div>
@@ -611,7 +611,7 @@ class UiTab extends React.Component {
               />
             </div>
           </div>
-          
+
           <div styleName='group-section'>
             <div styleName='group-section-label'>{i18n.__('Code Block Theme')}</div>
             <div styleName='group-section-control'>

From 707dace3d065aaff5466d4a2f03d469a6e3f92a1 Mon Sep 17 00:00:00 2001
From: Guilherme Silva <guilhermejosesilva@gmail.com>
Date: Thu, 8 Nov 2018 14:11:43 +0000
Subject: [PATCH 016/159] removing spaces after =

---
 browser/components/CodeEditor.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/browser/components/CodeEditor.js b/browser/components/CodeEditor.js
index 9037c2e2..98651798 100644
--- a/browser/components/CodeEditor.js
+++ b/browser/components/CodeEditor.js
@@ -823,19 +823,19 @@ export default class CodeEditor extends React.Component {
     const fontFamily = normalizeEditorFontFamily(this.props.fontFamily)
     const width = this.props.width
     return (<
-      div className ={
+      div className={
         className == null ? 'CodeEditor' : `CodeEditor ${className}`
       }
-      ref= 'root'
-      tabIndex= '-1'
-      style= {
+      ref='root'
+      tabIndex='-1'
+      style={
       {
         fontFamily,
         fontSize: fontSize,
         width: width
       }
       }
-      onDrop= {
+      onDrop={
         e => this.handleDropImage(e)
       }
       />

From b1d2c25ce50a3bf861f28e342f1b9970ea06c1c9 Mon Sep 17 00:00:00 2001
From: Baptiste Augrain <daiyam@zokugun.org>
Date: Sat, 10 Nov 2018 00:05:45 +0100
Subject: [PATCH 017/159] when dropping an image, switch to editor and add it
 at the end of the file

---
 browser/components/MarkdownEditor.js  | 24 ++++++++++++++++++++++++
 browser/components/MarkdownPreview.js | 12 ++++++++----
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/browser/components/MarkdownEditor.js b/browser/components/MarkdownEditor.js
index 9c8a06d6..dbec1dc9 100644
--- a/browser/components/MarkdownEditor.js
+++ b/browser/components/MarkdownEditor.js
@@ -7,6 +7,7 @@ import MarkdownPreview from 'browser/components/MarkdownPreview'
 import eventEmitter from 'browser/main/lib/eventEmitter'
 import { findStorage } from 'browser/lib/findStorage'
 import ConfigManager from 'browser/main/lib/ConfigManager'
+import attachmentManagement from 'browser/main/lib/dataApi/attachmentManagement'
 
 class MarkdownEditor extends React.Component {
   constructor (props) {
@@ -219,6 +220,28 @@ class MarkdownEditor extends React.Component {
     this.refs.code.editor.replaceSelection(`${mdElement}${this.refs.code.editor.getSelection()}${mdElement}`)
   }
 
+  handleDropImage (dropEvent) {
+    dropEvent.preventDefault()
+    const { storageKey, noteKey } = this.props
+
+    this.setState({
+        status: 'CODE'
+      }, () => {
+        this.refs.code.focus()
+
+        this.refs.code.editor.execCommand('goDocEnd')
+        this.refs.code.editor.execCommand('goLineEnd')
+        this.refs.code.editor.execCommand('newlineAndIndent')
+
+        attachmentManagement.handleAttachmentDrop(
+          this.refs.code,
+          storageKey,
+          noteKey,
+          dropEvent
+        )
+      })
+  }
+
   handleKeyUp (e) {
     const keyPressed = this.state.keyPressed
     keyPressed.delete(e.keyCode)
@@ -308,6 +331,7 @@ class MarkdownEditor extends React.Component {
           customCSS={config.preview.customCSS}
           allowCustomCSS={config.preview.allowCustomCSS}
           lineThroughCheckbox={config.preview.lineThroughCheckbox}
+          onDrop={(e) => this.handleDropImage(e)}
         />
       </div>
     )
diff --git a/browser/components/MarkdownPreview.js b/browser/components/MarkdownPreview.js
index d9ff7074..704ed9a0 100755
--- a/browser/components/MarkdownPreview.js
+++ b/browser/components/MarkdownPreview.js
@@ -206,7 +206,7 @@ export default class MarkdownPreview extends React.Component {
     this.saveAsHtmlHandler = () => this.handleSaveAsHtml()
     this.printHandler = () => this.handlePrint()
 
-    this.linkClickHandler = this.handlelinkClick.bind(this)
+    this.linkClickHandler = this.handleLinkClick.bind(this)
     this.initMarkdown = this.initMarkdown.bind(this)
     this.initMarkdown()
   }
@@ -438,6 +438,8 @@ export default class MarkdownPreview extends React.Component {
   }
 
   componentDidMount () {
+    const { onDrop } = this.props
+
     this.refs.root.setAttribute('sandbox', 'allow-scripts')
     this.refs.root.contentWindow.document.body.addEventListener(
       'contextmenu',
@@ -475,7 +477,7 @@ export default class MarkdownPreview extends React.Component {
     )
     this.refs.root.contentWindow.document.addEventListener(
       'drop',
-      this.preventImageDroppedHandler
+      onDrop || this.preventImageDroppedHandler
     )
     this.refs.root.contentWindow.document.addEventListener(
       'dragover',
@@ -492,6 +494,8 @@ export default class MarkdownPreview extends React.Component {
   }
 
   componentWillUnmount () {
+    const { onDrop } = this.props
+
     this.refs.root.contentWindow.document.body.removeEventListener(
       'contextmenu',
       this.contextMenuHandler
@@ -510,7 +514,7 @@ export default class MarkdownPreview extends React.Component {
     )
     this.refs.root.contentWindow.document.removeEventListener(
       'drop',
-      this.preventImageDroppedHandler
+      onDrop || this.preventImageDroppedHandler
     )
     this.refs.root.contentWindow.document.removeEventListener(
       'dragover',
@@ -837,7 +841,7 @@ export default class MarkdownPreview extends React.Component {
     return new window.Notification(title, options)
   }
 
-  handlelinkClick (e) {
+  handleLinkClick (e) {
     e.preventDefault()
     e.stopPropagation()
 

From 3679fbe3ea36b4331e1f22559728ecb4a84863ad Mon Sep 17 00:00:00 2001
From: Baptiste Augrain <daiyam@zokugun.org>
Date: Sat, 10 Nov 2018 00:18:06 +0100
Subject: [PATCH 018/159] fix lint errors

---
 browser/components/MarkdownEditor.js | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/browser/components/MarkdownEditor.js b/browser/components/MarkdownEditor.js
index dbec1dc9..07d2aaf0 100644
--- a/browser/components/MarkdownEditor.js
+++ b/browser/components/MarkdownEditor.js
@@ -225,21 +225,21 @@ class MarkdownEditor extends React.Component {
     const { storageKey, noteKey } = this.props
 
     this.setState({
-        status: 'CODE'
-      }, () => {
-        this.refs.code.focus()
+      status: 'CODE'
+    }, () => {
+      this.refs.code.focus()
 
-        this.refs.code.editor.execCommand('goDocEnd')
-        this.refs.code.editor.execCommand('goLineEnd')
-        this.refs.code.editor.execCommand('newlineAndIndent')
+      this.refs.code.editor.execCommand('goDocEnd')
+      this.refs.code.editor.execCommand('goLineEnd')
+      this.refs.code.editor.execCommand('newlineAndIndent')
 
-        attachmentManagement.handleAttachmentDrop(
-          this.refs.code,
-          storageKey,
-          noteKey,
-          dropEvent
-        )
-      })
+      attachmentManagement.handleAttachmentDrop(
+        this.refs.code,
+        storageKey,
+        noteKey,
+        dropEvent
+      )
+    })
   }
 
   handleKeyUp (e) {

From 01891d46b3cba3fec7f3794542c405262e5bdd6c Mon Sep 17 00:00:00 2001
From: richardtks <richardtks8@gmail.com>
Date: Sun, 11 Nov 2018 00:15:22 +0800
Subject: [PATCH 019/159] Added the auto-updating numbered list to the middle
 of a list

---
 .../boostNewLineIndentContinueMarkdownList.js | 39 ++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

diff --git a/extra_scripts/boost/boostNewLineIndentContinueMarkdownList.js b/extra_scripts/boost/boostNewLineIndentContinueMarkdownList.js
index aa766f6e..bc03e920 100644
--- a/extra_scripts/boost/boostNewLineIndentContinueMarkdownList.js
+++ b/extra_scripts/boost/boostNewLineIndentContinueMarkdownList.js
@@ -44,9 +44,46 @@
           ? match[2].replace('x', ' ')
           : (parseInt(match[3], 10) + 1) + match[4]
         replacements[i] = '\n' + indent + bullet + after
+
+        if (bullet) incrementRemainingMarkdownListNumbers(cm, pos)
       }
     }
-
     cm.replaceSelections(replacements)
   }
+  // Auto-updating Markdown list numbers when a new item is added to the
+  // middle of a list
+  function incrementRemainingMarkdownListNumbers(cm, pos) {
+    var startLine = pos.line, lookAhead = 0, skipCount = 0
+    var startItem = listRE.exec(cm.getLine(startLine)), startIndent = startItem[1]
+
+    do {
+      lookAhead += 1
+      var nextLineNumber = startLine + lookAhead
+      var nextLine = cm.getLine(nextLineNumber), nextItem = listRE.exec(nextLine)
+
+      if (nextItem) {
+        var nextIndent = nextItem[1]
+        var newNumber = (parseInt(startItem[3], 10) + lookAhead - skipCount)
+        var nextNumber = (parseInt(nextItem[3], 10)), itemNumber = nextNumber
+
+        if (startIndent === nextIndent && !isNaN(nextNumber)) {
+          if (newNumber === nextNumber) itemNumber = nextNumber + 1
+          if (newNumber > nextNumber) itemNumber = newNumber + 1
+          cm.replaceRange(
+            nextLine.replace(listRE, nextIndent + itemNumber + nextItem[4] + nextItem[5]),
+          {
+            line: nextLineNumber, ch: 0
+          }, {
+            line: nextLineNumber, ch: nextLine.length
+          })
+        } else {
+          if (startIndent.length > nextIndent.length) return
+          // This doesn't run if the next line immediatley indents, as it is
+          // not clear of the users intention (new indented item or same level)
+          if ((startIndent.length < nextIndent.length) && (lookAhead === 1)) return
+          skipCount += 1
+        }
+      }
+    } while (nextItem)
+  }
 })

From 3414e2daf0f1e50ff580049134c9595886709484 Mon Sep 17 00:00:00 2001
From: Miguel Teixeira <miguelalexbt@outlook.com>
Date: Thu, 22 Nov 2018 12:22:49 +0000
Subject: [PATCH 020/159] Added warning when trying to print from InfoPanel

---
 browser/main/Detail/SnippetNoteDetail.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/browser/main/Detail/SnippetNoteDetail.js b/browser/main/Detail/SnippetNoteDetail.js
index afd81102..db862115 100644
--- a/browser/main/Detail/SnippetNoteDetail.js
+++ b/browser/main/Detail/SnippetNoteDetail.js
@@ -789,6 +789,7 @@ class SnippetNoteDetail extends React.Component {
           exportAsMd={this.showWarning}
           exportAsTxt={this.showWarning}
           type={note.type}
+          print={this.showWarning}
         />
       </div>
     </div>

From bf288fdaeb4dc64d4390edf9d35f38c3a38f624a Mon Sep 17 00:00:00 2001
From: Baptiste Augrain <daiyam@zokugun.org>
Date: Sun, 25 Nov 2018 14:55:29 +0100
Subject: [PATCH 021/159] fix pasting into fenced code block

---
 browser/components/CodeEditor.js | 84 +++++++++++++++++++++++++-------
 1 file changed, 66 insertions(+), 18 deletions(-)

diff --git a/browser/components/CodeEditor.js b/browser/components/CodeEditor.js
index 130cc86e..0193d5cb 100644
--- a/browser/components/CodeEditor.js
+++ b/browser/components/CodeEditor.js
@@ -562,14 +562,17 @@ export default class CodeEditor extends React.Component {
   }
 
   handlePaste (editor, e) {
+    const { storageKey, noteKey, fetchUrlTitle } = this.props
+
     const clipboardData = e.clipboardData
-    const { storageKey, noteKey } = this.props
     const dataTransferItem = clipboardData.items[0]
     const pastedTxt = clipboardData.getData('text')
+
     const isURL = str => {
       const matcher = /^(?:\w+:)?\/\/([^\s\.]+\.\S{2}|localhost[\:?\d]*)\S*$/
       return matcher.test(str)
     }
+
     const isInLinkTag = editor => {
       const startCursor = editor.getCursor('start')
       const prevChar = editor.getRange(
@@ -584,30 +587,69 @@ export default class CodeEditor extends React.Component {
       return prevChar === '](' && nextChar === ')'
     }
 
-    const pastedHtml = clipboardData.getData('text/html')
-    if (pastedHtml !== '') {
-      this.handlePasteHtml(e, editor, pastedHtml)
-    } else if (dataTransferItem.type.match('image')) {
-      attachmentManagement.handlePastImageEvent(
-        this,
-        storageKey,
-        noteKey,
-        dataTransferItem
-      )
-    } else if (
-      this.props.fetchUrlTitle &&
-      isURL(pastedTxt) &&
-      !isInLinkTag(editor)
-    ) {
-      this.handlePasteUrl(e, editor, pastedTxt)
+    const isInFencedCodeBlock = editor => {
+      const cursor = editor.getCursor()
+
+      let token = editor.getTokenAt(cursor)
+      if (token.state.fencedState) {
+        return true
+      }
+
+      let line = line = cursor.line - 1
+      while (line >= 0) {
+        token = editor.getTokenAt({
+          ch: 3,
+          line
+        })
+
+        if (token.start === token.end) {
+          --line
+        } else if (token.type === 'comment') {
+          if (line > 0) {
+            token = editor.getTokenAt({
+              ch: 3,
+              line: line - 1
+            })
+
+            return token.type !== 'comment'
+          } else {
+            return true
+          }
+          return true
+        } else {
+          return false
+        }
+      }
+
+      return false
     }
+
+    if (isInFencedCodeBlock(editor)) {
+      this.handlePasteText(e, editor, pastedTxt)
+    } else {
+      const pastedHtml = clipboardData.getData('text/html')
+      if (pastedHtml !== '') {
+        this.handlePasteHtml(e, editor, pastedHtml)
+      } else if (dataTransferItem.type.match('image')) {
+        attachmentManagement.handlePastImageEvent(
+          this,
+          storageKey,
+          noteKey,
+          dataTransferItem
+        )
+      } else if (fetchUrlTitle && isURL(pastedTxt) && !isInLinkTag(editor)) {
+        this.handlePasteUrl(e, editor, pastedTxt)
+      }
+    }
+
     if (attachmentManagement.isAttachmentLink(pastedTxt)) {
+      e.preventDefault()
+
       attachmentManagement
         .handleAttachmentLinkPaste(storageKey, noteKey, pastedTxt)
         .then(modifiedText => {
           this.editor.replaceSelection(modifiedText)
         })
-      e.preventDefault()
     }
   }
 
@@ -663,6 +705,12 @@ export default class CodeEditor extends React.Component {
     editor.replaceSelection(markdown)
   }
 
+  handlePasteText (e, editor, pastedTxt) {
+    e.preventDefault()
+
+    editor.replaceSelection(pastedTxt)
+  }
+
   mapNormalResponse (response, pastedTxt) {
     return this.decodeResponse(response).then(body => {
       return new Promise((resolve, reject) => {

From aac075be061b438e269b8048f5189d8b87bde6d8 Mon Sep 17 00:00:00 2001
From: Baptiste Augrain <daiyam@zokugun.org>
Date: Sun, 25 Nov 2018 14:57:03 +0100
Subject: [PATCH 022/159] fix lint error

---
 browser/components/CodeEditor.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/browser/components/CodeEditor.js b/browser/components/CodeEditor.js
index 0193d5cb..d2fcb9c5 100644
--- a/browser/components/CodeEditor.js
+++ b/browser/components/CodeEditor.js
@@ -615,7 +615,6 @@ export default class CodeEditor extends React.Component {
           } else {
             return true
           }
-          return true
         } else {
           return false
         }

From 9d81e4be2fe810c18003a99425ac1ed42ef2f665 Mon Sep 17 00:00:00 2001
From: Baptiste Augrain <daiyam@zokugun.org>
Date: Sun, 25 Nov 2018 16:17:01 +0100
Subject: [PATCH 023/159] undo change

---
 browser/main/lib/dataApi/attachmentManagement.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser/main/lib/dataApi/attachmentManagement.js b/browser/main/lib/dataApi/attachmentManagement.js
index c88acfc5..59c91540 100644
--- a/browser/main/lib/dataApi/attachmentManagement.js
+++ b/browser/main/lib/dataApi/attachmentManagement.js
@@ -227,7 +227,7 @@ 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 + '(?:\\\/|%5C)[\\w.]+', 'g'), function (match) {
+  return renderedHTML.replace(new RegExp('/?' + STORAGE_FOLDER_PLACEHOLDER + '.*?', '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))
   })

From 64f7233bfc8124fc6d89e9c212718f3cdd4d02cb Mon Sep 17 00:00:00 2001
From: Baptiste Augrain <daiyam@zokugun.org>
Date: Sun, 25 Nov 2018 16:58:11 +0100
Subject: [PATCH 024/159] fix regex to match :storage reference, added comment
 to explain what it does.

---
 browser/main/lib/dataApi/attachmentManagement.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/browser/main/lib/dataApi/attachmentManagement.js b/browser/main/lib/dataApi/attachmentManagement.js
index 59c91540..73bf1303 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))
   })

From d95d282f393fe64ccfe0467cc6a2c8d5e6cb2fdd Mon Sep 17 00:00:00 2001
From: Baptiste Augrain <daiyam@zokugun.org>
Date: Sun, 25 Nov 2018 17:09:54 +0100
Subject: [PATCH 025/159] disable editor's context menu when switch preview is
 using right click

---
 browser/components/CodeEditor.js          | 18 ++++++++++++------
 browser/components/MarkdownEditor.js      |  1 +
 browser/components/MarkdownSplitEditor.js |  1 +
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/browser/components/CodeEditor.js b/browser/components/CodeEditor.js
index 130cc86e..260b12f8 100644
--- a/browser/components/CodeEditor.js
+++ b/browser/components/CodeEditor.js
@@ -65,12 +65,16 @@ export default class CodeEditor extends React.Component {
     this.scrollToLineHandeler = this.scrollToLine.bind(this)
 
     this.formatTable = () => this.handleFormatTable()
-    this.contextMenuHandler = function (editor, event) {
-      const menu = buildEditorContextMenu(editor, event)
-      if (menu != null) {
-        setTimeout(() => menu.popup(remote.getCurrentWindow()), 30)
+
+    if (props.switchPreview !== 'RIGHTCLICK') {
+      this.contextMenuHandler = function (editor, event) {
+        const menu = buildEditorContextMenu(editor, event)
+        if (menu != null) {
+          setTimeout(() => menu.popup(remote.getCurrentWindow()), 30)
+        }
       }
     }
+
     this.editorActivityHandler = () => this.handleEditorActivity()
 
     this.turndownService = new TurndownService()
@@ -137,7 +141,7 @@ export default class CodeEditor extends React.Component {
   }
 
   componentDidMount () {
-    const { rulers, enableRulers } = this.props
+    const { rulers, enableRulers, switchPreview } = this.props
     const expandSnippet = this.expandSnippet.bind(this)
     eventEmitter.on('line:jump', this.scrollToLineHandeler)
 
@@ -241,7 +245,9 @@ export default class CodeEditor extends React.Component {
     this.editor.on('blur', this.blurHandler)
     this.editor.on('change', this.changeHandler)
     this.editor.on('paste', this.pasteHandler)
-    this.editor.on('contextmenu', this.contextMenuHandler)
+    if (switchPreview !== 'RIGHTCLICK') {
+      this.editor.on('contextmenu', this.contextMenuHandler)
+    }
     eventEmitter.on('top:search', this.searchHandler)
 
     eventEmitter.emit('code:init')
diff --git a/browser/components/MarkdownEditor.js b/browser/components/MarkdownEditor.js
index 20ce9451..0c2e291e 100644
--- a/browser/components/MarkdownEditor.js
+++ b/browser/components/MarkdownEditor.js
@@ -278,6 +278,7 @@ class MarkdownEditor extends React.Component {
           onChange={(e) => this.handleChange(e)}
           onBlur={(e) => this.handleBlur(e)}
           spellCheck={config.editor.spellcheck}
+          switchPreview={config.editor.switchPreview}
         />
         <MarkdownPreview styleName={this.state.status === 'PREVIEW'
             ? 'preview'
diff --git a/browser/components/MarkdownSplitEditor.js b/browser/components/MarkdownSplitEditor.js
index 0ab52a56..730c2526 100644
--- a/browser/components/MarkdownSplitEditor.js
+++ b/browser/components/MarkdownSplitEditor.js
@@ -172,6 +172,7 @@ class MarkdownSplitEditor extends React.Component {
           onChange={this.handleOnChange.bind(this)}
           onScroll={this.handleScroll.bind(this)}
           spellCheck={config.editor.spellcheck}
+          switchPreview={config.editor.switchPreview}
        />
         <div styleName='slider' style={{left: this.state.codeEditorWidthInPercent + '%'}} onMouseDown={e => this.handleMouseDown(e)} >
           <div styleName='slider-hitbox' />

From 629d4a82ae8ee4f6067eaf1b829d67aaf09b6f20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nguy=E1=BB=85n=20Vi=E1=BB=87t=20H=C6=B0ng?=
 <hunggarena12@gmail.com>
Date: Tue, 27 Nov 2018 13:58:06 +0700
Subject: [PATCH 026/159] fixed delete note not navigate to next note

---
 browser/main/NoteList/index.js | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/browser/main/NoteList/index.js b/browser/main/NoteList/index.js
index 7bb52ccd..ba2c801f 100644
--- a/browser/main/NoteList/index.js
+++ b/browser/main/NoteList/index.js
@@ -652,14 +652,18 @@ class NoteList extends React.Component {
         })
       )
       .then((data) => {
-        data.forEach((item) => {
-          dispatch({
-            type: 'DELETE_NOTE',
-            storageKey: item.storageKey,
-            noteKey: item.noteKey
+        const dispatchHandler = () => {
+          data.forEach((item) => {
+            dispatch({
+              type: 'DELETE_NOTE',
+              storageKey: item.storageKey,
+              noteKey: item.noteKey
+            })
           })
-        })
+        }
+        ee.once('list:next', dispatchHandler)
       })
+      .then(() => ee.emit('list:next'))
       .catch((err) => {
         console.error('Cannot Delete note: ' + err)
       })
@@ -683,6 +687,7 @@ class NoteList extends React.Component {
         })
         AwsMobileAnalyticsConfig.recordDynamicCustomEvent('EDIT_NOTE')
       })
+      .then(() => ee.emit('list:next'))
       .catch((err) => {
         console.error('Notes could not go to trash: ' + err)
       })

From c33058ae2bf324fc9cd1c4ec033a4ac850a958e2 Mon Sep 17 00:00:00 2001
From: Miguel Teixeira <miguelalexbt@outlook.com>
Date: Tue, 27 Nov 2018 17:42:04 +0000
Subject: [PATCH 027/159] Added custom warning messages.

---
 browser/main/Detail/InfoPanel.js         |  8 ++++----
 browser/main/Detail/InfoPanelTrashed.js  |  6 +++---
 browser/main/Detail/SnippetNoteDetail.js | 12 ++++++++++--
 browser/main/NoteList/index.js           | 17 ++++++++++++-----
 lib/main-menu.js                         |  8 ++++----
 5 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/browser/main/Detail/InfoPanel.js b/browser/main/Detail/InfoPanel.js
index 4ce610fa..15535186 100644
--- a/browser/main/Detail/InfoPanel.js
+++ b/browser/main/Detail/InfoPanel.js
@@ -70,22 +70,22 @@ class InfoPanel extends React.Component {
         <hr />
 
         <div id='export-wrap'>
-          <button styleName='export--enable' onClick={(e) => exportAsMd(e)}>
+          <button styleName='export--enable' onClick={(e) => exportAsMd(e, 'export-md')}>
             <i className='fa fa-file-code-o' />
             <p>{i18n.__('.md')}</p>
           </button>
 
-          <button styleName='export--enable' onClick={(e) => exportAsTxt(e)}>
+          <button styleName='export--enable' onClick={(e) => exportAsTxt(e, 'export-txt')}>
             <i className='fa fa-file-text-o' />
             <p>{i18n.__('.txt')}</p>
           </button>
 
-          <button styleName='export--enable' onClick={(e) => exportAsHtml(e)}>
+          <button styleName='export--enable' onClick={(e) => exportAsHtml(e, 'export-html')}>
             <i className='fa fa-html5' />
             <p>{i18n.__('.html')}</p>
           </button>
 
-          <button styleName='export--enable' onClick={(e) => print(e)}>
+          <button styleName='export--enable' onClick={(e) => print(e, 'print')}>
             <i className='fa fa-print' />
             <p>{i18n.__('Print')}</p>
           </button>
diff --git a/browser/main/Detail/InfoPanelTrashed.js b/browser/main/Detail/InfoPanelTrashed.js
index db64a284..d4c8045d 100644
--- a/browser/main/Detail/InfoPanelTrashed.js
+++ b/browser/main/Detail/InfoPanelTrashed.js
@@ -31,17 +31,17 @@ const InfoPanelTrashed = ({
     </div>
 
     <div id='export-wrap'>
-      <button styleName='export--enable' onClick={(e) => exportAsMd(e)}>
+      <button styleName='export--enable' onClick={(e) => exportAsMd(e, 'export-md')}>
         <i className='fa fa-file-code-o' />
         <p>.md</p>
       </button>
 
-      <button styleName='export--enable' onClick={(e) => exportAsTxt(e)}>
+      <button styleName='export--enable' onClick={(e) => exportAsTxt(e, 'export-txt')}>
         <i className='fa fa-file-text-o' />
         <p>.txt</p>
       </button>
 
-      <button styleName='export--enable' onClick={(e) => exportAsHtml(e)}>
+      <button styleName='export--enable' onClick={(e) => exportAsHtml(e, 'export-html')}>
         <i className='fa fa-html5' />
         <p>.html</p>
       </button>
diff --git a/browser/main/Detail/SnippetNoteDetail.js b/browser/main/Detail/SnippetNoteDetail.js
index db862115..08cd50f1 100644
--- a/browser/main/Detail/SnippetNoteDetail.js
+++ b/browser/main/Detail/SnippetNoteDetail.js
@@ -633,11 +633,18 @@ class SnippetNoteDetail extends React.Component {
     if (infoPanel.style) infoPanel.style.display = infoPanel.style.display === 'none' ? 'inline' : 'none'
   }
 
-  showWarning () {
+  showWarning (e, msg) {
+    const warningMessage = (msg) => ({
+		  'export-txt': 'Text export is available only as a markdown note',
+		  'export-md': 'Markdown export is available only as a markdown note.',
+		  'export-html': 'HTML export is available only as a markdown note.',
+		  'print': 'Print is available only as a markdown note.'
+    })[msg]
+    
     dialog.showMessageBox(remote.getCurrentWindow(), {
       type: 'warning',
       message: i18n.__('Sorry!'),
-      detail: i18n.__('md/text import is available only a markdown note.'),
+      detail: i18n.__(warningMessage(msg)),
       buttons: [i18n.__('OK')]
     })
   }
@@ -788,6 +795,7 @@ class SnippetNoteDetail extends React.Component {
           createdAt={formatDate(note.createdAt)}
           exportAsMd={this.showWarning}
           exportAsTxt={this.showWarning}
+          exportAsHtml={this.showWarning}
           type={note.type}
           print={this.showWarning}
         />
diff --git a/browser/main/NoteList/index.js b/browser/main/NoteList/index.js
index 7bb52ccd..02bdbcd2 100644
--- a/browser/main/NoteList/index.js
+++ b/browser/main/NoteList/index.js
@@ -64,8 +64,8 @@ class NoteList extends React.Component {
     this.focusHandler = () => {
       this.refs.list.focus()
     }
-    this.alertIfSnippetHandler = () => {
-      this.alertIfSnippet()
+    this.alertIfSnippetHandler = (event, msg) => {
+      this.alertIfSnippet(msg)
     }
     this.importFromFileHandler = this.importFromFile.bind(this)
     this.jumpNoteByHash = this.jumpNoteByHashHandler.bind(this)
@@ -494,14 +494,21 @@ class NoteList extends React.Component {
     })
   }
 
-  alertIfSnippet () {
+  alertIfSnippet (msg) {
+    const warningMessage = (msg) => ({
+		  'export-txt': 'Text export is available only as a markdown note',
+		  'export-md': 'Markdown export is available only as a markdown note.',
+		  'export-html': 'HTML export is available only as a markdown note.',
+		  'print': 'Print is available only as a markdown note.'
+	  })[msg]
+
     const targetIndex = this.getTargetIndex()
     if (this.notes[targetIndex].type === 'SNIPPET_NOTE') {
       dialog.showMessageBox(remote.getCurrentWindow(), {
         type: 'warning',
         message: i18n.__('Sorry!'),
-        detail: i18n.__('md/text import is available only a markdown note.'),
-        buttons: [i18n.__('OK'), i18n.__('Cancel')]
+        detail: i18n.__(warningMessage(msg)),
+        buttons: [i18n.__('OK')]
       })
     }
   }
diff --git a/lib/main-menu.js b/lib/main-menu.js
index fed5eb15..2782ea8b 100644
--- a/lib/main-menu.js
+++ b/lib/main-menu.js
@@ -99,21 +99,21 @@ const file = {
         {
           label: 'Plain Text (.txt)',
           click () {
-            mainWindow.webContents.send('list:isMarkdownNote')
+            mainWindow.webContents.send('list:isMarkdownNote', 'export-txt')
             mainWindow.webContents.send('export:save-text')
           }
         },
         {
           label: 'MarkDown (.md)',
           click () {
-            mainWindow.webContents.send('list:isMarkdownNote')
+            mainWindow.webContents.send('list:isMarkdownNote', 'export-md')
             mainWindow.webContents.send('export:save-md')
           }
         },
         {
           label: 'HTML (.html)',
           click () {
-            mainWindow.webContents.send('list:isMarkdownNote')
+            mainWindow.webContents.send('list:isMarkdownNote', 'export-html')
             mainWindow.webContents.send('export:save-html')
           }
         }
@@ -159,7 +159,7 @@ const file = {
       label: 'Print',
       accelerator: 'CommandOrControl+P',
       click () {
-        mainWindow.webContents.send('list:isMarkdownNote')
+        mainWindow.webContents.send('list:isMarkdownNote', 'print')
         mainWindow.webContents.send('print')
       }
     },

From ef66e71febf98dbfcf827926e99e1105f5b4a891 Mon Sep 17 00:00:00 2001
From: Miguel Teixeira <miguelalexbt@outlook.com>
Date: Tue, 27 Nov 2018 18:02:59 +0000
Subject: [PATCH 028/159] Solved some errors in identation

---
 browser/main/Detail/SnippetNoteDetail.js | 10 +++++-----
 browser/main/NoteList/index.js           | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/browser/main/Detail/SnippetNoteDetail.js b/browser/main/Detail/SnippetNoteDetail.js
index 08cd50f1..473ce9d0 100644
--- a/browser/main/Detail/SnippetNoteDetail.js
+++ b/browser/main/Detail/SnippetNoteDetail.js
@@ -635,12 +635,12 @@ class SnippetNoteDetail extends React.Component {
 
   showWarning (e, msg) {
     const warningMessage = (msg) => ({
-		  'export-txt': 'Text export is available only as a markdown note',
-		  'export-md': 'Markdown export is available only as a markdown note.',
-		  'export-html': 'HTML export is available only as a markdown note.',
-		  'print': 'Print is available only as a markdown note.'
+      'export-txt': 'Text export is available only as a markdown note',
+      'export-md': 'Markdown export is available only as a markdown note.',
+      'export-html': 'HTML export is available only as a markdown note.',
+      'print': 'Print is available only as a markdown note.'
     })[msg]
-    
+
     dialog.showMessageBox(remote.getCurrentWindow(), {
       type: 'warning',
       message: i18n.__('Sorry!'),
diff --git a/browser/main/NoteList/index.js b/browser/main/NoteList/index.js
index 02bdbcd2..49d063ca 100644
--- a/browser/main/NoteList/index.js
+++ b/browser/main/NoteList/index.js
@@ -496,11 +496,11 @@ class NoteList extends React.Component {
 
   alertIfSnippet (msg) {
     const warningMessage = (msg) => ({
-		  'export-txt': 'Text export is available only as a markdown note',
-		  'export-md': 'Markdown export is available only as a markdown note.',
-		  'export-html': 'HTML export is available only as a markdown note.',
-		  'print': 'Print is available only as a markdown note.'
-	  })[msg]
+      'export-txt': 'Text export is available only as a markdown note',
+      'export-md': 'Markdown export is available only as a markdown note.',
+      'export-html': 'HTML export is available only as a markdown note.',
+      'print': 'Print is available only as a markdown note.'
+    })[msg]
 
     const targetIndex = this.getTargetIndex()
     if (this.notes[targetIndex].type === 'SNIPPET_NOTE') {

From c245855bbf996fbd23b63d8e0ff6b10af2826da6 Mon Sep 17 00:00:00 2001
From: Miguel Teixeira <miguelalexbt@outlook.com>
Date: Tue, 27 Nov 2018 20:28:57 +0000
Subject: [PATCH 029/159] Improved messages.

---
 browser/main/Detail/SnippetNoteDetail.js | 10 +++++-----
 browser/main/NoteList/index.js           | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/browser/main/Detail/SnippetNoteDetail.js b/browser/main/Detail/SnippetNoteDetail.js
index 473ce9d0..47e4de98 100644
--- a/browser/main/Detail/SnippetNoteDetail.js
+++ b/browser/main/Detail/SnippetNoteDetail.js
@@ -635,16 +635,16 @@ class SnippetNoteDetail extends React.Component {
 
   showWarning (e, msg) {
     const warningMessage = (msg) => ({
-      'export-txt': 'Text export is available only as a markdown note',
-      'export-md': 'Markdown export is available only as a markdown note.',
-      'export-html': 'HTML export is available only as a markdown note.',
-      'print': 'Print is available only as a markdown note.'
+      'export-txt': 'Text export',
+      'export-md': 'Markdown export',
+      'export-html': 'HTML export',
+      'print': 'Print'
     })[msg]
 
     dialog.showMessageBox(remote.getCurrentWindow(), {
       type: 'warning',
       message: i18n.__('Sorry!'),
-      detail: i18n.__(warningMessage(msg)),
+      detail: i18n.__(warningMessage(msg) + ' is available only as a markdown note.'),
       buttons: [i18n.__('OK')]
     })
   }
diff --git a/browser/main/NoteList/index.js b/browser/main/NoteList/index.js
index 49d063ca..51e7a41c 100644
--- a/browser/main/NoteList/index.js
+++ b/browser/main/NoteList/index.js
@@ -496,10 +496,10 @@ class NoteList extends React.Component {
 
   alertIfSnippet (msg) {
     const warningMessage = (msg) => ({
-      'export-txt': 'Text export is available only as a markdown note',
-      'export-md': 'Markdown export is available only as a markdown note.',
-      'export-html': 'HTML export is available only as a markdown note.',
-      'print': 'Print is available only as a markdown note.'
+      'export-txt': 'Text export',
+      'export-md': 'Markdown export',
+      'export-html': 'HTML export',
+      'print': 'Print'
     })[msg]
 
     const targetIndex = this.getTargetIndex()
@@ -507,7 +507,7 @@ class NoteList extends React.Component {
       dialog.showMessageBox(remote.getCurrentWindow(), {
         type: 'warning',
         message: i18n.__('Sorry!'),
-        detail: i18n.__(warningMessage(msg)),
+        detail: i18n.__(warningMessage(msg) + ' is available only as a markdown note.'),
         buttons: [i18n.__('OK')]
       })
     }

From 9050035c7405236ea5a93384d58758f26b0d5633 Mon Sep 17 00:00:00 2001
From: Baptiste Augrain <daiyam@zokugun.org>
Date: Wed, 28 Nov 2018 00:44:15 +0100
Subject: [PATCH 030/159] - add option to enable/disable smart paste - add
 shortcut to paste smartly - use electron's clipboard

---
 browser/components/CodeEditor.js              | 150 ++++++++++--------
 browser/components/MarkdownEditor.js          |   2 +
 browser/components/MarkdownSplitEditor.js     |   2 +
 browser/main/Detail/SnippetNoteDetail.js      |   2 +
 browser/main/lib/ConfigManager.js             |   6 +-
 .../main/lib/dataApi/attachmentManagement.js  |  39 +++++
 .../main/modals/PreferencesModal/HotkeyTab.js |  14 +-
 browser/main/modals/PreferencesModal/UiTab.js |  15 +-
 8 files changed, 163 insertions(+), 67 deletions(-)

diff --git a/browser/components/CodeEditor.js b/browser/components/CodeEditor.js
index d2fcb9c5..c7b6e385 100644
--- a/browser/components/CodeEditor.js
+++ b/browser/components/CodeEditor.js
@@ -13,7 +13,7 @@ import crypto from 'crypto'
 import consts from 'browser/lib/consts'
 import styles from '../components/CodeEditor.styl'
 import fs from 'fs'
-const { ipcRenderer, remote } = require('electron')
+const { ipcRenderer, remote, clipboard } = require('electron')
 import normalizeEditorFontFamily from 'browser/lib/normalizeEditorFontFamily'
 const spellcheck = require('browser/lib/spellcheck')
 const buildEditorContextMenu = require('browser/lib/contextMenuBuilder')
@@ -25,6 +25,10 @@ CodeMirror.modeURL = '../node_modules/codemirror/mode/%N/%N.js'
 const buildCMRulers = (rulers, enableRulers) =>
   (enableRulers ? rulers.map(ruler => ({ column: ruler })) : [])
 
+function translateHotkey (hotkey) {
+  return hotkey.replace(/\s*\+\s*/g, '-').replace(/Command/g, 'Cmd').replace(/Control/g, 'Ctrl')
+}
+
 export default class CodeEditor extends React.Component {
   constructor (props) {
     super(props)
@@ -56,7 +60,11 @@ export default class CodeEditor extends React.Component {
         noteKey
       )
     }
-    this.pasteHandler = (editor, e) => this.handlePaste(editor, e)
+    this.pasteHandler = (editor, e) => {
+      e.preventDefault()
+
+      this.handlePaste(editor, false)
+    }
     this.loadStyleHandler = e => {
       this.editor.refresh()
     }
@@ -120,42 +128,8 @@ export default class CodeEditor extends React.Component {
     }
   }
 
-  updateTableEditorState () {
-    const active = this.tableEditor.cursorIsInTable(this.tableEditorOptions)
-    if (active) {
-      if (this.extraKeysMode !== 'editor') {
-        this.extraKeysMode = 'editor'
-        this.editor.setOption('extraKeys', this.editorKeyMap)
-      }
-    } else {
-      if (this.extraKeysMode !== 'default') {
-        this.extraKeysMode = 'default'
-        this.editor.setOption('extraKeys', this.defaultKeyMap)
-        this.tableEditor.resetSmartCursor()
-      }
-    }
-  }
-
-  componentDidMount () {
-    const { rulers, enableRulers } = this.props
-    const expandSnippet = this.expandSnippet.bind(this)
-    eventEmitter.on('line:jump', this.scrollToLineHandeler)
-
-    const defaultSnippet = [
-      {
-        id: crypto.randomBytes(16).toString('hex'),
-        name: 'Dummy text',
-        prefix: ['lorem', 'ipsum'],
-        content: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.'
-      }
-    ]
-    if (!fs.existsSync(consts.SNIPPET_FILE)) {
-      fs.writeFileSync(
-        consts.SNIPPET_FILE,
-        JSON.stringify(defaultSnippet, null, 4),
-        'utf8'
-      )
-    }
+  updateDefaultKeyMap () {
+    const { hotkey } = this.props
 
     this.defaultKeyMap = CodeMirror.normalizeKeyMap({
       Tab: function (cm) {
@@ -207,8 +181,51 @@ export default class CodeEditor extends React.Component {
           document.execCommand('copy')
         }
         return CodeMirror.Pass
+      },
+      [translateHotkey(hotkey.pasteSmartly)]: cm => {
+        this.handlePaste(cm, true)
       }
     })
+  }
+
+  updateTableEditorState () {
+    const active = this.tableEditor.cursorIsInTable(this.tableEditorOptions)
+    if (active) {
+      if (this.extraKeysMode !== 'editor') {
+        this.extraKeysMode = 'editor'
+        this.editor.setOption('extraKeys', this.editorKeyMap)
+      }
+    } else {
+      if (this.extraKeysMode !== 'default') {
+        this.extraKeysMode = 'default'
+        this.editor.setOption('extraKeys', this.defaultKeyMap)
+        this.tableEditor.resetSmartCursor()
+      }
+    }
+  }
+
+  componentDidMount () {
+    const { rulers, enableRulers } = this.props
+    const expandSnippet = this.expandSnippet.bind(this)
+    eventEmitter.on('line:jump', this.scrollToLineHandeler)
+
+    const defaultSnippet = [
+      {
+        id: crypto.randomBytes(16).toString('hex'),
+        name: 'Dummy text',
+        prefix: ['lorem', 'ipsum'],
+        content: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.'
+      }
+    ]
+    if (!fs.existsSync(consts.SNIPPET_FILE)) {
+      fs.writeFileSync(
+        consts.SNIPPET_FILE,
+        JSON.stringify(defaultSnippet, null, 4),
+        'utf8'
+      )
+    }
+
+    this.updateDefaultKeyMap()
 
     this.value = this.props.value
     this.editor = CodeMirror(this.refs.root, {
@@ -473,6 +490,14 @@ export default class CodeEditor extends React.Component {
       this.editor.setOption('extraKeys', this.defaultKeyMap)
     }
 
+    if (prevProps.hotkey !== this.props.hotkey) {
+      this.updateDefaultKeyMap()
+
+      if (this.extraKeysMode === 'default') {
+        this.editor.setOption('extraKeys', this.defaultKeyMap)
+      }
+    }
+
     if (this.state.clientWidth !== this.refs.root.clientWidth) {
       this.setState({
         clientWidth: this.refs.root.clientWidth
@@ -561,12 +586,8 @@ export default class CodeEditor extends React.Component {
     this.editor.replaceSelection(imageMd)
   }
 
-  handlePaste (editor, e) {
-    const { storageKey, noteKey, fetchUrlTitle } = this.props
-
-    const clipboardData = e.clipboardData
-    const dataTransferItem = clipboardData.items[0]
-    const pastedTxt = clipboardData.getData('text')
+  handlePaste (editor, forceSmartPaste) {
+    const { storageKey, noteKey, fetchUrlTitle, enableSmartPaste } = this.props
 
     const isURL = str => {
       const matcher = /^(?:\w+:)?\/\/([^\s\.]+\.\S{2}|localhost[\:?\d]*)\S*$/
@@ -623,27 +644,34 @@ export default class CodeEditor extends React.Component {
       return false
     }
 
+    const pastedTxt = clipboard.readText()
+
     if (isInFencedCodeBlock(editor)) {
-      this.handlePasteText(e, editor, pastedTxt)
-    } else {
-      const pastedHtml = clipboardData.getData('text/html')
-      if (pastedHtml !== '') {
-        this.handlePasteHtml(e, editor, pastedHtml)
-      } else if (dataTransferItem.type.match('image')) {
-        attachmentManagement.handlePastImageEvent(
+      this.handlePasteText(editor, pastedTxt)
+    } else if (fetchUrlTitle && isURL(pastedTxt) && !isInLinkTag(editor)) {
+      this.handlePasteUrl(editor, pastedTxt)
+    } else if (enableSmartPaste || forceSmartPaste) {
+      const image = clipboard.readImage()
+      if (!image.isEmpty()) {
+        attachmentManagement.handlePastNativeImage(
           this,
           storageKey,
           noteKey,
-          dataTransferItem
+          image
         )
-      } else if (fetchUrlTitle && isURL(pastedTxt) && !isInLinkTag(editor)) {
-        this.handlePasteUrl(e, editor, pastedTxt)
+      } else {
+        const pastedHtml = clipboard.readHTML()
+        if (pastedHtml.length > 0) {
+          this.handlePasteHtml(editor, pastedHtml)
+        } else {
+          this.handlePasteText(editor, pastedTxt)
+        }
       }
+    } else {
+      this.handlePasteText(editor, pastedTxt)
     }
 
     if (attachmentManagement.isAttachmentLink(pastedTxt)) {
-      e.preventDefault()
-
       attachmentManagement
         .handleAttachmentLinkPaste(storageKey, noteKey, pastedTxt)
         .then(modifiedText => {
@@ -658,8 +686,7 @@ export default class CodeEditor extends React.Component {
     }
   }
 
-  handlePasteUrl (e, editor, pastedTxt) {
-    e.preventDefault()
+  handlePasteUrl (editor, pastedTxt) {
     const taggedUrl = `<${pastedTxt}>`
     editor.replaceSelection(taggedUrl)
 
@@ -698,15 +725,12 @@ export default class CodeEditor extends React.Component {
       })
   }
 
-  handlePasteHtml (e, editor, pastedHtml) {
-    e.preventDefault()
+  handlePasteHtml (editor, pastedHtml) {
     const markdown = this.turndownService.turndown(pastedHtml)
     editor.replaceSelection(markdown)
   }
 
-  handlePasteText (e, editor, pastedTxt) {
-    e.preventDefault()
-
+  handlePasteText (editor, pastedTxt) {
     editor.replaceSelection(pastedTxt)
   }
 
diff --git a/browser/components/MarkdownEditor.js b/browser/components/MarkdownEditor.js
index 20ce9451..f1aa8d73 100644
--- a/browser/components/MarkdownEditor.js
+++ b/browser/components/MarkdownEditor.js
@@ -278,6 +278,8 @@ class MarkdownEditor extends React.Component {
           onChange={(e) => this.handleChange(e)}
           onBlur={(e) => this.handleBlur(e)}
           spellCheck={config.editor.spellcheck}
+          enableSmartPaste={config.editor.enableSmartPaste}
+          hotkey={config.hotkey}
         />
         <MarkdownPreview styleName={this.state.status === 'PREVIEW'
             ? 'preview'
diff --git a/browser/components/MarkdownSplitEditor.js b/browser/components/MarkdownSplitEditor.js
index 0ab52a56..fb7b21f5 100644
--- a/browser/components/MarkdownSplitEditor.js
+++ b/browser/components/MarkdownSplitEditor.js
@@ -172,6 +172,8 @@ class MarkdownSplitEditor extends React.Component {
           onChange={this.handleOnChange.bind(this)}
           onScroll={this.handleScroll.bind(this)}
           spellCheck={config.editor.spellcheck}
+          enableSmartPaste={config.editor.enableSmartPaste}
+          hotkey={config.hotkey}
        />
         <div styleName='slider' style={{left: this.state.codeEditorWidthInPercent + '%'}} onMouseDown={e => this.handleMouseDown(e)} >
           <div styleName='slider-hitbox' />
diff --git a/browser/main/Detail/SnippetNoteDetail.js b/browser/main/Detail/SnippetNoteDetail.js
index 4a38ffe5..c839fb94 100644
--- a/browser/main/Detail/SnippetNoteDetail.js
+++ b/browser/main/Detail/SnippetNoteDetail.js
@@ -717,6 +717,8 @@ class SnippetNoteDetail extends React.Component {
             enableTableEditor={config.editor.enableTableEditor}
             onChange={(e) => this.handleCodeChange(index)(e)}
             ref={'code-' + index}
+            enableSmartPaste={config.editor.enableSmartPaste}
+            hotkey={config.hotkey}
           />
         }
       </div>
diff --git a/browser/main/lib/ConfigManager.js b/browser/main/lib/ConfigManager.js
index d6b04d9b..c2ff9f7a 100644
--- a/browser/main/lib/ConfigManager.js
+++ b/browser/main/lib/ConfigManager.js
@@ -25,7 +25,8 @@ export const DEFAULT_CONFIG = {
   hotkey: {
     toggleMain: OSX ? 'Command + Alt + L' : 'Super + Alt + E',
     toggleMode: OSX ? 'Command + Alt + M' : 'Ctrl + M',
-    deleteNote: OSX ? 'Command + Shift + Backspace' : 'Ctrl + Shift + Backspace'
+    deleteNote: OSX ? 'Command + Shift + Backspace' : 'Ctrl + Shift + Backspace',
+    pasteSmartly: OSX ? 'Command + Shift + V' : 'Ctrl + Shift + V'
   },
   ui: {
     language: 'en',
@@ -52,7 +53,8 @@ export const DEFAULT_CONFIG = {
     enableTableEditor: false,
     enableFrontMatterTitle: true,
     frontMatterTitleField: 'title',
-    spellcheck: false
+    spellcheck: false,
+    enableSmartPaste: false
   },
   preview: {
     fontSize: '14',
diff --git a/browser/main/lib/dataApi/attachmentManagement.js b/browser/main/lib/dataApi/attachmentManagement.js
index c193eaf2..373efddc 100644
--- a/browser/main/lib/dataApi/attachmentManagement.js
+++ b/browser/main/lib/dataApi/attachmentManagement.js
@@ -316,6 +316,44 @@ function handlePastImageEvent (codeEditor, storageKey, noteKey, dataTransferItem
   reader.readAsDataURL(blob)
 }
 
+/**
+ * @description Creates a new file in the storage folder belonging to the current note and inserts the correct markdown code
+ * @param {CodeEditor} codeEditor Markdown editor. Its insertAttachmentMd() method will be called to include the markdown code
+ * @param {String} storageKey Key of the current storage
+ * @param {String} noteKey Key of the current note
+ * @param {NativeImage} image The native image
+ */
+function handlePastNativeImage (codeEditor, storageKey, noteKey, image) {
+  if (!codeEditor) {
+    throw new Error('codeEditor has to be given')
+  }
+  if (!storageKey) {
+    throw new Error('storageKey has to be given')
+  }
+
+  if (!noteKey) {
+    throw new Error('noteKey has to be given')
+  }
+  if (!image) {
+    throw new Error('image has to be given')
+  }
+
+  const targetStorage = findStorage.findStorage(storageKey)
+  const destinationDir = path.join(targetStorage.path, DESTINATION_FOLDER, noteKey)
+
+  createAttachmentDestinationFolder(targetStorage.path, noteKey)
+
+  const imageName = `${uniqueSlug()}.png`
+  const imagePath = path.join(destinationDir, imageName)
+
+  const binaryData = image.toPNG()
+  fs.writeFileSync(imagePath, binaryData, 'binary')
+
+  const imageReferencePath = path.join(STORAGE_FOLDER_PLACEHOLDER, noteKey, imageName)
+  const imageMd = generateAttachmentMarkdown(imageName, imageReferencePath, true)
+  codeEditor.insertAttachmentMd(imageMd)
+}
+
 /**
 * @description Returns all attachment paths of the given markdown
 * @param {String} markdownContent content in which the attachment paths should be found
@@ -539,6 +577,7 @@ module.exports = {
   generateAttachmentMarkdown,
   handleAttachmentDrop,
   handlePastImageEvent,
+  handlePastNativeImage,
   getAttachmentsInMarkdownContent,
   getAbsolutePathsOfAttachmentsInContent,
   removeStorageAndNoteReferences,
diff --git a/browser/main/modals/PreferencesModal/HotkeyTab.js b/browser/main/modals/PreferencesModal/HotkeyTab.js
index 7ad6f606..a0f6a739 100644
--- a/browser/main/modals/PreferencesModal/HotkeyTab.js
+++ b/browser/main/modals/PreferencesModal/HotkeyTab.js
@@ -79,7 +79,8 @@ class HotkeyTab extends React.Component {
     config.hotkey = {
       toggleMain: this.refs.toggleMain.value,
       toggleMode: this.refs.toggleMode.value,
-      deleteNote: this.refs.deleteNote.value
+      deleteNote: this.refs.deleteNote.value,
+      pasteSmartly: this.refs.pasteSmartly.value
     }
     this.setState({
       config
@@ -149,6 +150,17 @@ class HotkeyTab extends React.Component {
               />
             </div>
           </div>
+          <div styleName='group-section'>
+            <div styleName='group-section-label'>{i18n.__('Paste Smartly')}</div>
+            <div styleName='group-section-control'>
+              <input styleName='group-section-control-input'
+                onChange={(e) => this.handleHotkeyChange(e)}
+                ref='pasteSmartly'
+                value={config.hotkey.pasteSmartly}
+                type='text'
+              />
+            </div>
+          </div>
           <div styleName='group-control'>
             <button styleName='group-control-leftButton'
               onClick={(e) => this.handleHintToggleButtonClick(e)}
diff --git a/browser/main/modals/PreferencesModal/UiTab.js b/browser/main/modals/PreferencesModal/UiTab.js
index a52bee9d..737ea1eb 100644
--- a/browser/main/modals/PreferencesModal/UiTab.js
+++ b/browser/main/modals/PreferencesModal/UiTab.js
@@ -96,7 +96,8 @@ class UiTab extends React.Component {
         enableTableEditor: this.refs.enableTableEditor.checked,
         enableFrontMatterTitle: this.refs.enableFrontMatterTitle.checked,
         frontMatterTitleField: this.refs.frontMatterTitleField.value,
-        spellcheck: this.refs.spellcheck.checked
+        spellcheck: this.refs.spellcheck.checked,
+        enableSmartPaste: this.refs.enableSmartPaste.checked,
       },
       preview: {
         fontSize: this.refs.previewFontSize.value,
@@ -552,6 +553,18 @@ class UiTab extends React.Component {
               {i18n.__('Enable smart table editor')}
             </label>
           </div>
+
+          <div styleName='group-checkBoxSection'>
+            <label>
+              <input onChange={(e) => this.handleUIChange(e)}
+                checked={this.state.config.editor.enableSmartPaste}
+                ref='enableSmartPaste'
+                type='checkbox'
+              />&nbsp;
+              {i18n.__('Enable smart paste')}
+            </label>
+          </div>
+
           <div styleName='group-checkBoxSection'>
             <label>
               <input onChange={(e) => this.handleUIChange(e)}

From 2aa296ff335217450fd409e81cfb5119d1be0252 Mon Sep 17 00:00:00 2001
From: Baptiste Augrain <daiyam@zokugun.org>
Date: Wed, 28 Nov 2018 00:45:20 +0100
Subject: [PATCH 031/159] fix lint error

---
 browser/main/modals/PreferencesModal/UiTab.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser/main/modals/PreferencesModal/UiTab.js b/browser/main/modals/PreferencesModal/UiTab.js
index 737ea1eb..becd4f54 100644
--- a/browser/main/modals/PreferencesModal/UiTab.js
+++ b/browser/main/modals/PreferencesModal/UiTab.js
@@ -97,7 +97,7 @@ class UiTab extends React.Component {
         enableFrontMatterTitle: this.refs.enableFrontMatterTitle.checked,
         frontMatterTitleField: this.refs.frontMatterTitleField.value,
         spellcheck: this.refs.spellcheck.checked,
-        enableSmartPaste: this.refs.enableSmartPaste.checked,
+        enableSmartPaste: this.refs.enableSmartPaste.checked
       },
       preview: {
         fontSize: this.refs.previewFontSize.value,

From a39da481e0e403b078b6ac03e462d97cbe8c2596 Mon Sep 17 00:00:00 2001
From: Miguel Teixeira <miguelalexbt@outlook.com>
Date: Wed, 28 Nov 2018 09:08:58 +0000
Subject: [PATCH 032/159] Changed message.

---
 browser/main/Detail/SnippetNoteDetail.js | 2 +-
 browser/main/NoteList/index.js           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/browser/main/Detail/SnippetNoteDetail.js b/browser/main/Detail/SnippetNoteDetail.js
index 47e4de98..ddcc50bf 100644
--- a/browser/main/Detail/SnippetNoteDetail.js
+++ b/browser/main/Detail/SnippetNoteDetail.js
@@ -644,7 +644,7 @@ class SnippetNoteDetail extends React.Component {
     dialog.showMessageBox(remote.getCurrentWindow(), {
       type: 'warning',
       message: i18n.__('Sorry!'),
-      detail: i18n.__(warningMessage(msg) + ' is available only as a markdown note.'),
+      detail: i18n.__(warningMessage(msg) + ' is available only in markdown notes.'),
       buttons: [i18n.__('OK')]
     })
   }
diff --git a/browser/main/NoteList/index.js b/browser/main/NoteList/index.js
index 51e7a41c..3293787d 100644
--- a/browser/main/NoteList/index.js
+++ b/browser/main/NoteList/index.js
@@ -507,7 +507,7 @@ class NoteList extends React.Component {
       dialog.showMessageBox(remote.getCurrentWindow(), {
         type: 'warning',
         message: i18n.__('Sorry!'),
-        detail: i18n.__(warningMessage(msg) + ' is available only as a markdown note.'),
+        detail: i18n.__(warningMessage(msg) + ' is available only in markdown notes.'),
         buttons: [i18n.__('OK')]
       })
     }

From df3b2cd8fe8d5ad9b45e115ed4fe9521dab8317a Mon Sep 17 00:00:00 2001
From: Baptiste Augrain <daiyam@zokugun.org>
Date: Wed, 28 Nov 2018 15:12:18 +0100
Subject: [PATCH 033/159] fix double paste when pasting attachement links

---
 browser/components/CodeEditor.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/browser/components/CodeEditor.js b/browser/components/CodeEditor.js
index c7b6e385..b72886c3 100644
--- a/browser/components/CodeEditor.js
+++ b/browser/components/CodeEditor.js
@@ -645,6 +645,7 @@ export default class CodeEditor extends React.Component {
     }
 
     const pastedTxt = clipboard.readText()
+    console.log(pastedTxt)
 
     if (isInFencedCodeBlock(editor)) {
       this.handlePasteText(editor, pastedTxt)
@@ -667,16 +668,14 @@ export default class CodeEditor extends React.Component {
           this.handlePasteText(editor, pastedTxt)
         }
       }
-    } else {
-      this.handlePasteText(editor, pastedTxt)
-    }
-
-    if (attachmentManagement.isAttachmentLink(pastedTxt)) {
+    } else if (attachmentManagement.isAttachmentLink(pastedTxt)) {
       attachmentManagement
         .handleAttachmentLinkPaste(storageKey, noteKey, pastedTxt)
         .then(modifiedText => {
           this.editor.replaceSelection(modifiedText)
         })
+    } else {
+      this.handlePasteText(editor, pastedTxt)
     }
   }
 

From df20662005fc0ff22a97d9c9001f87575f7c02a9 Mon Sep 17 00:00:00 2001
From: Baptiste Augrain <daiyam@zokugun.org>
Date: Wed, 28 Nov 2018 16:42:10 +0100
Subject: [PATCH 034/159] remove console.log

---
 browser/components/CodeEditor.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/browser/components/CodeEditor.js b/browser/components/CodeEditor.js
index b72886c3..8b4323c4 100644
--- a/browser/components/CodeEditor.js
+++ b/browser/components/CodeEditor.js
@@ -645,7 +645,6 @@ export default class CodeEditor extends React.Component {
     }
 
     const pastedTxt = clipboard.readText()
-    console.log(pastedTxt)
 
     if (isInFencedCodeBlock(editor)) {
       this.handlePasteText(editor, pastedTxt)

From fdb54b5cdcbf12259210bbeeb2181e2dc33e4f77 Mon Sep 17 00:00:00 2001
From: Baptiste Augrain <daiyam@zokugun.org>
Date: Wed, 28 Nov 2018 16:47:19 +0100
Subject: [PATCH 035/159] fix expanding snippet

---
 browser/components/CodeEditor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser/components/CodeEditor.js b/browser/components/CodeEditor.js
index 8b4323c4..31361b9b 100644
--- a/browser/components/CodeEditor.js
+++ b/browser/components/CodeEditor.js
@@ -130,6 +130,7 @@ export default class CodeEditor extends React.Component {
 
   updateDefaultKeyMap () {
     const { hotkey } = this.props
+    const expandSnippet = this.expandSnippet.bind(this)
 
     this.defaultKeyMap = CodeMirror.normalizeKeyMap({
       Tab: function (cm) {
@@ -206,7 +207,6 @@ export default class CodeEditor extends React.Component {
 
   componentDidMount () {
     const { rulers, enableRulers } = this.props
-    const expandSnippet = this.expandSnippet.bind(this)
     eventEmitter.on('line:jump', this.scrollToLineHandeler)
 
     const defaultSnippet = [

From aa20bc769cfed3493c2a1582e45ead528f5f9fc2 Mon Sep 17 00:00:00 2001
From: Miguel Teixeira <miguelalexbt@outlook.com>
Date: Thu, 29 Nov 2018 17:06:28 +0000
Subject: [PATCH 036/159] Fixed lock button behaviour and display

---
 browser/components/MarkdownEditor.js      | 4 ++--
 browser/main/Detail/MarkdownNoteDetail.js | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/browser/components/MarkdownEditor.js b/browser/components/MarkdownEditor.js
index f3bb92bb..e2bc5e23 100644
--- a/browser/components/MarkdownEditor.js
+++ b/browser/components/MarkdownEditor.js
@@ -19,10 +19,10 @@ class MarkdownEditor extends React.Component {
     this.supportMdSelectionBold = [16, 17, 186]
 
     this.state = {
-      status: props.config.editor.switchPreview === 'RIGHTCLICK' ? props.config.editor.delfaultStatus : 'PREVIEW',
+      status: props.config.editor.switchPreview === 'RIGHTCLICK' ? props.config.editor.delfaultStatus : 'CODE',
       renderValue: props.value,
       keyPressed: new Set(),
-      isLocked: false
+      isLocked: props.isLocked
     }
 
     this.lockEditorCode = () => this.handleLockEditor()
diff --git a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/MarkdownNoteDetail.js
index 116fdec0..588af9ae 100755
--- a/browser/main/Detail/MarkdownNoteDetail.js
+++ b/browser/main/Detail/MarkdownNoteDetail.js
@@ -288,6 +288,8 @@ class MarkdownNoteDetail extends React.Component {
   }
 
   handleSwitchMode (type) {
+    // If in split mode, hide the lock button
+    if (type === 'SPLIT') this.setState({isLockButtonShown: false})
     this.setState({ editorType: type }, () => {
       this.focus()
       const newConfig = Object.assign({}, this.props.config)
@@ -332,6 +334,7 @@ class MarkdownNoteDetail extends React.Component {
         storageKey={note.storage}
         noteKey={note.key}
         onChange={this.handleUpdateContent.bind(this)}
+        isLocked={this.state.isLocked}
         ignorePreviewPointerEvents={ignorePreviewPointerEvents}
       />
     } else {

From b8a295713c6ab5de1ae2f8dff140a8fdbc4633b2 Mon Sep 17 00:00:00 2001
From: Guilherme Silva <guilhermejosesilva@gmail.com>
Date: Fri, 30 Nov 2018 08:42:27 +0000
Subject: [PATCH 037/159] Dragged note highlighting

---
 browser/main/SideNav/StorageItem.js | 43 ++++++++++++++++++++---------
 1 file changed, 30 insertions(+), 13 deletions(-)

diff --git a/browser/main/SideNav/StorageItem.js b/browser/main/SideNav/StorageItem.js
index d17314b3..3ac69818 100644
--- a/browser/main/SideNav/StorageItem.js
+++ b/browser/main/SideNav/StorageItem.js
@@ -25,7 +25,8 @@ class StorageItem extends React.Component {
     const { storage } = this.props
 
     this.state = {
-      isOpen: !!storage.isOpen
+      isOpen: !!storage.isOpen,
+      draggedOver: null
     }
   }
 
@@ -231,14 +232,18 @@ class StorageItem extends React.Component {
     }
   }
 
-  handleDragEnter (e) {
-    e.dataTransfer.setData('defaultColor', e.target.style.backgroundColor)
-    e.target.style.backgroundColor = 'rgba(129, 130, 131, 0.08)'
+  handleDragEnter (e, key) {
+    if (this.state.draggedOver === key) { return }
+    this.setState({
+      draggedOver: key
+    })
   }
 
   handleDragLeave (e) {
-    e.target.style.opacity = '1'
-    e.target.style.backgroundColor = e.dataTransfer.getData('defaultColor')
+    if (this.state.draggedOver === null) { return }
+    this.setState({
+      draggedOver: null
+    })
   }
 
   dropNote (storage, folder, dispatch, location, noteData) {
@@ -263,8 +268,11 @@ class StorageItem extends React.Component {
   }
 
   handleDrop (e, storage, folder, dispatch, location) {
-    e.target.style.opacity = '1'
-    e.target.style.backgroundColor = e.dataTransfer.getData('defaultColor')
+    if (this.state.draggedOver !== null) {
+      this.setState({
+        draggedOver: null
+      })
+    }
     const noteData = JSON.parse(e.dataTransfer.getData('note'))
     this.dropNote(storage, folder, dispatch, location, noteData)
   }
@@ -274,7 +282,7 @@ class StorageItem extends React.Component {
     const { folderNoteMap, trashedSet } = data
     const SortableStorageItemChild = SortableElement(StorageItemChild)
     const folderList = storage.folders.map((folder, index) => {
-      let folderRegex = new RegExp(escapeStringRegexp(path.sep) + 'storages' + escapeStringRegexp(path.sep) + storage.key + escapeStringRegexp(path.sep) + 'folders' + escapeStringRegexp(path.sep) + folder.key)
+      const folderRegex = new RegExp(escapeStringRegexp(path.sep) + 'storages' + escapeStringRegexp(path.sep) + storage.key + escapeStringRegexp(path.sep) + 'folders' + escapeStringRegexp(path.sep) + folder.key)
       const isActive = !!(location.pathname.match(folderRegex))
       const noteSet = folderNoteMap.get(storage.key + '-' + folder.key)
 
@@ -291,16 +299,25 @@ class StorageItem extends React.Component {
         <SortableStorageItemChild
           key={folder.key}
           index={index}
-          isActive={isActive}
+          isActive={isActive || folder.key === this.state.draggedOver}
           handleButtonClick={(e) => this.handleFolderButtonClick(folder.key)(e)}
           handleContextMenu={(e) => this.handleFolderButtonContextMenu(e, folder)}
           folderName={folder.name}
           folderColor={folder.color}
           isFolded={isFolded}
           noteCount={noteCount}
-          handleDrop={(e) => this.handleDrop(e, storage, folder, dispatch, location)}
-          handleDragEnter={this.handleDragEnter}
-          handleDragLeave={this.handleDragLeave}
+          handleDrop={(e) => {
+            e.preventDefault()
+            this.handleDrop(e, storage, folder, dispatch, location)
+          }}
+          handleDragEnter={(e) => {
+            e.preventDefault()
+            this.handleDragEnter(e, folder.key)
+          }}
+          handleDragLeave={(e) => {
+            e.preventDefault()
+            this.handleDragLeave(e, folder)
+          }}
         />
       )
     })

From 45436f65afd66f607338bf042594ed15a147f5fa Mon Sep 17 00:00:00 2001
From: Duarte-Frazao <duartemarquesmano@gmail.com>
Date: Fri, 30 Nov 2018 18:03:23 +0000
Subject: [PATCH 038/159] Issue #2469 almost done, missing refactor to reduce
 calls on code mirror

---
 browser/components/CodeEditor.js          | 37 +++++++++++++++++++++--
 browser/lib/newNote.js                    |  3 +-
 browser/main/Detail/SnippetNoteDetail.js  |  6 +++-
 browser/main/lib/dataApi/createNote.js    |  3 +-
 browser/main/lib/dataApi/updateNote.js    |  6 ++--
 browser/main/lib/dataApi/updateSnippet.js |  4 ++-
 6 files changed, 51 insertions(+), 8 deletions(-)

diff --git a/browser/components/CodeEditor.js b/browser/components/CodeEditor.js
index 130cc86e..2ceca341 100644
--- a/browser/components/CodeEditor.js
+++ b/browser/components/CodeEditor.js
@@ -34,6 +34,7 @@ export default class CodeEditor extends React.Component {
       trailing: true
     })
     this.changeHandler = (editor, changeObject) => this.handleChange(editor, changeObject)
+    this.highlightHandler = (editor, changeObject) => this.handleHighlight(editor, changeObject)
     this.focusHandler = () => {
       ipcRenderer.send('editor:focused', true)
     }
@@ -208,12 +209,13 @@ export default class CodeEditor extends React.Component {
         }
         return CodeMirror.Pass
       }
-    })
+    })   
 
     this.value = this.props.value
     this.editor = CodeMirror(this.refs.root, {
       rulers: buildCMRulers(rulers, enableRulers),
       value: this.props.value,
+      linesHighlighted:this.props.linesHighlighted,
       lineNumbers: this.props.displayLineNumbers,
       lineWrapping: true,
       theme: this.props.theme,
@@ -240,6 +242,7 @@ export default class CodeEditor extends React.Component {
     this.editor.on('focus', this.focusHandler)
     this.editor.on('blur', this.blurHandler)
     this.editor.on('change', this.changeHandler)
+    this.editor.on("gutterClick",this.highlightHandler)
     this.editor.on('paste', this.pasteHandler)
     this.editor.on('contextmenu', this.contextMenuHandler)
     eventEmitter.on('top:search', this.searchHandler)
@@ -316,9 +319,11 @@ export default class CodeEditor extends React.Component {
     this.setState({
       clientWidth: this.refs.root.clientWidth
     })
+
+    this.initialHighlighting()    
   }
 
-  expandSnippet (line, cursor, cm, snippets) {
+  expandSnippet (line, cursor, cm, snippets) {    
     const wordBeforeCursor = this.getWordBeforeCursor(
       line,
       cursor.line,
@@ -512,6 +517,19 @@ export default class CodeEditor extends React.Component {
     }
   }
 
+  handleHighlight (editor, changeObject) {
+    if(!editor.options.linesHighlighted.includes(changeObject)){
+      editor.options.linesHighlighted.push(changeObject)
+      editor.addLineClass(changeObject,'text',"CodeMirror-activeline-background")
+    }else{
+      editor.options.linesHighlighted.splice(editor.options.linesHighlighted.indexOf(changeObject),1)
+      editor.removeLineClass(changeObject,'text',"CodeMirror-activeline-background")
+    }
+    if (this.props.onChange) {
+      this.props.onChange(editor)
+    }
+  }
+
   moveCursorTo (row, col) {}
 
   scrollToLine (event, num) {
@@ -536,6 +554,7 @@ export default class CodeEditor extends React.Component {
     this.value = this.props.value
     this.editor.setValue(this.props.value)
     this.editor.clearHistory()
+    this.restartHighlighting()
     this.editor.on('change', this.changeHandler)
     this.editor.refresh()
   }
@@ -546,6 +565,11 @@ export default class CodeEditor extends React.Component {
     this.editor.setCursor(cursor)
   }
 
+  restartHighlighting(){
+    this.editor.options.linesHighlighted = this.props.linesHighlighted
+    this.initialHighlighting();
+  }
+
   handleDropImage (dropEvent) {
     dropEvent.preventDefault()
     const { storageKey, noteKey } = this.props
@@ -683,6 +707,15 @@ export default class CodeEditor extends React.Component {
     })
   }
 
+  initialHighlighting(){
+    var count = this.editor.lineCount(), i;
+    for (i = 0; i < count; i++) {
+      if(this.editor.options.linesHighlighted.includes(i)){
+        this.editor.addLineClass(i,'text',"CodeMirror-activeline-background")
+      }
+    }
+  }
+
   mapImageResponse (response, pastedTxt) {
     return new Promise((resolve, reject) => {
       try {
diff --git a/browser/lib/newNote.js b/browser/lib/newNote.js
index 0b64d0e1..9b701a02 100644
--- a/browser/lib/newNote.js
+++ b/browser/lib/newNote.js
@@ -56,7 +56,8 @@ export function createSnippetNote (storage, folder, dispatch, location, params,
         {
           name: '',
           mode: config.editor.snippetDefaultLanguage || 'text',
-          content: ''
+          content: '',
+          linesHighlighted:[],
         }
       ]
     })
diff --git a/browser/main/Detail/SnippetNoteDetail.js b/browser/main/Detail/SnippetNoteDetail.js
index 4a38ffe5..b8d0fe5b 100644
--- a/browser/main/Detail/SnippetNoteDetail.js
+++ b/browser/main/Detail/SnippetNoteDetail.js
@@ -410,6 +410,8 @@ class SnippetNoteDetail extends React.Component {
     return (e) => {
       const snippets = this.state.note.snippets.slice()
       snippets[index].content = this.refs['code-' + index].value
+      snippets[index].linesHighlighted=e.options.linesHighlighted
+
       this.setState(state => ({note: Object.assign(state.note, {snippets: snippets})}))
       this.setState(state => ({
         note: state.note
@@ -602,7 +604,8 @@ class SnippetNoteDetail extends React.Component {
     note.snippets = note.snippets.concat([{
       name: '',
       mode: config.editor.snippetDefaultLanguage || 'text',
-      content: ''
+      content: '',
+      linesHighlighted:[]
     }])
     const snippetIndex = note.snippets.length - 1
 
@@ -705,6 +708,7 @@ class SnippetNoteDetail extends React.Component {
           : <CodeEditor styleName='tabView-content'
             mode={snippet.mode}
             value={snippet.content}
+            linesHighlighted={snippet.linesHighlighted}
             theme={config.editor.theme}
             fontFamily={config.editor.fontFamily}
             fontSize={editorFontSize}
diff --git a/browser/main/lib/dataApi/createNote.js b/browser/main/lib/dataApi/createNote.js
index e5d44489..60bf1f42 100644
--- a/browser/main/lib/dataApi/createNote.js
+++ b/browser/main/lib/dataApi/createNote.js
@@ -23,7 +23,8 @@ function validateInput (input) {
         input.snippets = [{
           name: '',
           mode: 'text',
-          content: ''
+          content: '',
+          linesHighlighted:[],
         }]
       }
       break
diff --git a/browser/main/lib/dataApi/updateNote.js b/browser/main/lib/dataApi/updateNote.js
index 147fbc06..1c8bd882 100644
--- a/browser/main/lib/dataApi/updateNote.js
+++ b/browser/main/lib/dataApi/updateNote.js
@@ -51,7 +51,8 @@ function validateInput (input) {
           validatedInput.snippets = [{
             name: '',
             mode: 'text',
-            content: ''
+            content: '',
+            linesHighlighted:[],
           }]
         } else {
           validatedInput.snippets = input.snippets
@@ -96,7 +97,8 @@ function updateNote (storageKey, noteKey, input) {
             snippets: [{
               name: '',
               mode: 'text',
-              content: ''
+              content: '',
+              linesHighlighted:[],
             }]
           }
           : {
diff --git a/browser/main/lib/dataApi/updateSnippet.js b/browser/main/lib/dataApi/updateSnippet.js
index f2310b8e..7a296130 100644
--- a/browser/main/lib/dataApi/updateSnippet.js
+++ b/browser/main/lib/dataApi/updateSnippet.js
@@ -12,7 +12,8 @@ function updateSnippet (snippet, snippetFile) {
         if (
           currentSnippet.name === snippet.name &&
           currentSnippet.prefix === snippet.prefix &&
-          currentSnippet.content === snippet.content
+          currentSnippet.content === snippet.content && 
+          currentSnippet.linesHighlighted===snippet.linesHighlighted 
         ) {
           // if everything is the same then don't write to disk
           resolve(snippets)
@@ -20,6 +21,7 @@ function updateSnippet (snippet, snippetFile) {
           currentSnippet.name = snippet.name
           currentSnippet.prefix = snippet.prefix
           currentSnippet.content = snippet.content
+          currentSnippet.linesHighlighted = (snippet.linesHighlighted)
           fs.writeFile(snippetFile || consts.SNIPPET_FILE, JSON.stringify(snippets, null, 4), (err) => {
             if (err) reject(err)
             resolve(snippets)

From 1668ef6bb4aba35258488a9fa9984e00952d90e8 Mon Sep 17 00:00:00 2001
From: Duarte-Frazao <duartemarquesmano@gmail.com>
Date: Fri, 30 Nov 2018 18:32:14 +0000
Subject: [PATCH 039/159] Small changes

---
 browser/components/CodeEditor.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/browser/components/CodeEditor.js b/browser/components/CodeEditor.js
index 2ceca341..adcb6bf0 100644
--- a/browser/components/CodeEditor.js
+++ b/browser/components/CodeEditor.js
@@ -518,11 +518,12 @@ export default class CodeEditor extends React.Component {
   }
 
   handleHighlight (editor, changeObject) {
-    if(!editor.options.linesHighlighted.includes(changeObject)){
-      editor.options.linesHighlighted.push(changeObject)
+    let lines =editor.options.linesHighlighted 
+    if(!lines.includes(changeObject)){
+      lines.push(changeObject)
       editor.addLineClass(changeObject,'text',"CodeMirror-activeline-background")
     }else{
-      editor.options.linesHighlighted.splice(editor.options.linesHighlighted.indexOf(changeObject),1)
+      lines.splice(lines.indexOf(changeObject),1)
       editor.removeLineClass(changeObject,'text',"CodeMirror-activeline-background")
     }
     if (this.props.onChange) {
@@ -567,7 +568,7 @@ export default class CodeEditor extends React.Component {
 
   restartHighlighting(){
     this.editor.options.linesHighlighted = this.props.linesHighlighted
-    this.initialHighlighting();
+    this.initialHighlighting()
   }
 
   handleDropImage (dropEvent) {
@@ -708,7 +709,7 @@ export default class CodeEditor extends React.Component {
   }
 
   initialHighlighting(){
-    var count = this.editor.lineCount(), i;
+    var count = this.editor.lineCount(), i
     for (i = 0; i < count; i++) {
       if(this.editor.options.linesHighlighted.includes(i)){
         this.editor.addLineClass(i,'text',"CodeMirror-activeline-background")

From a9442a019f9263dc3fddc038dda055fdbb781707 Mon Sep 17 00:00:00 2001
From: Duarte-Frazao <duartemarquesmano@gmail.com>
Date: Fri, 30 Nov 2018 19:20:40 +0000
Subject: [PATCH 040/159] Changes to pass tests and lint code

---
 browser/components/CodeEditor.js          | 34 +++++++++++------------
 browser/lib/newNote.js                    |  2 +-
 browser/main/Detail/SnippetNoteDetail.js  |  4 +--
 browser/main/lib/dataApi/createNote.js    |  2 +-
 browser/main/lib/dataApi/updateNote.js    |  4 +--
 browser/main/lib/dataApi/updateSnippet.js |  4 +--
 6 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/browser/components/CodeEditor.js b/browser/components/CodeEditor.js
index adcb6bf0..8af89ded 100644
--- a/browser/components/CodeEditor.js
+++ b/browser/components/CodeEditor.js
@@ -209,13 +209,13 @@ export default class CodeEditor extends React.Component {
         }
         return CodeMirror.Pass
       }
-    })   
+    })
 
     this.value = this.props.value
     this.editor = CodeMirror(this.refs.root, {
       rulers: buildCMRulers(rulers, enableRulers),
       value: this.props.value,
-      linesHighlighted:this.props.linesHighlighted,
+      linesHighlighted: this.props.linesHighlighted,
       lineNumbers: this.props.displayLineNumbers,
       lineWrapping: true,
       theme: this.props.theme,
@@ -242,7 +242,7 @@ export default class CodeEditor extends React.Component {
     this.editor.on('focus', this.focusHandler)
     this.editor.on('blur', this.blurHandler)
     this.editor.on('change', this.changeHandler)
-    this.editor.on("gutterClick",this.highlightHandler)
+    this.editor.on('gutterClick', this.highlightHandler)
     this.editor.on('paste', this.pasteHandler)
     this.editor.on('contextmenu', this.contextMenuHandler)
     eventEmitter.on('top:search', this.searchHandler)
@@ -320,10 +320,10 @@ export default class CodeEditor extends React.Component {
       clientWidth: this.refs.root.clientWidth
     })
 
-    this.initialHighlighting()    
+    this.initialHighlighting()
   }
 
-  expandSnippet (line, cursor, cm, snippets) {    
+  expandSnippet (line, cursor, cm, snippets) {
     const wordBeforeCursor = this.getWordBeforeCursor(
       line,
       cursor.line,
@@ -518,13 +518,13 @@ export default class CodeEditor extends React.Component {
   }
 
   handleHighlight (editor, changeObject) {
-    let lines =editor.options.linesHighlighted 
-    if(!lines.includes(changeObject)){
+    const lines = editor.options.linesHighlighted
+    if (!lines.includes(changeObject)) {
       lines.push(changeObject)
-      editor.addLineClass(changeObject,'text',"CodeMirror-activeline-background")
-    }else{
-      lines.splice(lines.indexOf(changeObject),1)
-      editor.removeLineClass(changeObject,'text',"CodeMirror-activeline-background")
+      editor.addLineClass(changeObject, 'text', 'CodeMirror-activeline-background')
+    } else {
+      lines.splice(lines.indexOf(changeObject), 1)
+      editor.removeLineClass(changeObject, 'text', 'CodeMirror-activeline-background')
     }
     if (this.props.onChange) {
       this.props.onChange(editor)
@@ -566,7 +566,7 @@ export default class CodeEditor extends React.Component {
     this.editor.setCursor(cursor)
   }
 
-  restartHighlighting(){
+  restartHighlighting () {
     this.editor.options.linesHighlighted = this.props.linesHighlighted
     this.initialHighlighting()
   }
@@ -708,11 +708,11 @@ export default class CodeEditor extends React.Component {
     })
   }
 
-  initialHighlighting(){
-    var count = this.editor.lineCount(), i
-    for (i = 0; i < count; i++) {
-      if(this.editor.options.linesHighlighted.includes(i)){
-        this.editor.addLineClass(i,'text',"CodeMirror-activeline-background")
+  initialHighlighting () {
+    const count = this.editor.lineCount()
+    for (let i = 0; i < count; i++) {
+      if (this.editor.options.linesHighlighted.includes(i)) {
+        this.editor.addLineClass(i, 'text', 'CodeMirror-activeline-background')
       }
     }
   }
diff --git a/browser/lib/newNote.js b/browser/lib/newNote.js
index 9b701a02..2e407207 100644
--- a/browser/lib/newNote.js
+++ b/browser/lib/newNote.js
@@ -57,7 +57,7 @@ export function createSnippetNote (storage, folder, dispatch, location, params,
           name: '',
           mode: config.editor.snippetDefaultLanguage || 'text',
           content: '',
-          linesHighlighted:[],
+          linesHighlighted: []
         }
       ]
     })
diff --git a/browser/main/Detail/SnippetNoteDetail.js b/browser/main/Detail/SnippetNoteDetail.js
index b8d0fe5b..3d1027ea 100644
--- a/browser/main/Detail/SnippetNoteDetail.js
+++ b/browser/main/Detail/SnippetNoteDetail.js
@@ -410,7 +410,7 @@ class SnippetNoteDetail extends React.Component {
     return (e) => {
       const snippets = this.state.note.snippets.slice()
       snippets[index].content = this.refs['code-' + index].value
-      snippets[index].linesHighlighted=e.options.linesHighlighted
+      snippets[index].linesHighlighted = e.options.linesHighlighted
 
       this.setState(state => ({note: Object.assign(state.note, {snippets: snippets})}))
       this.setState(state => ({
@@ -605,7 +605,7 @@ class SnippetNoteDetail extends React.Component {
       name: '',
       mode: config.editor.snippetDefaultLanguage || 'text',
       content: '',
-      linesHighlighted:[]
+      linesHighlighted: []
     }])
     const snippetIndex = note.snippets.length - 1
 
diff --git a/browser/main/lib/dataApi/createNote.js b/browser/main/lib/dataApi/createNote.js
index 60bf1f42..0b6e6fbe 100644
--- a/browser/main/lib/dataApi/createNote.js
+++ b/browser/main/lib/dataApi/createNote.js
@@ -24,7 +24,7 @@ function validateInput (input) {
           name: '',
           mode: 'text',
           content: '',
-          linesHighlighted:[],
+          linesHighlighted: []
         }]
       }
       break
diff --git a/browser/main/lib/dataApi/updateNote.js b/browser/main/lib/dataApi/updateNote.js
index 1c8bd882..b7a28613 100644
--- a/browser/main/lib/dataApi/updateNote.js
+++ b/browser/main/lib/dataApi/updateNote.js
@@ -52,7 +52,7 @@ function validateInput (input) {
             name: '',
             mode: 'text',
             content: '',
-            linesHighlighted:[],
+            linesHighlighted: []
           }]
         } else {
           validatedInput.snippets = input.snippets
@@ -98,7 +98,7 @@ function updateNote (storageKey, noteKey, input) {
               name: '',
               mode: 'text',
               content: '',
-              linesHighlighted:[],
+              linesHighlighted: []
             }]
           }
           : {
diff --git a/browser/main/lib/dataApi/updateSnippet.js b/browser/main/lib/dataApi/updateSnippet.js
index 7a296130..f132d83f 100644
--- a/browser/main/lib/dataApi/updateSnippet.js
+++ b/browser/main/lib/dataApi/updateSnippet.js
@@ -12,8 +12,8 @@ function updateSnippet (snippet, snippetFile) {
         if (
           currentSnippet.name === snippet.name &&
           currentSnippet.prefix === snippet.prefix &&
-          currentSnippet.content === snippet.content && 
-          currentSnippet.linesHighlighted===snippet.linesHighlighted 
+          currentSnippet.content === snippet.content &&
+          currentSnippet.linesHighlighted === snippet.linesHighlighted
         ) {
           // if everything is the same then don't write to disk
           resolve(snippets)

From 0f5d75391062348668c15bed0877003e6ec52797 Mon Sep 17 00:00:00 2001
From: William Grant <willmgrant@gmail.com>
Date: Sun, 2 Dec 2018 15:21:01 +0200
Subject: [PATCH 041/159] Removed the old ctrl+d shortcut for deleting a note
 since we now have the super+shift+backspace shortcut which can be changed in
 the hotkey settings

---
 browser/main/NoteList/index.js | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/browser/main/NoteList/index.js b/browser/main/NoteList/index.js
index 08d7d2e2..730fbd1c 100644
--- a/browser/main/NoteList/index.js
+++ b/browser/main/NoteList/index.js
@@ -277,12 +277,6 @@ class NoteList extends React.Component {
       ee.emit('top:new-note')
     }
 
-    // D key
-    if (e.keyCode === 68) {
-      e.preventDefault()
-      this.deleteNote()
-    }
-
     // E key
     if (e.keyCode === 69) {
       e.preventDefault()

From 5d54ad33420853f7a84eea69bb41e225f337f5e0 Mon Sep 17 00:00:00 2001
From: William Grant <willmgrant@gmail.com>
Date: Sun, 2 Dec 2018 15:59:47 +0200
Subject: [PATCH 042/159] Cleaned up menu items ordering and separators, added
 clone note menu item and shortcut, updated focus note shortcut to be mac
 friendly, made delete note shortcut use either command+backspace or
 ctrl+backspace and the delete key on windows and linux machines

---
 browser/main/NoteList/index.js |  3 ++
 lib/main-menu.js               | 68 ++++++++++++++++------------------
 2 files changed, 35 insertions(+), 36 deletions(-)

diff --git a/browser/main/NoteList/index.js b/browser/main/NoteList/index.js
index 730fbd1c..c72c9434 100644
--- a/browser/main/NoteList/index.js
+++ b/browser/main/NoteList/index.js
@@ -71,6 +71,7 @@ class NoteList extends React.Component {
     this.jumpNoteByHash = this.jumpNoteByHashHandler.bind(this)
     this.handleNoteListKeyUp = this.handleNoteListKeyUp.bind(this)
     this.getNoteKeyFromTargetIndex = this.getNoteKeyFromTargetIndex.bind(this)
+    this.cloneNote = this.cloneNote.bind(this)
     this.deleteNote = this.deleteNote.bind(this)
     this.focusNote = this.focusNote.bind(this)
     this.pinToTop = this.pinToTop.bind(this)
@@ -96,6 +97,7 @@ class NoteList extends React.Component {
     this.refreshTimer = setInterval(() => this.forceUpdate(), 60 * 1000)
     ee.on('list:next', this.selectNextNoteHandler)
     ee.on('list:prior', this.selectPriorNoteHandler)
+    ee.on('list:clone', this.cloneNote)
     ee.on('list:focus', this.focusHandler)
     ee.on('list:isMarkdownNote', this.alertIfSnippetHandler)
     ee.on('import:file', this.importFromFileHandler)
@@ -118,6 +120,7 @@ class NoteList extends React.Component {
 
     ee.off('list:next', this.selectNextNoteHandler)
     ee.off('list:prior', this.selectPriorNoteHandler)
+    ee.off('list:clone', this.cloneNote)
     ee.off('list:focus', this.focusHandler)
     ee.off('list:isMarkdownNote', this.alertIfSnippetHandler)
     ee.off('import:file', this.importFromFileHandler)
diff --git a/lib/main-menu.js b/lib/main-menu.js
index 91f3c8c6..6bd2bcab 100644
--- a/lib/main-menu.js
+++ b/lib/main-menu.js
@@ -85,14 +85,40 @@ const file = {
     },
     {
       label: 'Focus Note',
-      accelerator: 'Control+E',
+      accelerator: macOS ? 'Command+E' : 'Control+E',
       click () {
         mainWindow.webContents.send('detail:focus')
       }
     },
+    {
+      label: 'Delete Note',
+      accelerator: macOS ? '' : 'Delete',
+      accelerator: macOS ? 'Command+Backspace' : 'Control+Backspace',
+      click () {
+        mainWindow.webContents.send('detail:delete')
+      }
+    },
+    {
+      label: 'Clone Note',
+      accelerator: macOS ? 'Command+D' : 'Control+D',
+      click () {
+        mainWindow.webContents.send('list:clone')
+      }
+    },
     {
       type: 'separator'
     },
+    {
+      label: 'Import from',
+      submenu: [
+        {
+          label: 'Plain Text, MarkDown (.txt, .md)',
+          click () {
+            mainWindow.webContents.send('import:file')
+          }
+        }
+      ]
+    },
     {
       label: 'Export as',
       submenu: [
@@ -123,18 +149,11 @@ const file = {
       type: 'separator'
     },
     {
-      label: 'Import from',
-      submenu: [
-        {
-          label: 'Plain Text, MarkDown (.txt, .md)',
-          click () {
-            mainWindow.webContents.send('import:file')
-          }
-        }
-      ]
-    },
-    {
-      type: 'separator'
+      label: 'Generate/Update Markdown TOC',
+      accelerator: 'Shift+Ctrl+T',
+      click () {
+        mainWindow.webContents.send('code:generate-toc')
+      }
     },
     {
       label: 'Format Table',
@@ -145,16 +164,6 @@ const file = {
     {
       type: 'separator'
     },
-    {
-      label: 'Generate/Update Markdown TOC',
-      accelerator: 'Shift+Ctrl+T',
-      click () {
-        mainWindow.webContents.send('code:generate-toc')
-      }
-    },
-    {
-      type: 'separator'
-    },
     {
       label: 'Print',
       accelerator: 'CommandOrControl+P',
@@ -162,16 +171,6 @@ const file = {
         mainWindow.webContents.send('list:isMarkdownNote')
         mainWindow.webContents.send('print')
       }
-    },
-    {
-      type: 'separator'
-    },
-    {
-      label: 'Delete Note',
-      accelerator: macOS ? 'Control+Backspace' : 'Control+Delete',
-      click () {
-        mainWindow.webContents.send('detail:delete')
-      }
     }
   ]
 }
@@ -296,9 +295,6 @@ const view = {
         mainWindow.setFullScreen(!mainWindow.isFullScreen())
       }
     },
-    {
-      type: 'separator'
-    },
     {
       label: 'Toggle Side Bar',
       accelerator: 'CommandOrControl+B',

From faf2aff959f1ecbca1cfe2dd69d0411277ac3008 Mon Sep 17 00:00:00 2001
From: William Grant <willmgrant@gmail.com>
Date: Sun, 2 Dec 2018 16:02:29 +0200
Subject: [PATCH 043/159] added in the shift key for deleting a note based on
 https://github.com/BoostIO/Boostnote/pull/2452

---
 lib/main-menu.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/main-menu.js b/lib/main-menu.js
index 6bd2bcab..8317fb69 100644
--- a/lib/main-menu.js
+++ b/lib/main-menu.js
@@ -93,7 +93,7 @@ const file = {
     {
       label: 'Delete Note',
       accelerator: macOS ? '' : 'Delete',
-      accelerator: macOS ? 'Command+Backspace' : 'Control+Backspace',
+      accelerator: macOS ? 'Command+Shift+Backspace' : 'Control+Shift+Backspace',
       click () {
         mainWindow.webContents.send('detail:delete')
       }

From 102d13bbae33b6dd47d81208ce7741bc486b3bfb Mon Sep 17 00:00:00 2001
From: William Grant <willmgrant@gmail.com>
Date: Sun, 2 Dec 2018 16:29:10 +0200
Subject: [PATCH 044/159] you can't have multiple accelerators on a single menu
 item. Bye bye delete key :(

---
 lib/main-menu.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/main-menu.js b/lib/main-menu.js
index 8317fb69..0ec9e943 100644
--- a/lib/main-menu.js
+++ b/lib/main-menu.js
@@ -92,7 +92,6 @@ const file = {
     },
     {
       label: 'Delete Note',
-      accelerator: macOS ? '' : 'Delete',
       accelerator: macOS ? 'Command+Shift+Backspace' : 'Control+Shift+Backspace',
       click () {
         mainWindow.webContents.send('detail:delete')

From cf35dc5345e4628efd540e1ad7e6c9b99084028d Mon Sep 17 00:00:00 2001
From: Jinwoo Oh <arkist@gmail.com>
Date: Mon, 3 Dec 2018 14:04:13 +0900
Subject: [PATCH 045/159] Handle encoded uri path on `copyFile`

fix #2578
---
 browser/main/lib/dataApi/copyFile.js |  2 +-
 tests/dataApi/copyFile-test.js       | 35 ++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 tests/dataApi/copyFile-test.js

diff --git a/browser/main/lib/dataApi/copyFile.js b/browser/main/lib/dataApi/copyFile.js
index 2dc66309..6f23aae2 100755
--- a/browser/main/lib/dataApi/copyFile.js
+++ b/browser/main/lib/dataApi/copyFile.js
@@ -16,7 +16,7 @@ function copyFile (srcPath, dstPath) {
     const dstFolder = path.dirname(dstPath)
     if (!fs.existsSync(dstFolder)) fs.mkdirSync(dstFolder)
 
-    const input = fs.createReadStream(srcPath)
+    const input = fs.createReadStream(decodeURI(srcPath))
     const output = fs.createWriteStream(dstPath)
 
     output.on('error', reject)
diff --git a/tests/dataApi/copyFile-test.js b/tests/dataApi/copyFile-test.js
new file mode 100644
index 00000000..412d510a
--- /dev/null
+++ b/tests/dataApi/copyFile-test.js
@@ -0,0 +1,35 @@
+const test = require('ava')
+const copyFile = require('browser/main/lib/dataApi/copyFile')
+
+const path = require('path')
+const fs = require('fs')
+
+const testFile = 'test.txt'
+const srcFolder = path.join(__dirname, '🤔')
+const srcPath = path.join(srcFolder, testFile)
+const dstFolder = path.join(__dirname, '😇')
+const dstPath = path.join(dstFolder, testFile)
+
+test.before((t) => {
+  if (!fs.existsSync(srcFolder)) fs.mkdirSync(srcFolder)
+
+  fs.writeFileSync(srcPath, 'test')
+})
+
+test('`copyFile` should handle encoded URI on src path', (t) => {
+  return copyFile(encodeURI(srcPath), dstPath)
+    .then(() => {
+      t.true(true)
+    })
+    .catch(() => {
+      t.true(false)
+    })
+})
+
+test.after((t) => {
+  fs.unlinkSync(srcPath)
+  fs.unlinkSync(dstPath)
+  fs.rmdirSync(srcFolder)
+  fs.rmdirSync(dstFolder)
+})
+

From 1a0e15e04ceac7e793f2791302484b5929610965 Mon Sep 17 00:00:00 2001
From: Duarte-Frazao <duartemarquesmano@gmail.com>
Date: Wed, 5 Dec 2018 14:12:29 +0000
Subject: [PATCH 046/159] Fixed bug when switching to markdown notes

---
 browser/components/CodeEditor.js | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/browser/components/CodeEditor.js b/browser/components/CodeEditor.js
index 8af89ded..d889a0a7 100644
--- a/browser/components/CodeEditor.js
+++ b/browser/components/CodeEditor.js
@@ -519,6 +519,11 @@ export default class CodeEditor extends React.Component {
 
   handleHighlight (editor, changeObject) {
     const lines = editor.options.linesHighlighted
+
+    if (lines == null) {
+      return
+    }
+
     if (!lines.includes(changeObject)) {
       lines.push(changeObject)
       editor.addLineClass(changeObject, 'text', 'CodeMirror-activeline-background')
@@ -566,11 +571,6 @@ export default class CodeEditor extends React.Component {
     this.editor.setCursor(cursor)
   }
 
-  restartHighlighting () {
-    this.editor.options.linesHighlighted = this.props.linesHighlighted
-    this.initialHighlighting()
-  }
-
   handleDropImage (dropEvent) {
     dropEvent.preventDefault()
     const { storageKey, noteKey } = this.props
@@ -709,6 +709,10 @@ export default class CodeEditor extends React.Component {
   }
 
   initialHighlighting () {
+    if (this.editor.options.linesHighlighted == null) {
+      return
+    }
+
     const count = this.editor.lineCount()
     for (let i = 0; i < count; i++) {
       if (this.editor.options.linesHighlighted.includes(i)) {
@@ -717,6 +721,11 @@ export default class CodeEditor extends React.Component {
     }
   }
 
+  restartHighlighting () {
+    this.editor.options.linesHighlighted = this.props.linesHighlighted
+    this.initialHighlighting()
+  }
+
   mapImageResponse (response, pastedTxt) {
     return new Promise((resolve, reject) => {
       try {

From b5604ba0a9db506aa2537f4963d312ef8cad4899 Mon Sep 17 00:00:00 2001
From: Duarte-Frazao <duartemarquesmano@gmail.com>
Date: Thu, 6 Dec 2018 13:23:23 +0000
Subject: [PATCH 047/159] Changes to optimize initial highlighting

Now iterates over highlighted lines instead of all lines of the snippet
---
 browser/components/CodeEditor.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/browser/components/CodeEditor.js b/browser/components/CodeEditor.js
index d889a0a7..4027b262 100644
--- a/browser/components/CodeEditor.js
+++ b/browser/components/CodeEditor.js
@@ -713,11 +713,16 @@ export default class CodeEditor extends React.Component {
       return
     }
 
-    const count = this.editor.lineCount()
-    for (let i = 0; i < count; i++) {
-      if (this.editor.options.linesHighlighted.includes(i)) {
-        this.editor.addLineClass(i, 'text', 'CodeMirror-activeline-background')
+    const totalHighlightedLines = this.editor.options.linesHighlighted.length
+    const totalAvailableLines = this.editor.lineCount()
+
+    for (let i = 0; i < totalHighlightedLines; i++) {
+      const lineNumber = this.editor.options.linesHighlighted[i]
+      if (lineNumber > totalAvailableLines) {
+        // make sure that we skip the invalid lines althrough this case should not be happened.
+        continue
       }
+      this.editor.addLineClass(lineNumber, 'text', 'CodeMirror-activeline-background')
     }
   }
 

From 6d4aa27e15015d3d5eb0e9eaf2e553587e8c8ace Mon Sep 17 00:00:00 2001
From: Joshua Dela Cruz <jhdcruz00@gmail.com>
Date: Fri, 7 Dec 2018 17:22:01 +0800
Subject: [PATCH 048/159] Fixed Build Badge Alignment w/ Fixed link

Related to PR #2584
---
 readme.md | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/readme.md b/readme.md
index b3f2ec46..ef90dfcc 100644
--- a/readme.md
+++ b/readme.md
@@ -5,8 +5,11 @@
 <h4 align="center">Note-taking app for programmers. </h4>
 <h5 align="center">Apps available for Mac, Windows, Linux, Android, and iOS.</h5>
 <h5 align="center">Built with Electron, React + Redux, Webpack, and CSSModules.</h5>
-
-[![Build Status](https://travis-ci.org/BoostIO/Boostnote.svg?branch=master)](https://travis-ci.org/BoostIO/Boostnote)
+<p align="center">
+  <a href="https://travis-ci.org/BoostIO/Boostnote">
+    <img src="https://travis-ci.org/BoostIO/Boostnote.svg?branch=master" alt="Build Status" />
+  </a>
+ </p>
 
 ## Authors & Maintainers
 - [Rokt33r](https://github.com/rokt33r)

From 191295b6de2090a5cd8bdddf1825a04cadba6d05 Mon Sep 17 00:00:00 2001
From: Duarte-Frazao <duartemarquesmano@gmail.com>
Date: Fri, 7 Dec 2018 23:41:51 +0000
Subject: [PATCH 049/159] Added array of linesHighlighted to default snippet

This makes the default snippet also handle highlight on the lines, because this snippet is created in the code without the normal snippet constructor
---
 browser/main/Main.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/browser/main/Main.js b/browser/main/Main.js
index c426f2bd..d13bde0d 100644
--- a/browser/main/Main.js
+++ b/browser/main/Main.js
@@ -96,12 +96,14 @@ class Main extends React.Component {
               {
                 name: 'example.html',
                 mode: 'html',
-                content: "<html>\n<body>\n<h1 id='hello'>Enjoy Boostnote!</h1>\n</body>\n</html>"
+                content: "<html>\n<body>\n<h1 id='hello'>Enjoy Boostnote!</h1>\n</body>\n</html>",
+                linesHighlighted:[]
               },
               {
                 name: 'example.js',
                 mode: 'javascript',
-                content: "var boostnote = document.getElementById('enjoy').innerHTML\n\nconsole.log(boostnote)"
+                content: "var boostnote = document.getElementById('enjoy').innerHTML\n\nconsole.log(boostnote)",
+                linesHighlighted:[]
               }
             ]
           })

From 406186604208fc7ea0b3be25548653b837407681 Mon Sep 17 00:00:00 2001
From: Guilherme Silva <guilhermejosesilva@gmail.com>
Date: Sat, 8 Dec 2018 09:06:55 +0000
Subject: [PATCH 050/159] Moving prevent default

---
 browser/main/SideNav/StorageItem.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/browser/main/SideNav/StorageItem.js b/browser/main/SideNav/StorageItem.js
index 3ac69818..1e50d153 100644
--- a/browser/main/SideNav/StorageItem.js
+++ b/browser/main/SideNav/StorageItem.js
@@ -233,6 +233,7 @@ class StorageItem extends React.Component {
   }
 
   handleDragEnter (e, key) {
+    e.preventDefault()
     if (this.state.draggedOver === key) { return }
     this.setState({
       draggedOver: key
@@ -240,6 +241,7 @@ class StorageItem extends React.Component {
   }
 
   handleDragLeave (e) {
+    e.preventDefault()
     if (this.state.draggedOver === null) { return }
     this.setState({
       draggedOver: null
@@ -268,6 +270,7 @@ class StorageItem extends React.Component {
   }
 
   handleDrop (e, storage, folder, dispatch, location) {
+    e.preventDefault()
     if (this.state.draggedOver !== null) {
       this.setState({
         draggedOver: null
@@ -307,15 +310,12 @@ class StorageItem extends React.Component {
           isFolded={isFolded}
           noteCount={noteCount}
           handleDrop={(e) => {
-            e.preventDefault()
             this.handleDrop(e, storage, folder, dispatch, location)
           }}
           handleDragEnter={(e) => {
-            e.preventDefault()
             this.handleDragEnter(e, folder.key)
           }}
           handleDragLeave={(e) => {
-            e.preventDefault()
             this.handleDragLeave(e, folder)
           }}
         />

From f483f8fdf04f64b591ef547caf7eb5f4759e262d Mon Sep 17 00:00:00 2001
From: Duarte-Frazao <duartemarquesmano@gmail.com>
Date: Sat, 8 Dec 2018 12:07:28 +0000
Subject: [PATCH 051/159] Fix so that linesHighlighted defaults to [] when
 does't find it

---
 browser/main/lib/dataApi/updateNote.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/browser/main/lib/dataApi/updateNote.js b/browser/main/lib/dataApi/updateNote.js
index b7a28613..c89bad54 100644
--- a/browser/main/lib/dataApi/updateNote.js
+++ b/browser/main/lib/dataApi/updateNote.js
@@ -118,6 +118,8 @@ function updateNote (storageKey, noteKey, input) {
 
       if (noteData.type === 'SNIPPET_NOTE') {
         noteData.title
+        if(noteData.linesHighlighted = null)
+          noteData.linesHighlighted = [];
       }
 
       Object.assign(noteData, input, {

From 492294e11dc7522427542230af6e8a107d39d6ba Mon Sep 17 00:00:00 2001
From: Duarte-Frazao <duartemarquesmano@gmail.com>
Date: Sat, 8 Dec 2018 12:19:42 +0000
Subject: [PATCH 052/159] Reset of linesHighlighted

---
 browser/main/lib/dataApi/createSnippet.js        | 3 ++-
 browser/main/lib/dataApi/migrateFromV5Storage.js | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/browser/main/lib/dataApi/createSnippet.js b/browser/main/lib/dataApi/createSnippet.js
index 5d189217..1e7435ad 100644
--- a/browser/main/lib/dataApi/createSnippet.js
+++ b/browser/main/lib/dataApi/createSnippet.js
@@ -9,7 +9,8 @@ function createSnippet (snippetFile) {
       id: crypto.randomBytes(16).toString('hex'),
       name: 'Unnamed snippet',
       prefix: [],
-      content: ''
+      content: '',
+      linesHighlighted: [],
     }
     fetchSnippet(null, snippetFile).then((snippets) => {
       snippets.push(newSnippet)
diff --git a/browser/main/lib/dataApi/migrateFromV5Storage.js b/browser/main/lib/dataApi/migrateFromV5Storage.js
index b11e66e9..0a20d648 100644
--- a/browser/main/lib/dataApi/migrateFromV5Storage.js
+++ b/browser/main/lib/dataApi/migrateFromV5Storage.js
@@ -87,7 +87,8 @@ function importAll (storage, data) {
             snippets: [{
               name: article.mode,
               mode: article.mode,
-              content: article.content
+              content: article.content,
+              linesHighlighted: article.linesHighlighted,
             }]
           }
           notes.push(newNote)

From 62609a29184e84000a0e97cc39190ab21dbea01c Mon Sep 17 00:00:00 2001
From: Duarte-Frazao <duartemarquesmano@gmail.com>
Date: Sat, 8 Dec 2018 17:18:40 +0000
Subject: [PATCH 053/159] Fixed last nonfunctional changes made earlier

Now iterates in the SnippetNoteDetail constructor the snippets and if linesHighlighted is not defined assigns an empty array
---
 browser/main/Detail/SnippetNoteDetail.js         | 6 ++++++
 browser/main/Main.js                             | 4 ++--
 browser/main/lib/dataApi/createSnippet.js        | 2 +-
 browser/main/lib/dataApi/migrateFromV5Storage.js | 2 +-
 browser/main/lib/dataApi/updateNote.js           | 2 --
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/browser/main/Detail/SnippetNoteDetail.js b/browser/main/Detail/SnippetNoteDetail.js
index 3d1027ea..7f10cb0b 100644
--- a/browser/main/Detail/SnippetNoteDetail.js
+++ b/browser/main/Detail/SnippetNoteDetail.js
@@ -52,6 +52,12 @@ class SnippetNoteDetail extends React.Component {
       })
     }
 
+    this.state.note.snippets.forEach(function (s) {
+      if (s.linesHighlighted === undefined) {
+        s.linesHighlighted = []
+      }
+    })
+
     this.scrollToNextTabThreshold = 0.7
     this.generateToc = () => this.handleGenerateToc()
   }
diff --git a/browser/main/Main.js b/browser/main/Main.js
index d13bde0d..a9268eba 100644
--- a/browser/main/Main.js
+++ b/browser/main/Main.js
@@ -97,13 +97,13 @@ class Main extends React.Component {
                 name: 'example.html',
                 mode: 'html',
                 content: "<html>\n<body>\n<h1 id='hello'>Enjoy Boostnote!</h1>\n</body>\n</html>",
-                linesHighlighted:[]
+                linesHighlighted: []
               },
               {
                 name: 'example.js',
                 mode: 'javascript',
                 content: "var boostnote = document.getElementById('enjoy').innerHTML\n\nconsole.log(boostnote)",
-                linesHighlighted:[]
+                linesHighlighted: []
               }
             ]
           })
diff --git a/browser/main/lib/dataApi/createSnippet.js b/browser/main/lib/dataApi/createSnippet.js
index 1e7435ad..2e585c9f 100644
--- a/browser/main/lib/dataApi/createSnippet.js
+++ b/browser/main/lib/dataApi/createSnippet.js
@@ -10,7 +10,7 @@ function createSnippet (snippetFile) {
       name: 'Unnamed snippet',
       prefix: [],
       content: '',
-      linesHighlighted: [],
+      linesHighlighted: []
     }
     fetchSnippet(null, snippetFile).then((snippets) => {
       snippets.push(newSnippet)
diff --git a/browser/main/lib/dataApi/migrateFromV5Storage.js b/browser/main/lib/dataApi/migrateFromV5Storage.js
index 0a20d648..eb3a9fb8 100644
--- a/browser/main/lib/dataApi/migrateFromV5Storage.js
+++ b/browser/main/lib/dataApi/migrateFromV5Storage.js
@@ -88,7 +88,7 @@ function importAll (storage, data) {
               name: article.mode,
               mode: article.mode,
               content: article.content,
-              linesHighlighted: article.linesHighlighted,
+              linesHighlighted: article.linesHighlighted
             }]
           }
           notes.push(newNote)
diff --git a/browser/main/lib/dataApi/updateNote.js b/browser/main/lib/dataApi/updateNote.js
index c89bad54..b7a28613 100644
--- a/browser/main/lib/dataApi/updateNote.js
+++ b/browser/main/lib/dataApi/updateNote.js
@@ -118,8 +118,6 @@ function updateNote (storageKey, noteKey, input) {
 
       if (noteData.type === 'SNIPPET_NOTE') {
         noteData.title
-        if(noteData.linesHighlighted = null)
-          noteData.linesHighlighted = [];
       }
 
       Object.assign(noteData, input, {

From 4488de9add3c608c85651a5ca1a7e11cd60aee99 Mon Sep 17 00:00:00 2001
From: vienai8d <31370233+vienai8d@users.noreply.github.com>
Date: Sun, 9 Dec 2018 10:58:06 +0900
Subject: [PATCH 054/159] add translation about hotkeys in preferences

---
 locales/ja.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/locales/ja.json b/locales/ja.json
index e33bbaa6..d1abd8b9 100644
--- a/locales/ja.json
+++ b/locales/ja.json
@@ -135,6 +135,7 @@
 	"Hotkeys": "ホットキー",
 	"Show/Hide Boostnote": "Boostnote の表示／非表示",
 	"Toggle Editor Mode": "エディタモードの切替",
+	"Delete Note": "ノート削除",
 	"Restore": "リストア",
 	"Permanent Delete": "永久に削除",
 	"Confirm note deletion": "ノート削除確認",

From d44a76bae308ab8d689e4b6c24e648a6eb5a9ba7 Mon Sep 17 00:00:00 2001
From: vienai8d <31370233+vienai8d@users.noreply.github.com>
Date: Mon, 10 Dec 2018 00:51:43 +0900
Subject: [PATCH 055/159] add translation about interface in preferences

---
 locales/ja.json | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/locales/ja.json b/locales/ja.json
index d1abd8b9..9cfc2986 100644
--- a/locales/ja.json
+++ b/locales/ja.json
@@ -37,9 +37,15 @@
 	"White": "白",
 	"Solarized Dark": "明灰",
 	"Dark": "暗灰",
+	"Default New Note": "新規ノートの形式",
+	"Always Ask": "作成時に聞く",
 	"Show a confirmation dialog when deleting notes": "ノートを削除する時に確認ダイアログを表示する",
 	"Disable Direct Write (It will be applied after restarting)": "Disable Direct Write (It will be applied after restarting)",
+	"Save tags of a note in alphabetical order": "ノートのタグをアルファベット順に保存する",
+	"Show tags of a note in alphabetical order": "ノートのタグをアルファベット順に表示する",
 	"Show only related tags": "関連するタグのみ表示する",
+	"Enable live count of notes": "タグ選択時にノート数を再計算して表示する",
+	"New notes are tagged with the filtering tags": "新規ノートに選択中のタグを付与する",
 	"Editor Theme": "エディタのテーマ",
 	"Editor Font Size": "エディタのフォントサイズ",
 	"Editor Font Family": "エディタのフォント",
@@ -55,21 +61,28 @@
 	"vim": "vim",
 	"emacs": "emacs",
 	"⚠️ Please restart boostnote after you change the keymap": "⚠️ キーマップ変更後は Boostnote を再起動してください",
+	"Snippet Default Language": "スニペットのデフォルト言語",
+	"Extract title from front matter": "Front matterからタイトルを抽出する",
 	"Show line numbers in the editor": "エディタ内に行番号を表示",
 	"Allow editor to scroll past the last line": "エディタが最終行以降にスクロールできるようにする",
 	"Enable smart quotes": "スマートクォートを有効にする",
 	"Bring in web page title when pasting URL on editor": "URLを貼り付けた時にWebページのタイトルを取得する",
+	"Enable smart table editor": "スマートテーブルエディタを有効にする",
 	"Preview": "プレビュー",
 	"Preview Font Size": "プレビュー時フォントサイズ",
 	"Preview Font Family": "プレビュー時フォント",
 	"Code Block Theme": "コードブロックのテーマ",
+  "Allow line through checkbox": "チェック済みチェックボックスのテキストに取り消し線を付与する",
 	"Allow preview to scroll past the last line": "プレビュー時に最終行以降にスクロールできるようにする",
+	"When scrolling, synchronize preview with editor": "エディタとプレビューのスクロールを同期する",
 	"Show line numbers for preview code blocks": "プレビュー時のコードブロック内に行番号を表示する",
 	"LaTeX Inline Open Delimiter": "LaTeX 開始デリミタ（インライン）",
 	"LaTeX Inline Close Delimiter": "LaTeX 終了デリミタ（インライン）",
 	"LaTeX Block Open Delimiter": "LaTeX 開始デリミタ（ブロック）",
 	"LaTeX Block Close Delimiter": "LaTeX 終了デリミタ（ブロック）",
 	"PlantUML Server": "PlantUML サーバー",
+	"Custom CSS": "カスタムCSS",
+	"Allow custom CSS for preview": "プレビュー用のカスタムCSSを許可する",
 	"Community": "コミュニティ",
 	"Subscribe to Newsletter": "ニュースレターを購読する",
 	"GitHub": "GitHub",

From e65c48be33bfbe0bb8b692ad48610910771181bf Mon Sep 17 00:00:00 2001
From: Brunovsky <elbrunovsky@gmail.com>
Date: Tue, 11 Dec 2018 00:41:51 +0000
Subject: [PATCH 056/159] Fix issue 2557 katex alignment in display math

---
 browser/components/markdown.styl | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/browser/components/markdown.styl b/browser/components/markdown.styl
index b7f219b8..e5647c33 100644
--- a/browser/components/markdown.styl
+++ b/browser/components/markdown.styl
@@ -55,11 +55,12 @@ body
   line-height 1.6
   overflow-x hidden
   background-color $ui-noteDetail-backgroundColor
+  // do not allow display line breaks
+  .katex-display > .katex
+    white-space nowrap
+  // allow inline line breaks
   .katex
-    font 400 1.2em 'KaTeX_Main'
-    line-height 1.2em
     white-space initial
-    text-indent 0
   .katex .mfrac>.vlist>span:nth-child(2)
     top 0 !important
   .katex-error

From c5de940946e5056bd1cf15bb65802a1b4dedaeed Mon Sep 17 00:00:00 2001
From: Miguel Teixeira <miguelalexbt@outlook.com>
Date: Wed, 12 Dec 2018 18:19:41 +0000
Subject: [PATCH 057/159] Fixed bug where icon was hidden

---
 browser/main/Detail/MarkdownNoteDetail.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/MarkdownNoteDetail.js
index aefcc614..cb53fcda 100755
--- a/browser/main/Detail/MarkdownNoteDetail.js
+++ b/browser/main/Detail/MarkdownNoteDetail.js
@@ -41,7 +41,7 @@ class MarkdownNoteDetail extends React.Component {
         title: '',
         content: ''
       }, props.note),
-      isLockButtonShown: false,
+      isLockButtonShown: true,
       isLocked: false,
       editorType: props.config.editor.type
     }

From 3b110bcd4b88ef309c616a05ac1c060310404abb Mon Sep 17 00:00:00 2001
From: Miguel Teixeira <miguelalexbt@outlook.com>
Date: Thu, 13 Dec 2018 11:55:04 +0000
Subject: [PATCH 058/159] WIP

---
 browser/main/Detail/MarkdownNoteDetail.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/MarkdownNoteDetail.js
index cb53fcda..aefcc614 100755
--- a/browser/main/Detail/MarkdownNoteDetail.js
+++ b/browser/main/Detail/MarkdownNoteDetail.js
@@ -41,7 +41,7 @@ class MarkdownNoteDetail extends React.Component {
         title: '',
         content: ''
       }, props.note),
-      isLockButtonShown: true,
+      isLockButtonShown: false,
       isLocked: false,
       editorType: props.config.editor.type
     }

From 4fb11b68e4d47425e7eb7c46477f341360eb025c Mon Sep 17 00:00:00 2001
From: Duarte-Frazao <duartemarquesmano@gmail.com>
Date: Thu, 13 Dec 2018 13:13:01 +0000
Subject: [PATCH 059/159] Markdown functionality

---
 browser/components/MarkdownEditor.js             |  5 +++--
 browser/components/MarkdownSplitEditor.js        |  9 +++++----
 browser/lib/newNote.js                           |  3 ++-
 browser/main/Detail/MarkdownNoteDetail.js        | 11 ++++++++++-
 browser/main/Detail/SnippetNoteDetail.js         |  1 +
 browser/main/NoteList/index.js                   |  3 ++-
 browser/main/lib/dataApi/createNote.js           |  1 +
 browser/main/lib/dataApi/migrateFromV5Storage.js |  3 ++-
 browser/main/lib/dataApi/updateNote.js           |  6 +++++-
 9 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/browser/components/MarkdownEditor.js b/browser/components/MarkdownEditor.js
index 20ce9451..009a6b76 100644
--- a/browser/components/MarkdownEditor.js
+++ b/browser/components/MarkdownEditor.js
@@ -232,7 +232,7 @@ class MarkdownEditor extends React.Component {
   }
 
   render () {
-    const {className, value, config, storageKey, noteKey} = this.props
+    const {className, value, config, storageKey, noteKey, linesHighlighted} = this.props
 
     let editorFontSize = parseInt(config.editor.fontSize, 10)
     if (!(editorFontSize > 0 && editorFontSize < 101)) editorFontSize = 14
@@ -275,7 +275,8 @@ class MarkdownEditor extends React.Component {
           noteKey={noteKey}
           fetchUrlTitle={config.editor.fetchUrlTitle}
           enableTableEditor={config.editor.enableTableEditor}
-          onChange={(e) => this.handleChange(e)}
+          linesHighlighted={linesHighlighted}
+          onChange={(e) => this.handleChange(e).bind(this)}
           onBlur={(e) => this.handleBlur(e)}
           spellCheck={config.editor.spellcheck}
         />
diff --git a/browser/components/MarkdownSplitEditor.js b/browser/components/MarkdownSplitEditor.js
index 0ab52a56..0a6c812a 100644
--- a/browser/components/MarkdownSplitEditor.js
+++ b/browser/components/MarkdownSplitEditor.js
@@ -24,9 +24,9 @@ class MarkdownSplitEditor extends React.Component {
     this.refs.code.setValue(value)
   }
 
-  handleOnChange () {
+  handleOnChange (e) {
     this.value = this.refs.code.value
-    this.props.onChange()
+    this.props.onChange(e)
   }
 
   handleScroll (e) {
@@ -136,7 +136,7 @@ class MarkdownSplitEditor extends React.Component {
   }
 
   render () {
-    const {config, value, storageKey, noteKey} = this.props
+    const {config, value, storageKey, noteKey, linesHighlighted} = this.props
     const storage = findStorage(storageKey)
     let editorFontSize = parseInt(config.editor.fontSize, 10)
     if (!(editorFontSize > 0 && editorFontSize < 101)) editorFontSize = 14
@@ -169,7 +169,8 @@ class MarkdownSplitEditor extends React.Component {
           enableTableEditor={config.editor.enableTableEditor}
           storageKey={storageKey}
           noteKey={noteKey}
-          onChange={this.handleOnChange.bind(this)}
+          linesHighlighted={linesHighlighted}
+          onChange={(e) => this.handleOnChange(e).bind(this)}
           onScroll={this.handleScroll.bind(this)}
           spellCheck={config.editor.spellcheck}
        />
diff --git a/browser/lib/newNote.js b/browser/lib/newNote.js
index 2e407207..9511f847 100644
--- a/browser/lib/newNote.js
+++ b/browser/lib/newNote.js
@@ -18,7 +18,8 @@ export function createMarkdownNote (storage, folder, dispatch, location, params,
       folder: folder,
       title: '',
       tags,
-      content: ''
+      content: '',
+      linesHighlighted: []
     })
     .then(note => {
       const noteHash = note.key
diff --git a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/MarkdownNoteDetail.js
index b4e7a5b3..34dae369 100755
--- a/browser/main/Detail/MarkdownNoteDetail.js
+++ b/browser/main/Detail/MarkdownNoteDetail.js
@@ -39,12 +39,19 @@ class MarkdownNoteDetail extends React.Component {
       isMovingNote: false,
       note: Object.assign({
         title: '',
-        content: ''
+        content: '',
+        linesHighlighted: []
       }, props.note),
       isLockButtonShown: false,
       isLocked: false,
       editorType: props.config.editor.type
     }
+
+    let lines = this.state.note.linesHighlighted
+    if (lines === undefined) {
+      lines = []
+    }
+
     this.dispatchTimer = null
 
     this.toggleLockButton = this.handleToggleLockButton.bind(this)
@@ -361,6 +368,7 @@ class MarkdownNoteDetail extends React.Component {
         value={note.content}
         storageKey={note.storage}
         noteKey={note.key}
+        linesHighlighted={note.linesHighlighted}
         onChange={this.handleUpdateContent.bind(this)}
         ignorePreviewPointerEvents={ignorePreviewPointerEvents}
       />
@@ -371,6 +379,7 @@ class MarkdownNoteDetail extends React.Component {
         value={note.content}
         storageKey={note.storage}
         noteKey={note.key}
+        linesHighlighted={note.linesHighlighted}
         onChange={this.handleUpdateContent.bind(this)}
         ignorePreviewPointerEvents={ignorePreviewPointerEvents}
       />
diff --git a/browser/main/Detail/SnippetNoteDetail.js b/browser/main/Detail/SnippetNoteDetail.js
index 7f10cb0b..252bafc8 100644
--- a/browser/main/Detail/SnippetNoteDetail.js
+++ b/browser/main/Detail/SnippetNoteDetail.js
@@ -706,6 +706,7 @@ class SnippetNoteDetail extends React.Component {
           ? <MarkdownEditor styleName='tabView-content'
             value={snippet.content}
             config={config}
+            linesHighlighted={snippet.linesHighlighted}
             onChange={(e) => this.handleCodeChange(index)(e)}
             ref={'code-' + index}
             ignorePreviewPointerEvents={this.props.ignorePreviewPointerEvents}
diff --git a/browser/main/NoteList/index.js b/browser/main/NoteList/index.js
index 08d7d2e2..9a152e14 100644
--- a/browser/main/NoteList/index.js
+++ b/browser/main/NoteList/index.js
@@ -707,7 +707,8 @@ class NoteList extends React.Component {
         type: firstNote.type,
         folder: folder.key,
         title: firstNote.title + ' ' + i18n.__('copy'),
-        content: firstNote.content
+        content: firstNote.content,
+        linesHighlighted: firstNote.linesHighlighted
       })
       .then((note) => {
         attachmentManagement.cloneAttachments(firstNote, note)
diff --git a/browser/main/lib/dataApi/createNote.js b/browser/main/lib/dataApi/createNote.js
index 0b6e6fbe..5bfa2457 100644
--- a/browser/main/lib/dataApi/createNote.js
+++ b/browser/main/lib/dataApi/createNote.js
@@ -16,6 +16,7 @@ function validateInput (input) {
   switch (input.type) {
     case 'MARKDOWN_NOTE':
       if (!_.isString(input.content)) input.content = ''
+      if (!_.isArray(input.linesHighlighted)) input.linesHighlighted = []
       break
     case 'SNIPPET_NOTE':
       if (!_.isString(input.description)) input.description = ''
diff --git a/browser/main/lib/dataApi/migrateFromV5Storage.js b/browser/main/lib/dataApi/migrateFromV5Storage.js
index eb3a9fb8..78d78746 100644
--- a/browser/main/lib/dataApi/migrateFromV5Storage.js
+++ b/browser/main/lib/dataApi/migrateFromV5Storage.js
@@ -69,7 +69,8 @@ function importAll (storage, data) {
             isStarred: false,
             title: article.title,
             content: '# ' + article.title + '\n\n' + article.content,
-            key: noteKey
+            key: noteKey,
+            linesHighlighted: article.linesHighlighted
           }
           notes.push(newNote)
         } else {
diff --git a/browser/main/lib/dataApi/updateNote.js b/browser/main/lib/dataApi/updateNote.js
index b7a28613..ce9fabcf 100644
--- a/browser/main/lib/dataApi/updateNote.js
+++ b/browser/main/lib/dataApi/updateNote.js
@@ -39,6 +39,9 @@ function validateInput (input) {
       if (input.content != null) {
         if (!_.isString(input.content)) validatedInput.content = ''
         else validatedInput.content = input.content
+
+        if (!_.isArray(input.linesHighlighted)) validatedInput.linesHighlighted = []
+        else validatedInput.linesHighlighted = input.linesHighlighted
       }
       return validatedInput
     case 'SNIPPET_NOTE':
@@ -103,7 +106,8 @@ function updateNote (storageKey, noteKey, input) {
           }
           : {
             type: 'MARKDOWN_NOTE',
-            content: ''
+            content: '',
+            linesHighlighted: []
           }
         noteData.title = ''
         if (storage.folders.length === 0) throw new Error('Failed to restore note: No folder exists.')

From f2a0f59b0804289363b35b70939fb0e1d2ad0074 Mon Sep 17 00:00:00 2001
From: Duarte-Frazao <duartemarquesmano@gmail.com>
Date: Thu, 13 Dec 2018 13:27:20 +0000
Subject: [PATCH 060/159] Fixed error on call to bind.

---
 browser/components/MarkdownEditor.js      | 2 +-
 browser/components/MarkdownSplitEditor.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/browser/components/MarkdownEditor.js b/browser/components/MarkdownEditor.js
index 009a6b76..6c91ea1d 100644
--- a/browser/components/MarkdownEditor.js
+++ b/browser/components/MarkdownEditor.js
@@ -276,7 +276,7 @@ class MarkdownEditor extends React.Component {
           fetchUrlTitle={config.editor.fetchUrlTitle}
           enableTableEditor={config.editor.enableTableEditor}
           linesHighlighted={linesHighlighted}
-          onChange={(e) => this.handleChange(e).bind(this)}
+          onChange={(e) => this.handleChange.bind(this)(e)}
           onBlur={(e) => this.handleBlur(e)}
           spellCheck={config.editor.spellcheck}
         />
diff --git a/browser/components/MarkdownSplitEditor.js b/browser/components/MarkdownSplitEditor.js
index 0a6c812a..c1b9bd84 100644
--- a/browser/components/MarkdownSplitEditor.js
+++ b/browser/components/MarkdownSplitEditor.js
@@ -170,7 +170,7 @@ class MarkdownSplitEditor extends React.Component {
           storageKey={storageKey}
           noteKey={noteKey}
           linesHighlighted={linesHighlighted}
-          onChange={(e) => this.handleOnChange(e).bind(this)}
+          onChange={(e) => this.handleOnChange.bind(this)(e)}
           onScroll={this.handleScroll.bind(this)}
           spellCheck={config.editor.spellcheck}
        />

From 37340d0445ea89f34ac83f648e11922d220a8d14 Mon Sep 17 00:00:00 2001
From: Miguel Teixeira <miguelalexbt@outlook.com>
Date: Thu, 13 Dec 2018 19:09:41 +0000
Subject: [PATCH 061/159] Fixed issue with double and right click

---
 browser/components/MarkdownEditor.js      | 1 +
 browser/main/Detail/MarkdownNoteDetail.js | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/browser/components/MarkdownEditor.js b/browser/components/MarkdownEditor.js
index 8c798159..65fdb1bc 100644
--- a/browser/components/MarkdownEditor.js
+++ b/browser/components/MarkdownEditor.js
@@ -75,6 +75,7 @@ class MarkdownEditor extends React.Component {
   }
 
   handleContextMenu (e) {
+    if (this.state.isLocked) return
     const { config } = this.props
     if (config.editor.switchPreview === 'RIGHTCLICK') {
       const newStatus = this.state.status === 'PREVIEW' ? 'CODE' : 'PREVIEW'
diff --git a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/MarkdownNoteDetail.js
index aefcc614..bcb79b8e 100755
--- a/browser/main/Detail/MarkdownNoteDetail.js
+++ b/browser/main/Detail/MarkdownNoteDetail.js
@@ -292,7 +292,7 @@ class MarkdownNoteDetail extends React.Component {
 
   handleToggleLockButton (event, noteStatus) {
     // first argument event is not used
-    if (this.props.config.editor.switchPreview === 'BLUR' && noteStatus === 'CODE') {
+    if (noteStatus === 'CODE') {
       this.setState({isLockButtonShown: true})
     } else {
       this.setState({isLockButtonShown: false})
@@ -319,13 +319,14 @@ class MarkdownNoteDetail extends React.Component {
 
   handleSwitchMode (type) {
     // If in split mode, hide the lock button
-    if (type === 'SPLIT') this.setState({isLockButtonShown: false})
-    this.setState({ editorType: type }, () => {
+    this.setState({ editorType: type, isLockButtonShown: !(type === 'SPLIT') }, () => {
       this.focus()
       const newConfig = Object.assign({}, this.props.config)
       newConfig.editor.type = type
       ConfigManager.set(newConfig)
     })
+
+    console.log(this.state);
   }
 
   handleDeleteNote () {

From 6631f98c43f87b703bbff7f7b3e19eb0ea6a4624 Mon Sep 17 00:00:00 2001
From: Miguel Teixeira <miguelalexbt@outlook.com>
Date: Thu, 13 Dec 2018 19:13:12 +0000
Subject: [PATCH 062/159] Removed debug log

---
 browser/main/Detail/MarkdownNoteDetail.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/MarkdownNoteDetail.js
index bcb79b8e..33beb35b 100755
--- a/browser/main/Detail/MarkdownNoteDetail.js
+++ b/browser/main/Detail/MarkdownNoteDetail.js
@@ -325,8 +325,6 @@ class MarkdownNoteDetail extends React.Component {
       newConfig.editor.type = type
       ConfigManager.set(newConfig)
     })
-
-    console.log(this.state);
   }
 
   handleDeleteNote () {

From ac1ce6043b7fcfd31b63590f4a899e2509eba3e4 Mon Sep 17 00:00:00 2001
From: Duarte-Frazao <duartemarquesmano@gmail.com>
Date: Thu, 13 Dec 2018 20:19:02 +0000
Subject: [PATCH 063/159] Fixed legacy default Markdown/Snippet notes bug

Fixed a bug where a note or snippet is created before the pull request and you ran Boostnote for the first time after the pr and you firstly created a note or markdown and only then returned to the old default notes and you couldn't highlight
---
 browser/components/CodeEditor.js          |  4 ----
 browser/main/Detail/MarkdownNoteDetail.js |  7 +------
 browser/main/Detail/SnippetNoteDetail.js  | 13 +++----------
 3 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/browser/components/CodeEditor.js b/browser/components/CodeEditor.js
index 4027b262..2f4f1c8a 100644
--- a/browser/components/CodeEditor.js
+++ b/browser/components/CodeEditor.js
@@ -520,10 +520,6 @@ export default class CodeEditor extends React.Component {
   handleHighlight (editor, changeObject) {
     const lines = editor.options.linesHighlighted
 
-    if (lines == null) {
-      return
-    }
-
     if (!lines.includes(changeObject)) {
       lines.push(changeObject)
       editor.addLineClass(changeObject, 'text', 'CodeMirror-activeline-background')
diff --git a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/MarkdownNoteDetail.js
index 34dae369..bc6cd499 100755
--- a/browser/main/Detail/MarkdownNoteDetail.js
+++ b/browser/main/Detail/MarkdownNoteDetail.js
@@ -47,11 +47,6 @@ class MarkdownNoteDetail extends React.Component {
       editorType: props.config.editor.type
     }
 
-    let lines = this.state.note.linesHighlighted
-    if (lines === undefined) {
-      lines = []
-    }
-
     this.dispatchTimer = null
 
     this.toggleLockButton = this.handleToggleLockButton.bind(this)
@@ -78,7 +73,7 @@ class MarkdownNoteDetail extends React.Component {
     if (!this.state.isMovingNote && (isNewNote || hasDeletedTags)) {
       if (this.saveQueue != null) this.saveNow()
       this.setState({
-        note: Object.assign({}, nextProps.note)
+        note: Object.assign({linesHighlighted: []}, nextProps.note)
       }, () => {
         this.refs.content.reload()
         if (this.refs.tags) this.refs.tags.reset()
diff --git a/browser/main/Detail/SnippetNoteDetail.js b/browser/main/Detail/SnippetNoteDetail.js
index 252bafc8..554e7c99 100644
--- a/browser/main/Detail/SnippetNoteDetail.js
+++ b/browser/main/Detail/SnippetNoteDetail.js
@@ -48,16 +48,10 @@ class SnippetNoteDetail extends React.Component {
       note: Object.assign({
         description: ''
       }, props.note, {
-        snippets: props.note.snippets.map((snippet) => Object.assign({}, snippet))
+        snippets: props.note.snippets.map((snippet) => Object.assign({linesHighlighted: []}, snippet))
       })
     }
 
-    this.state.note.snippets.forEach(function (s) {
-      if (s.linesHighlighted === undefined) {
-        s.linesHighlighted = []
-      }
-    })
-
     this.scrollToNextTabThreshold = 0.7
     this.generateToc = () => this.handleGenerateToc()
   }
@@ -82,8 +76,9 @@ class SnippetNoteDetail extends React.Component {
       const nextNote = Object.assign({
         description: ''
       }, nextProps.note, {
-        snippets: nextProps.note.snippets.map((snippet) => Object.assign({}, snippet))
+        snippets: nextProps.note.snippets.map((snippet) => Object.assign({linesHighlighted: []}, snippet))
       })
+
       this.setState({
         snippetIndex: 0,
         note: nextNote
@@ -694,10 +689,8 @@ class SnippetNoteDetail extends React.Component {
 
     const viewList = note.snippets.map((snippet, index) => {
       const isActive = this.state.snippetIndex === index
-
       let syntax = CodeMirror.findModeByName(convertModeName(snippet.mode))
       if (syntax == null) syntax = CodeMirror.findModeByName('Plain Text')
-
       return <div styleName='tabView'
         key={index}
         style={{zIndex: isActive ? 5 : 4}}

From b52616c64df1e438a4febf1f55c1751ffc4c213f Mon Sep 17 00:00:00 2001
From: John Ciprian <johnciprian@icloud.com>
Date: Tue, 11 Dec 2018 15:07:07 -0500
Subject: [PATCH 064/159] Changing tabs from material design to traditional
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Adding support for “default” interface theme.
- Adding support for “white” interface theme.
- Adding support for “dark” interface theme.
---
 browser/components/SnippetTab.styl         | 109 ++++++++++-----------
 browser/main/Detail/SnippetNoteDetail.styl |  32 +++++-
 browser/styles/index.styl                  |   2 -
 3 files changed, 80 insertions(+), 63 deletions(-)

diff --git a/browser/components/SnippetTab.styl b/browser/components/SnippetTab.styl
index a31b8594..9c785104 100644
--- a/browser/components/SnippetTab.styl
+++ b/browser/components/SnippetTab.styl
@@ -3,19 +3,30 @@
   flex 1
   min-width 70px
   overflow hidden
+  border-left 1px solid $ui-borderColor
+  border-top 1px solid $ui-borderColor
   &:hover
+    background-color alpha($ui-button--active-backgroundColor, 20%)
     .deleteButton
-      color $ui-inactive-text-color
-      &:hover
-        background-color darken($ui-backgroundColor, 15%)
-      &:active
-        color white
-        background-color $ui-active-color
+      color: $ui-text-color
+      visibility visible
+      transition 0.15s
+    .button
+      color: $ui-text-color
+      transition 0.15s
 
 .root--active
   @extend .root
   min-width 100px
-  border-bottom $ui-border
+  background-color alpha($ui-button--active-backgroundColor, 60%)
+  .deleteButton
+    visibility visible
+    color: $ui-text-color
+    transition 0.15s
+  .button
+    font-weight bold
+    color: $ui-text-color
+    transition 0.15s
 
 .button
   width 100%
@@ -27,8 +38,7 @@
   background-color transparent
   transition 0.15s
   border-left 4px solid transparent
-  &:hover
-    background-color $ui-button--hover-backgroundColor
+  color $ui-inactive-text-color
 
 .deleteButton
   position absolute
@@ -42,6 +52,7 @@
   color $ui-inactive-text-color
   background-color transparent
   border-radius 2px
+  visibility hidden
 
 .input
   height 29px
@@ -50,73 +61,68 @@
   width 100%
   outline none
 
+body[data-theme="default"], body[data-theme="white"]  
+  .root--active
+    &:hover
+      background-color alpha($ui-button--active-backgroundColor, 60%)
+
 body[data-theme="dark"]
   .root
-    color $ui-dark-text-color
-    border-color $ui-dark-borderColor
+    border-left 1px solid $ui-dark-borderColor
+    border-top 1px solid $ui-dark-borderColor
     &:hover
-      background-color $ui-dark-button--hover-backgroundColor
+      background-color alpha($ui-dark-button--active-backgroundColor, 20%)
+      transition 0.15s
+      .button
+        color $ui-dark-text-color
+        transition 0.15s
       .deleteButton
-        color $ui-dark-inactive-text-color
-        &:hover
-          background-color darken($ui-dark-button--hover-backgroundColor, 15%)
-        &:active
-          color $ui-dark-text-color
-          background-color $ui-dark-button--active-backgroundColor
+        color $ui-dark-text-color
+        transition 0.15s
 
   .root--active
-    color $ui-dark-text-color
-    border-color $ui-dark-borderColor
-    &:hover
-      background-color $ui-dark-button--hover-backgroundColor
-      .deleteButton
-        color $ui-dark-inactive-text-color
-        &:hover
-          background-color darken($ui-dark-button--hover-backgroundColor, 15%)
-        &:active
-          color $ui-dark-text-color
-          background-color $ui-dark-button--active-backgroundColor
+    background-color $ui-dark-button--active-backgroundColor
+    border-left 1px solid $ui-dark-borderColor
+    border-top 1px solid $ui-dark-borderColor
+    .button
+      color $ui-dark-text-color
+    .deleteButton
+      color $ui-dark-text-color
 
   .button
     border none
-    color $ui-dark-text-color
     background-color transparent
     transition color background-color 0.15s
     border-left 4px solid transparent
-    &:hover
-      color $ui-dark-text-color
-      background-color $ui-dark-button--hover-backgroundColor
 
   .input
-    background-color $ui-dark-button--hover-backgroundColor
+    background-color $ui-dark-button--active-backgroundColor
     color $ui-dark-text-color
-
-  .deleteButton
-    color alpha($ui-dark-text-color, 30%)
+    transition 0.15s
 
 body[data-theme="solarized-dark"]
   .root
     color $ui-solarized-dark-text-color
-    border-color $ui-dark-borderColor
+    border-left 1px solid $ui-solarized-dark-borderColor
+    border-top 1px solid $ui-solarized-dark-borderColor
     &:hover
       background-color $ui-solarized-dark-noteDetail-backgroundColor
       .deleteButton
         color $ui-solarized-dark-text-color
-        &:hover
-          background-color darken($ui-solarized-dark-noteDetail-backgroundColor, 15%)
         &:active
           color $ui-solarized-dark-text-color
           background-color $ui-dark-button--active-backgroundColor
 
   .root--active
     color $ui-solarized-dark-text-color
-    border-color $ui-solarized-dark-borderColor
+    background-color darken($ui-solarized-dark-noteDetail-backgroundColor, 20%)
+    border-left 1px solid $ui-solarized-dark-borderColor
+    border-top 1px solid $ui-solarized-dark-borderColor
     &:hover
-      background-color $ui-solarized-dark-noteDetail-backgroundColor
       .deleteButton
         color $ui-solarized-dark-text-color
         &:hover
-          background-color darken($ui-solarized-dark-noteDetail-backgroundColor, 15%)
+          // background-color darken($ui-dark-button--hover-backgroundColor, 15%)
         &:active
           color $ui-solarized-dark-text-color
           background-color $ui-dark-button--active-backgroundColor
@@ -129,7 +135,6 @@ body[data-theme="solarized-dark"]
     border-left 4px solid transparent
     &:hover
       color $ui-solarized-dark-text-color
-      background-color $ui-solarized-dark-noteDetail-backgroundColor
 
   .input
     background-color $ui-solarized-dark-noteDetail-backgroundColor
@@ -146,21 +151,16 @@ body[data-theme="monokai"]
       background-color $ui-monokai-noteDetail-backgroundColor
       .deleteButton
         color $ui-monokai-text-color
-        &:hover
-          background-color darken($ui-monokai-noteDetail-backgroundColor, 15%)
         &:active
           color $ui-monokai-text-color
           background-color $ui-dark-button--active-backgroundColor
 
   .root--active
     color $ui-monokai-text-color
-    border-color $ui-monokai-borderColor
+    background-color darken($ui-monokai-noteDetail-backgroundColor, 15%)
     &:hover
-      background-color $ui-monokai-noteDetail-backgroundColor
       .deleteButton
         color $ui-monokai-text-color
-        &:hover
-          background-color darken($ui-monokai-noteDetail-backgroundColor, 15%)
         &:active
           color $ui-monokai-text-color
           background-color $ui-dark-button--active-backgroundColor
@@ -173,7 +173,6 @@ body[data-theme="monokai"]
     border-left 4px solid transparent
     &:hover
       color $ui-monokai-text-color
-      background-color $ui-monokai-noteDetail-backgroundColor
 
   .input
     background-color $ui-monokai-noteDetail-backgroundColor
@@ -190,21 +189,16 @@ body[data-theme="dracula"]
       background-color $ui-dracula-noteDetail-backgroundColor
       .deleteButton
         color $ui-dracula-text-color
-        &:hover
-          background-color darken($ui-dracula-noteDetail-backgroundColor, 15%)
         &:active
           color $ui-dracula-text-color
           background-color $ui-dark-button--active-backgroundColor
 
   .root--active
     color $ui-dracula-text-color
-    border-color $ui-dracula-borderColor
+    background-color darken($ui-dracula-noteDetail-backgroundColor, 15%)
     &:hover
-      background-color $ui-dracula-noteDetail-backgroundColor
       .deleteButton
         color $ui-dracula-text-color
-        &:hover
-          background-color darken($ui-dracula-noteDetail-backgroundColor, 15%)
         &:active
           color $ui-dracula-text-color
           background-color $ui-dark-button--active-backgroundColor
@@ -217,7 +211,6 @@ body[data-theme="dracula"]
     border-left 4px solid transparent
     &:hover
       color $ui-dracula-text-color
-      background-color $ui-dracula-noteDetail-backgroundColor
 
   .input
     background-color $ui-dracula-noteDetail-backgroundColor
diff --git a/browser/main/Detail/SnippetNoteDetail.styl b/browser/main/Detail/SnippetNoteDetail.styl
index e3bb31c6..4757d414 100644
--- a/browser/main/Detail/SnippetNoteDetail.styl
+++ b/browser/main/Detail/SnippetNoteDetail.styl
@@ -31,7 +31,7 @@
 
 .tabList
   absolute left right
-  top 55px
+  top 70px
   height 30px
   display flex
   background-color $ui-noteDetail-backgroundColor
@@ -57,6 +57,9 @@
 .tabList .tabButton
   navWhiteButtonColor()
   width 30px
+  border-left 1px solid $ui-borderColor
+  border-top 1px solid $ui-borderColor
+  border-right 1px solid $ui-borderColor
 
 .tabView
   absolute left right bottom
@@ -98,17 +101,36 @@
   opacity 0
   transition 0.1s
 
-body[data-theme="white"]
+body[data-theme="white"], body[data-theme="default"]
   .root
     box-shadow $note-detail-box-shadow
     border none
 
+  .tabButton
+    &:hover
+      background-color alpha($ui-button--active-backgroundColor, 20%)
+      color $ui-text-color
+      transition 0.15s
+
 body[data-theme="dark"]
   .root
     border-left 1px solid $ui-dark-borderColor
     background-color $ui-dark-noteDetail-backgroundColor
     box-shadow none
 
+  .tabList .tabButton
+    border-left 1px solid $ui-dark-borderColor
+    border-top 1px solid $ui-dark-borderColor
+    border-right 1px solid $ui-dark-borderColor
+    &:hover
+      background-color alpha($ui-dark-button--active-backgroundColor, 20%)
+
+  .tabButton
+    &:hover
+      background-color alpha($ui-dark-button--active-backgroundColor, 20%)
+      color $ui-dark-text-color
+      transition 0.15s
+
   .body
     background-color $ui-dark-noteDetail-backgroundColor
 
@@ -118,7 +140,6 @@ body[data-theme="dark"]
     border 1px solid $ui-dark-borderColor
 
   .tabList
-    background-color $ui-button--active-backgroundColor
     background-color $ui-dark-noteDetail-backgroundColor
 
   .tabList .list
@@ -150,6 +171,11 @@ body[data-theme="solarized-dark"]
     color $ui-solarized-dark-text-color
     border 1px solid $ui-solarized-dark-borderColor
 
+  .tabList .tabButton
+    border-left 1px solid $ui-solarized-dark-borderColor
+    border-top 1px solid $ui-solarized-dark-borderColor
+    border-right 1px solid $ui-solarized-dark-borderColor
+    
   .tabList
     background-color $ui-solarized-dark-noteDetail-backgroundColor
     color $ui-solarized-dark-text-color
diff --git a/browser/styles/index.styl b/browser/styles/index.styl
index 56cb0eab..b9f9c41e 100644
--- a/browser/styles/index.styl
+++ b/browser/styles/index.styl
@@ -240,10 +240,8 @@ navWhiteButtonColor()
   &:hover
     background-color alpha($ui-button--active-backgroundColor, 20%)
     transition  0.15s
-    color $ui-text-color
   &:active, &:active:hover
     background-color $ui-button--active-backgroundColor
-    color $ui-text-color
     transition 0.15s
 
 // UI Button

From 58fd2273ea3359904ce20697309090ee928719b7 Mon Sep 17 00:00:00 2001
From: John Ciprian <johnciprian@icloud.com>
Date: Tue, 11 Dec 2018 16:28:02 -0500
Subject: [PATCH 065/159] Adding support for solarized-dark interface theme

---
 browser/components/SnippetTab.styl         | 34 +++++++++-------------
 browser/main/Detail/SnippetNoteDetail.styl |  6 ++++
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/browser/components/SnippetTab.styl b/browser/components/SnippetTab.styl
index 9c785104..6f858d91 100644
--- a/browser/components/SnippetTab.styl
+++ b/browser/components/SnippetTab.styl
@@ -107,25 +107,23 @@ body[data-theme="solarized-dark"]
     border-top 1px solid $ui-solarized-dark-borderColor
     &:hover
       background-color $ui-solarized-dark-noteDetail-backgroundColor
+      transition 0.15s
       .deleteButton
-        color $ui-solarized-dark-text-color
-        &:active
-          color $ui-solarized-dark-text-color
-          background-color $ui-dark-button--active-backgroundColor
+        color $ui-solarized-dark-button--active-color
+        transition 0.15s
+      .button
+        color $ui-solarized-dark-button--active-color
+        transition 0.15s
 
   .root--active
-    color $ui-solarized-dark-text-color
-    background-color darken($ui-solarized-dark-noteDetail-backgroundColor, 20%)
+    color $ui-solarized-dark-button--active-color
+    background-color $ui-solarized-dark-button-backgroundColor
     border-left 1px solid $ui-solarized-dark-borderColor
     border-top 1px solid $ui-solarized-dark-borderColor
-    &:hover
-      .deleteButton
-        color $ui-solarized-dark-text-color
-        &:hover
-          // background-color darken($ui-dark-button--hover-backgroundColor, 15%)
-        &:active
-          color $ui-solarized-dark-text-color
-          background-color $ui-dark-button--active-backgroundColor
+    .deleteButton
+      color $ui-solarized-dark-button--active-color
+    .button
+      color $ui-solarized-dark-button--active-color
 
   .button
     border none
@@ -133,15 +131,11 @@ body[data-theme="solarized-dark"]
     background-color transparent
     transition color background-color 0.15s
     border-left 4px solid transparent
-    &:hover
-      color $ui-solarized-dark-text-color
 
   .input
     background-color $ui-solarized-dark-noteDetail-backgroundColor
-    color $ui-solarized-dark-text-color
-
-  .deleteButton
-    color alpha($ui-solarized-dark-text-color, 30%)
+    color $ui-solarized-dark-button--active-color
+    transition 0.15s
 
 body[data-theme="monokai"]
   .root
diff --git a/browser/main/Detail/SnippetNoteDetail.styl b/browser/main/Detail/SnippetNoteDetail.styl
index 4757d414..5a81c843 100644
--- a/browser/main/Detail/SnippetNoteDetail.styl
+++ b/browser/main/Detail/SnippetNoteDetail.styl
@@ -175,6 +175,12 @@ body[data-theme="solarized-dark"]
     border-left 1px solid $ui-solarized-dark-borderColor
     border-top 1px solid $ui-solarized-dark-borderColor
     border-right 1px solid $ui-solarized-dark-borderColor
+
+  .tabButton
+    &:hover
+      color $ui-solarized-dark-button--active-color
+      background-color $ui-solarized-dark-noteDetail-backgroundColor
+      transition 0.15s
     
   .tabList
     background-color $ui-solarized-dark-noteDetail-backgroundColor

From 29cf4769f5d4a9612aff5338e3b4a845700e7315 Mon Sep 17 00:00:00 2001
From: John Ciprian <johnciprian@icloud.com>
Date: Wed, 12 Dec 2018 19:41:02 -0500
Subject: [PATCH 066/159] Adding support for monokai interface theme

---
 browser/components/SnippetTab.styl         | 36 ++++++++++------------
 browser/main/Detail/SnippetNoteDetail.styl |  8 +++++
 2 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/browser/components/SnippetTab.styl b/browser/components/SnippetTab.styl
index 6f858d91..a76a1196 100644
--- a/browser/components/SnippetTab.styl
+++ b/browser/components/SnippetTab.styl
@@ -139,41 +139,37 @@ body[data-theme="solarized-dark"]
 
 body[data-theme="monokai"]
   .root
-    color $ui-monokai-text-color
-    border-color $ui-dark-borderColor
+    border-color $ui-monokai-borderColor
     &:hover
       background-color $ui-monokai-noteDetail-backgroundColor
+      transition 0.15s
       .deleteButton
         color $ui-monokai-text-color
-        &:active
-          color $ui-monokai-text-color
-          background-color $ui-dark-button--active-backgroundColor
+        transition 0.15s
+      .button
+        color $ui-monokai-text-color
+        transition 0.15s
 
   .root--active
-    color $ui-monokai-text-color
-    background-color darken($ui-monokai-noteDetail-backgroundColor, 15%)
-    &:hover
-      .deleteButton
-        color $ui-monokai-text-color
-        &:active
-          color $ui-monokai-text-color
-          background-color $ui-dark-button--active-backgroundColor
-
+    color $ui-monokai-active-color
+    background-color $ui-monokai-button-backgroundColor
+    border-color $ui-monokai-borderColor
+    .deleteButton
+      color $ui-monokai-text-color
+    .button
+      color $ui-monokai-active-color
+        
   .button
     border none
-    color $ui-monokai-text-color
+    color $ui-inactive-text-color
     background-color transparent
     transition color background-color 0.15s
     border-left 4px solid transparent
-    &:hover
-      color $ui-monokai-text-color
 
   .input
     background-color $ui-monokai-noteDetail-backgroundColor
     color $ui-monokai-text-color
-
-  .deleteButton
-    color alpha($ui-monokai-text-color, 30%)
+    transition 0.15s
 
 body[data-theme="dracula"]
   .root
diff --git a/browser/main/Detail/SnippetNoteDetail.styl b/browser/main/Detail/SnippetNoteDetail.styl
index 5a81c843..1366e869 100644
--- a/browser/main/Detail/SnippetNoteDetail.styl
+++ b/browser/main/Detail/SnippetNoteDetail.styl
@@ -199,6 +199,14 @@ body[data-theme="monokai"]
     color $ui-monokai-text-color
     border 1px solid $ui-monokai-borderColor
 
+  .tabList .tabButton
+    border-color $ui-monokai-borderColor
+
+  .tabButton
+    &:hover
+      color $ui-monokai-text-color
+      background-color $ui-monokai-noteDetail-backgroundColor
+
   .tabList
     background-color $ui-monokai-noteDetail-backgroundColor
     color $ui-monokai-text-color

From cfcaa58b719b839d16b75bc99967bea9c4582b86 Mon Sep 17 00:00:00 2001
From: John Ciprian <johnciprian@icloud.com>
Date: Wed, 12 Dec 2018 19:43:01 -0500
Subject: [PATCH 067/159] Optimizing css for dark and solarized-dark themes

---
 browser/components/SnippetTab.styl         | 9 +++------
 browser/main/Detail/SnippetNoteDetail.styl | 8 ++------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/browser/components/SnippetTab.styl b/browser/components/SnippetTab.styl
index a76a1196..03d6409b 100644
--- a/browser/components/SnippetTab.styl
+++ b/browser/components/SnippetTab.styl
@@ -68,7 +68,7 @@ body[data-theme="default"], body[data-theme="white"]
 
 body[data-theme="dark"]
   .root
-    border-left 1px solid $ui-dark-borderColor
+    border-color $ui-dark-borderColor
     border-top 1px solid $ui-dark-borderColor
     &:hover
       background-color alpha($ui-dark-button--active-backgroundColor, 20%)
@@ -102,9 +102,7 @@ body[data-theme="dark"]
 
 body[data-theme="solarized-dark"]
   .root
-    color $ui-solarized-dark-text-color
-    border-left 1px solid $ui-solarized-dark-borderColor
-    border-top 1px solid $ui-solarized-dark-borderColor
+    border-color $ui-solarized-dark-borderColor
     &:hover
       background-color $ui-solarized-dark-noteDetail-backgroundColor
       transition 0.15s
@@ -118,8 +116,7 @@ body[data-theme="solarized-dark"]
   .root--active
     color $ui-solarized-dark-button--active-color
     background-color $ui-solarized-dark-button-backgroundColor
-    border-left 1px solid $ui-solarized-dark-borderColor
-    border-top 1px solid $ui-solarized-dark-borderColor
+    border-color $ui-solarized-dark-borderColor
     .deleteButton
       color $ui-solarized-dark-button--active-color
     .button
diff --git a/browser/main/Detail/SnippetNoteDetail.styl b/browser/main/Detail/SnippetNoteDetail.styl
index 1366e869..15743051 100644
--- a/browser/main/Detail/SnippetNoteDetail.styl
+++ b/browser/main/Detail/SnippetNoteDetail.styl
@@ -119,9 +119,7 @@ body[data-theme="dark"]
     box-shadow none
 
   .tabList .tabButton
-    border-left 1px solid $ui-dark-borderColor
-    border-top 1px solid $ui-dark-borderColor
-    border-right 1px solid $ui-dark-borderColor
+    border-color $ui-dark-borderColor
     &:hover
       background-color alpha($ui-dark-button--active-backgroundColor, 20%)
 
@@ -172,9 +170,7 @@ body[data-theme="solarized-dark"]
     border 1px solid $ui-solarized-dark-borderColor
 
   .tabList .tabButton
-    border-left 1px solid $ui-solarized-dark-borderColor
-    border-top 1px solid $ui-solarized-dark-borderColor
-    border-right 1px solid $ui-solarized-dark-borderColor
+    border-color $ui-solarized-dark-borderColor
 
   .tabButton
     &:hover

From ec506e71a44d39f57e6b7fb2d339e387c7f145c3 Mon Sep 17 00:00:00 2001
From: John Ciprian <johnciprian@icloud.com>
Date: Wed, 12 Dec 2018 20:56:31 -0500
Subject: [PATCH 068/159] Adding support for dracula interface theme

---
 browser/components/SnippetTab.styl         | 33 +++++++++-------------
 browser/main/Detail/SnippetNoteDetail.styl |  8 ++++++
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/browser/components/SnippetTab.styl b/browser/components/SnippetTab.styl
index 03d6409b..d101f318 100644
--- a/browser/components/SnippetTab.styl
+++ b/browser/components/SnippetTab.styl
@@ -170,38 +170,33 @@ body[data-theme="monokai"]
 
 body[data-theme="dracula"]
   .root
-    color $ui-dracula-text-color
-    border-color $ui-dark-borderColor
+    border-color $ui-dracula-borderColor
     &:hover
       background-color $ui-dracula-noteDetail-backgroundColor
+      transition 0.15s
       .deleteButton
         color $ui-dracula-text-color
-        &:active
-          color $ui-dracula-text-color
-          background-color $ui-dark-button--active-backgroundColor
+        transition 0.15s
+      .button
+        color $ui-dracula-text-color
+        transition 0.15s
 
   .root--active
     color $ui-dracula-text-color
-    background-color darken($ui-dracula-noteDetail-backgroundColor, 15%)
-    &:hover
-      .deleteButton
-        color $ui-dracula-text-color
-        &:active
-          color $ui-dracula-text-color
-          background-color $ui-dark-button--active-backgroundColor
+    background-color $ui-dracula-button-backgroundColor
+    border-color $ui-dracula-borderColor
+    .deleteButton
+      color $ui-dracula-text-color
+    .button
+      color $ui-dracula-active-color
 
   .button
     border none
-    color $ui-dracula-text-color
+    color $ui-inactive-text-color
     background-color transparent
     transition color background-color 0.15s
     border-left 4px solid transparent
-    &:hover
-      color $ui-dracula-text-color
 
   .input
     background-color $ui-dracula-noteDetail-backgroundColor
-    color $ui-dracula-text-color
-
-  .deleteButton
-    color alpha($ui-dracula-text-color, 30%)
\ No newline at end of file
+    color $ui-dracula-text-color
\ No newline at end of file
diff --git a/browser/main/Detail/SnippetNoteDetail.styl b/browser/main/Detail/SnippetNoteDetail.styl
index 15743051..1af93645 100644
--- a/browser/main/Detail/SnippetNoteDetail.styl
+++ b/browser/main/Detail/SnippetNoteDetail.styl
@@ -220,6 +220,14 @@ body[data-theme="dracula"]
     color $ui-dracula-text-color
     border 1px solid $ui-dracula-borderColor
 
+  .tabList .tabButton
+    border-color $ui-dracula-borderColor
+
+  .tabButton
+    &:hover
+      color $ui-dracula-text-color
+      background-color $ui-dracula-noteDetail-backgroundColor
+
   .tabList
     background-color $ui-dracula-noteDetail-backgroundColor
     color $ui-dracula-text-color
\ No newline at end of file

From 4f9b37433c3f381a718cab268a52f1f606a15b03 Mon Sep 17 00:00:00 2001
From: Baptiste Augrain <daiyam@zokugun.org>
Date: Sat, 15 Dec 2018 10:11:04 +0100
Subject: [PATCH 069/159] fix toc by sharing `slugify()`

---
 browser/lib/markdown-toc-generator.js | 63 +++++++++++----------------
 browser/lib/markdown.js               | 11 +----
 browser/lib/slugify.js                |  6 +++
 3 files changed, 33 insertions(+), 47 deletions(-)
 create mode 100644 browser/lib/slugify.js

diff --git a/browser/lib/markdown-toc-generator.js b/browser/lib/markdown-toc-generator.js
index eae448ec..a7bc79f3 100644
--- a/browser/lib/markdown-toc-generator.js
+++ b/browser/lib/markdown-toc-generator.js
@@ -6,47 +6,21 @@ import toc from 'markdown-toc'
 import diacritics from 'diacritics-map'
 import stripColor from 'strip-color'
 import mdlink from 'markdown-link'
+import slugify from './slugify'
 
 const EOL = require('os').EOL
 
+const hasProp = Object.prototype.hasOwnProperty
+
 /**
- * @caseSensitiveSlugify Custom slugify function
- * Same implementation that the original used by markdown-toc (node_modules/markdown-toc/lib/utils.js),
- * but keeps original case to properly handle https://github.com/BoostIO/Boostnote/issues/2067
+ * From @enyaxu/markdown-it-anchor
  */
-function caseSensitiveSlugify (str) {
-  function replaceDiacritics (str) {
-    return str.replace(/[À-ž]/g, function (ch) {
-      return diacritics[ch] || ch
-    })
-  }
-
-  function getTitle (str) {
-    if (/^\[[^\]]+\]\(/.test(str)) {
-      var m = /^\[([^\]]+)\]/.exec(str)
-      if (m) return m[1]
-    }
-    return str
-  }
-
-  str = getTitle(str)
-  str = stripColor(str)
-  // str = str.toLowerCase() //let's be case sensitive
-
-  // `.split()` is often (but not always) faster than `.replace()`
-  str = str.split(' ').join('-')
-  str = str.split(/\t/).join('--')
-  str = str.split(/<\/?[^>]+>/).join('')
-  str = str.split(/[|$&`~=\\\/@+*!?({[\]})<>=.,;:'"^]/).join('')
-  str = str.split(/[。？！，、；：“”【】（）〔〕［］﹃﹄“ ”‘’﹁﹂—…－～《》〈〉「」]/).join('')
-  str = replaceDiacritics(str)
-  return str
-}
-
-function linkify (tok, text, slug, opts) {
-  var uniqeID = opts.num === 0 ? '' : '-' + opts.num
-  tok.content = mdlink(text, '#' + slug + uniqeID)
-  return tok
+function uniqueSlug (slug, slugs, opts) {
+  let uniq = slug
+  let i = opts.uniqueSlugStartIndex
+  while (hasProp.call(slugs, uniq)) uniq = `${slug}-${i++}`
+  slugs[uniq] = true
+  return uniq
 }
 
 const TOC_MARKER_START = '<!-- toc -->'
@@ -91,8 +65,21 @@ export function generateInEditor (editor) {
  * @returns generatedTOC String containing generated TOC
  */
 export function generate (markdownText) {
-  const generatedToc = toc(markdownText, {slugify: caseSensitiveSlugify, linkify: linkify})
-  return TOC_MARKER_START + EOL + EOL + generatedToc.content + EOL + EOL + TOC_MARKER_END
+  const slugs = {}
+  const opts = {
+    uniqueSlugStartIndex: 1
+  }
+
+  const tokens = toc(markdownText, {
+    slugify: title => {
+      return uniqueSlug(slugify(title), slugs, opts)
+    },
+    linkify: false
+  })
+
+  const md = tokens.json.map(token => mdlink(token.content, '#' + token.slug)).join(EOL)
+
+  return TOC_MARKER_START + EOL + EOL + md + EOL + EOL + TOC_MARKER_END
 }
 
 function wrapTocWithEol (toc, editor) {
diff --git a/browser/lib/markdown.js b/browser/lib/markdown.js
index 2a7b66b0..0f7d58b5 100644
--- a/browser/lib/markdown.js
+++ b/browser/lib/markdown.js
@@ -7,7 +7,6 @@ import _ from 'lodash'
 import ConfigManager from 'browser/main/lib/ConfigManager'
 import katex from 'katex'
 import { lastFindInArray } from './utils'
-import anchor from '@enyaxu/markdown-it-anchor'
 
 function createGutter (str, firstLineNumber) {
   if (Number.isNaN(firstLineNumber)) firstLineNumber = 1
@@ -118,14 +117,8 @@ class Markdown {
     this.md.use(require('markdown-it-imsize'))
     this.md.use(require('markdown-it-footnote'))
     this.md.use(require('markdown-it-multimd-table'))
-    this.md.use(anchor, {
-      slugify: (title) => {
-        var slug = encodeURI(title.trim()
-          .replace(/[\]\[\!\"\#\$\%\&\'\(\)\*\+\,\.\/\:\;\<\=\>\?\@\\\^\_\{\|\}\~]/g, '')
-          .replace(/\s+/g, '-'))
-          .replace(/\-+$/, '')
-        return slug
-      }
+    this.md.use(require('@enyaxu/markdown-it-anchor'), {
+      slugify: require('./slugify')
     })
     this.md.use(require('markdown-it-kbd'))
     this.md.use(require('markdown-it-admonition'), {types: ['note', 'hint', 'attention', 'caution', 'danger', 'error']})
diff --git a/browser/lib/slugify.js b/browser/lib/slugify.js
new file mode 100644
index 00000000..0ff21245
--- /dev/null
+++ b/browser/lib/slugify.js
@@ -0,0 +1,6 @@
+module.exports = function slugify (title) {
+  return encodeURI(title.trim()
+    .replace(/[\]\[\!\"\#\$\%\&\'\(\)\*\+\,\.\/\:\;\<\=\>\?\@\\\^\_\{\|\}\~]/g, '')
+    .replace(/\s+/g, '-'))
+    .replace(/\-+$/, '')
+}

From d5a2aa6d6d8ab0434cd29da4a4b294e4c1839ae2 Mon Sep 17 00:00:00 2001
From: Baptiste Augrain <daiyam@zokugun.org>
Date: Sat, 15 Dec 2018 10:41:47 +0100
Subject: [PATCH 070/159] fix missing bullets

---
 browser/lib/markdown-toc-generator.js | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/browser/lib/markdown-toc-generator.js b/browser/lib/markdown-toc-generator.js
index a7bc79f3..7a97f800 100644
--- a/browser/lib/markdown-toc-generator.js
+++ b/browser/lib/markdown-toc-generator.js
@@ -2,14 +2,13 @@
  * @fileoverview Markdown table of contents generator
  */
 
+import { EOL } from 'os'
 import toc from 'markdown-toc'
 import diacritics from 'diacritics-map'
 import stripColor from 'strip-color'
 import mdlink from 'markdown-link'
 import slugify from './slugify'
 
-const EOL = require('os').EOL
-
 const hasProp = Object.prototype.hasOwnProperty
 
 /**
@@ -23,6 +22,11 @@ function uniqueSlug (slug, slugs, opts) {
   return uniq
 }
 
+function linkify (token) {
+  token.content = mdlink(token.content, '#' + token.slug)
+  return token
+}
+
 const TOC_MARKER_START = '<!-- toc -->'
 const TOC_MARKER_END = '<!-- tocstop -->'
 
@@ -70,14 +74,16 @@ export function generate (markdownText) {
     uniqueSlugStartIndex: 1
   }
 
-  const tokens = toc(markdownText, {
+  const result = toc(markdownText, {
     slugify: title => {
       return uniqueSlug(slugify(title), slugs, opts)
     },
     linkify: false
   })
 
-  const md = tokens.json.map(token => mdlink(token.content, '#' + token.slug)).join(EOL)
+  const md = toc.bullets(result.json.map(linkify), {
+    highest: result.highest
+  })
 
   return TOC_MARKER_START + EOL + EOL + md + EOL + EOL + TOC_MARKER_END
 }

From fe1ab7381869768720b84f07290f70e759d12aae Mon Sep 17 00:00:00 2001
From: roottool <smart.dog.lilienthal@gmail.com>
Date: Sun, 16 Dec 2018 22:08:55 +0900
Subject: [PATCH 071/159] fix #2644 and #2662

---
 browser/components/MarkdownPreview.js         |  7 ++++-
 .../main/lib/dataApi/attachmentManagement.js  | 27 +++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/browser/components/MarkdownPreview.js b/browser/components/MarkdownPreview.js
index 17d2cb82..7bfd8a10 100755
--- a/browser/components/MarkdownPreview.js
+++ b/browser/components/MarkdownPreview.js
@@ -625,11 +625,16 @@ export default class MarkdownPreview extends React.Component {
       indentSize,
       showCopyNotification,
       storagePath,
-      noteKey
+      noteKey,
+      sanitize
     } = this.props
     let { value, codeBlockTheme } = this.props
 
     this.refs.root.contentWindow.document.body.setAttribute('data-theme', theme)
+    if (sanitize === 'NONE') {
+      const splitWithCodeTag = value.split('```')
+      value = attachmentManagement.escapeHtmlCharactersInCodeTag(splitWithCodeTag)
+    }
     const renderedHTML = this.markdown.render(value)
     attachmentManagement.migrateAttachments(value, storagePath, noteKey)
     this.refs.root.contentWindow.document.body.innerHTML = attachmentManagement.fixLocalURLS(
diff --git a/browser/main/lib/dataApi/attachmentManagement.js b/browser/main/lib/dataApi/attachmentManagement.js
index 373efddc..43136bc0 100644
--- a/browser/main/lib/dataApi/attachmentManagement.js
+++ b/browser/main/lib/dataApi/attachmentManagement.js
@@ -7,6 +7,7 @@ const fse = require('fs-extra')
 const escapeStringRegexp = require('escape-string-regexp')
 const sander = require('sander')
 import i18n from 'browser/lib/i18n'
+import { escapeHtmlCharacters } from '../../../lib/utils'
 
 const STORAGE_FOLDER_PLACEHOLDER = ':storage'
 const DESTINATION_FOLDER = 'attachments'
@@ -220,6 +221,31 @@ function migrateAttachments (markdownContent, storagePath, noteKey) {
   }
 }
 
+/**
+ * @description Convert special characters between ```
+ * @param {string[]} splitWithCodeTag Array of HTML strings separated by ```
+ * @returns {string} HTML in which special characters between ``` have been converted
+ */
+function escapeHtmlCharactersInCodeTag (splitWithCodeTag) {
+  for (let index = 0; index < splitWithCodeTag.length; index++) {
+    const codeTagRequired = (splitWithCodeTag[index] !== '\`\`\`' && index < splitWithCodeTag.length - 1)
+    if (codeTagRequired) {
+      splitWithCodeTag.splice((index + 1), 0, '\`\`\`')
+    }
+  }
+  let inCodeTag = false
+  let result = ''
+  for (let content of splitWithCodeTag) {
+    if (content === '\`\`\`') {
+      inCodeTag = !inCodeTag
+    } else if (inCodeTag) {
+      content = escapeHtmlCharacters(content)
+    }
+    result += content
+  }
+  return result
+}
+
 /**
  * @description Fixes the URLs embedded in the generated HTML so that they again refer actual local files.
  * @param {String} renderedHTML HTML in that the links should be fixed
@@ -574,6 +600,7 @@ function handleAttachmentLinkPaste (storageKey, noteKey, linkText) {
 module.exports = {
   copyAttachment,
   fixLocalURLS,
+  escapeHtmlCharactersInCodeTag,
   generateAttachmentMarkdown,
   handleAttachmentDrop,
   handlePastImageEvent,

From 13857d43133c0429c2651fefe1ed9d53b188021a Mon Sep 17 00:00:00 2001
From: roottool <smart.dog.lilienthal@gmail.com>
Date: Mon, 17 Dec 2018 00:37:25 +0900
Subject: [PATCH 072/159] Modified position of escapeHtmlCharactersInCodeTag
 definition

---
 browser/main/lib/dataApi/attachmentManagement.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser/main/lib/dataApi/attachmentManagement.js b/browser/main/lib/dataApi/attachmentManagement.js
index 43136bc0..c0ada1f8 100644
--- a/browser/main/lib/dataApi/attachmentManagement.js
+++ b/browser/main/lib/dataApi/attachmentManagement.js
@@ -599,8 +599,8 @@ function handleAttachmentLinkPaste (storageKey, noteKey, linkText) {
 
 module.exports = {
   copyAttachment,
-  fixLocalURLS,
   escapeHtmlCharactersInCodeTag,
+  fixLocalURLS,
   generateAttachmentMarkdown,
   handleAttachmentDrop,
   handlePastImageEvent,

From b99980fda1afcb12df5316337fb0b869a65b550e Mon Sep 17 00:00:00 2001
From: Baptiste Augrain <daiyam@zokugun.org>
Date: Sun, 16 Dec 2018 19:38:04 +0100
Subject: [PATCH 073/159] improve slug by replacing diacritics and removing
 unwanted characters

---
 browser/lib/slugify.js | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/browser/lib/slugify.js b/browser/lib/slugify.js
index 0ff21245..3b6386de 100644
--- a/browser/lib/slugify.js
+++ b/browser/lib/slugify.js
@@ -1,6 +1,17 @@
-module.exports = function slugify (title) {
-  return encodeURI(title.trim()
-    .replace(/[\]\[\!\"\#\$\%\&\'\(\)\*\+\,\.\/\:\;\<\=\>\?\@\\\^\_\{\|\}\~]/g, '')
-    .replace(/\s+/g, '-'))
-    .replace(/\-+$/, '')
+import diacritics from 'diacritics-map'
+
+function replaceDiacritics(str) {
+  return str.replace(/[À-ž]/g, function(ch) {
+    return diacritics[ch] || ch;
+  });
+}
+
+module.exports = function slugify (title) {
+  let slug = title.trim()
+
+  slug = replaceDiacritics(slug)
+
+  slug = slug.replace(/[^\w\s-]/g, '').replace(/\s+/g, '-')
+
+  return encodeURI(slug).replace(/\-+$/, '')
 }

From 256653677e31302212aee0d252cdd34f16ad64e2 Mon Sep 17 00:00:00 2001
From: Baptiste Augrain <daiyam@zokugun.org>
Date: Sun, 16 Dec 2018 19:45:18 +0100
Subject: [PATCH 074/159] fix lint errors and remove unused dependencies

---
 browser/lib/markdown-toc-generator.js | 2 --
 browser/lib/slugify.js                | 8 ++++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/browser/lib/markdown-toc-generator.js b/browser/lib/markdown-toc-generator.js
index 7a97f800..af1c833f 100644
--- a/browser/lib/markdown-toc-generator.js
+++ b/browser/lib/markdown-toc-generator.js
@@ -4,8 +4,6 @@
 
 import { EOL } from 'os'
 import toc from 'markdown-toc'
-import diacritics from 'diacritics-map'
-import stripColor from 'strip-color'
 import mdlink from 'markdown-link'
 import slugify from './slugify'
 
diff --git a/browser/lib/slugify.js b/browser/lib/slugify.js
index 3b6386de..a3447a90 100644
--- a/browser/lib/slugify.js
+++ b/browser/lib/slugify.js
@@ -1,9 +1,9 @@
 import diacritics from 'diacritics-map'
 
-function replaceDiacritics(str) {
-  return str.replace(/[À-ž]/g, function(ch) {
-    return diacritics[ch] || ch;
-  });
+function replaceDiacritics (str) {
+  return str.replace(/[À-ž]/g, function (ch) {
+    return diacritics[ch] || ch
+  })
 }
 
 module.exports = function slugify (title) {

From 64ca875cfd0c20614fe1a988a43bbc2ba0b3c6d1 Mon Sep 17 00:00:00 2001
From: Junyoung Choi <fluke8259@gmail.com>
Date: Mon, 17 Dec 2018 14:56:16 +0900
Subject: [PATCH 075/159] v0.11.12

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 128a21af..44e7c9f0 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "boost",
   "productName": "Boostnote",
-  "version": "0.11.11",
+  "version": "0.11.12",
   "main": "index.js",
   "description": "Boostnote",
   "license": "GPL-3.0",

From 0b1ec3f29f36855d1df5b336b7aacb900e939bd9 Mon Sep 17 00:00:00 2001
From: richardtks <richardtks8@gmail.com>
Date: Tue, 18 Dec 2018 16:32:30 +0800
Subject: [PATCH 076/159] show the scroll bar when the tag list is overflow

---
 browser/main/Detail/TagSelect.styl | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/browser/main/Detail/TagSelect.styl b/browser/main/Detail/TagSelect.styl
index c6b13f3c..f3b0e96b 100644
--- a/browser/main/Detail/TagSelect.styl
+++ b/browser/main/Detail/TagSelect.styl
@@ -3,15 +3,12 @@
   align-items center
   user-select none
   vertical-align middle
-  width 100%
+  width 96%
   overflow-x scroll
   white-space nowrap
   margin-top 31px
   position absolute
 
-.root::-webkit-scrollbar
-  display none
-
 .tag
   display flex
   align-items center

From bb892f7e78a68409ed782fc85d7fb56606c5b242 Mon Sep 17 00:00:00 2001
From: richardtks <richardtks8@gmail.com>
Date: Tue, 18 Dec 2018 18:34:49 +0800
Subject: [PATCH 077/159] Updated the overflow-x to auto

---
 browser/main/Detail/TagSelect.styl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser/main/Detail/TagSelect.styl b/browser/main/Detail/TagSelect.styl
index f3b0e96b..9e8ae68a 100644
--- a/browser/main/Detail/TagSelect.styl
+++ b/browser/main/Detail/TagSelect.styl
@@ -4,7 +4,7 @@
   user-select none
   vertical-align middle
   width 96%
-  overflow-x scroll
+  overflow-x auto
   white-space nowrap
   margin-top 31px
   position absolute

From 7f6d4acf90753fc452c5ac16a5b1f559a1b4e95d Mon Sep 17 00:00:00 2001
From: Miguel Teixeira <miguelalexbt@outlook.com>
Date: Wed, 19 Dec 2018 15:16:55 +0000
Subject: [PATCH 078/159] Fixed lock button not appearing

---
 browser/main/Detail/MarkdownNoteDetail.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/MarkdownNoteDetail.js
index 33beb35b..eed40cb3 100755
--- a/browser/main/Detail/MarkdownNoteDetail.js
+++ b/browser/main/Detail/MarkdownNoteDetail.js
@@ -41,9 +41,10 @@ class MarkdownNoteDetail extends React.Component {
         title: '',
         content: ''
       }, props.note),
-      isLockButtonShown: false,
+      isLockButtonShown: props.config.editor.type !== 'SPLIT',
       isLocked: false,
-      editorType: props.config.editor.type
+      editorType: props.config.editor.type,
+      switchPreview: props.config.editor.switchPreview
     }
     this.dispatchTimer = null
 
@@ -63,6 +64,9 @@ class MarkdownNoteDetail extends React.Component {
     })
     ee.on('hotkey:deletenote', this.handleDeleteNote.bind(this))
     ee.on('code:generate-toc', this.generateToc)
+
+    // Focus content if using blur or double click
+    if (this.state.switchPreview === 'BLUR' || this.state.switchPreview === 'DBL_CLICK') this.focus()
   }
 
   componentWillReceiveProps (nextProps) {

From 72906b3ee78a10aec04c6e2ee3e07be47f697960 Mon Sep 17 00:00:00 2001
From: Duarte-Frazao <duartemarquesmano@gmail.com>
Date: Wed, 19 Dec 2018 16:34:16 +0000
Subject: [PATCH 079/159] Corrections to make line highlighting robust, added
 tests

Lines now save correctly with different inputs, making sure that different inputs like enter, delete, paste and where it's deleted stay consistent when saving.
Included in the create/update  snippet/note tests the structure from lines highlighting saved to the files.
---
 browser/components/CodeEditor.js    | 69 +++++++++++++++++++++++++++++
 tests/dataApi/createNote-test.js    | 13 +++++-
 tests/dataApi/createSnippet-test.js |  1 +
 tests/dataApi/updateNote-test.js    | 19 ++++++--
 4 files changed, 96 insertions(+), 6 deletions(-)

diff --git a/browser/components/CodeEditor.js b/browser/components/CodeEditor.js
index 2f4f1c8a..a438009f 100644
--- a/browser/components/CodeEditor.js
+++ b/browser/components/CodeEditor.js
@@ -511,12 +511,50 @@ export default class CodeEditor extends React.Component {
 
   handleChange (editor, changeObject) {
     spellcheck.handleChange(editor, changeObject)
+
+    this.updateHighlight(editor, changeObject)
+
     this.value = editor.getValue()
     if (this.props.onChange) {
       this.props.onChange(editor)
     }
   }
 
+  incrementLines (start, linesAdded, linesRemoved, editor) {
+    let highlightedLines = editor.options.linesHighlighted
+
+    const totalHighlightedLines = highlightedLines.length
+
+    let offset = linesAdded - linesRemoved
+
+    // Store new items to be added as we're changing the lines
+    let newLines = []
+
+    let i = totalHighlightedLines
+
+    while (i--) {
+      const lineNumber = highlightedLines[i]
+
+      // Interval that will need to be updated
+      // Between start and (start + offset) remove highlight
+      if (lineNumber >= start) {
+        highlightedLines.splice(highlightedLines.indexOf(lineNumber), 1)
+
+        // Lines that need to be relocated
+        if (lineNumber >= (start + linesRemoved)) {
+          newLines.push(lineNumber + offset)
+        }
+      }
+    }
+
+    // Adding relocated lines
+    highlightedLines.push(...newLines)
+
+    if (this.props.onChange) {
+      this.props.onChange(editor)
+    }
+  }
+
   handleHighlight (editor, changeObject) {
     const lines = editor.options.linesHighlighted
 
@@ -532,6 +570,37 @@ export default class CodeEditor extends React.Component {
     }
   }
 
+  updateHighlight (editor, changeObject) {
+    const linesAdded = changeObject.text.length - 1
+    const linesRemoved = changeObject.removed.length - 1
+
+    // If no lines added or removed return
+    if (linesAdded === 0 && linesRemoved === 0) {
+      return
+    }
+
+    let start = changeObject.from.line
+
+    switch (changeObject.origin) {
+      case '+insert", "undo':
+        start += 1
+        break
+
+      case 'paste':
+      case '+delete':
+      case '+input':
+        if (changeObject.to.ch !== 0 || changeObject.from.ch !== 0) {
+          start += 1
+        }
+        break
+
+      default:
+        return
+    }
+
+    this.incrementLines(start, linesAdded, linesRemoved, editor)
+  }
+
   moveCursorTo (row, col) {}
 
   scrollToLine (event, num) {
diff --git a/tests/dataApi/createNote-test.js b/tests/dataApi/createNote-test.js
index 47446aab..3606dfd4 100644
--- a/tests/dataApi/createNote-test.js
+++ b/tests/dataApi/createNote-test.js
@@ -25,13 +25,16 @@ test.serial('Create a note', (t) => {
   const storageKey = t.context.storage.cache.key
   const folderKey = t.context.storage.json.folders[0].key
 
+  const randLinesHighlightedArray = new Array(10).fill().map(() => Math.round(Math.random() * 10))
+
   const input1 = {
     type: 'SNIPPET_NOTE',
     description: faker.lorem.lines(),
     snippets: [{
       name: faker.system.fileName(),
       mode: 'text',
-      content: faker.lorem.lines()
+      content: faker.lorem.lines(),
+      linesHighlighted: randLinesHighlightedArray
     }],
     tags: faker.lorem.words().split(' '),
     folder: folderKey
@@ -42,7 +45,8 @@ test.serial('Create a note', (t) => {
     type: 'MARKDOWN_NOTE',
     content: faker.lorem.lines(),
     tags: faker.lorem.words().split(' '),
-    folder: folderKey
+    folder: folderKey,
+    linesHighlighted: randLinesHighlightedArray
   }
   input2.title = input2.content.split('\n').shift()
 
@@ -59,6 +63,7 @@ test.serial('Create a note', (t) => {
 
       t.is(storageKey, data1.storage)
       const jsonData1 = CSON.readFileSync(path.join(storagePath, 'notes', data1.key + '.cson'))
+
       t.is(input1.title, data1.title)
       t.is(input1.title, jsonData1.title)
       t.is(input1.description, data1.description)
@@ -71,6 +76,8 @@ test.serial('Create a note', (t) => {
       t.is(input1.snippets[0].content, jsonData1.snippets[0].content)
       t.is(input1.snippets[0].name, data1.snippets[0].name)
       t.is(input1.snippets[0].name, jsonData1.snippets[0].name)
+      t.deepEqual(input1.snippets[0].linesHighlighted, data1.snippets[0].linesHighlighted)
+      t.deepEqual(input1.snippets[0].linesHighlighted, jsonData1.snippets[0].linesHighlighted)
 
       t.is(storageKey, data2.storage)
       const jsonData2 = CSON.readFileSync(path.join(storagePath, 'notes', data2.key + '.cson'))
@@ -80,6 +87,8 @@ test.serial('Create a note', (t) => {
       t.is(input2.content, jsonData2.content)
       t.is(input2.tags.length, data2.tags.length)
       t.is(input2.tags.length, jsonData2.tags.length)
+      t.deepEqual(input2.linesHighlighted, data2.linesHighlighted)
+      t.deepEqual(input2.linesHighlighted, jsonData2.linesHighlighted)
     })
 })
 
diff --git a/tests/dataApi/createSnippet-test.js b/tests/dataApi/createSnippet-test.js
index f06cf861..638b76ca 100644
--- a/tests/dataApi/createSnippet-test.js
+++ b/tests/dataApi/createSnippet-test.js
@@ -26,6 +26,7 @@ test.serial('Create a snippet', (t) => {
       t.is(snippet.name, data.name)
       t.deepEqual(snippet.prefix, data.prefix)
       t.is(snippet.content, data.content)
+      t.deepEqual(snippet.linesHighlighted, data.linesHighlighted)
     })
 })
 
diff --git a/tests/dataApi/updateNote-test.js b/tests/dataApi/updateNote-test.js
index 6043ee1e..da47c30c 100644
--- a/tests/dataApi/updateNote-test.js
+++ b/tests/dataApi/updateNote-test.js
@@ -26,13 +26,17 @@ test.serial('Update a note', (t) => {
   const storageKey = t.context.storage.cache.key
   const folderKey = t.context.storage.json.folders[0].key
 
+  const randLinesHighlightedArray = new Array(10).fill().map(() => Math.round(Math.random() * 10))
+  const randLinesHighlightedArray2 = new Array(15).fill().map(() => Math.round(Math.random() * 15))
+
   const input1 = {
     type: 'SNIPPET_NOTE',
     description: faker.lorem.lines(),
     snippets: [{
       name: faker.system.fileName(),
       mode: 'text',
-      content: faker.lorem.lines()
+      content: faker.lorem.lines(),
+      linesHighlighted: randLinesHighlightedArray
     }],
     tags: faker.lorem.words().split(' '),
     folder: folderKey
@@ -43,7 +47,8 @@ test.serial('Update a note', (t) => {
     type: 'MARKDOWN_NOTE',
     content: faker.lorem.lines(),
     tags: faker.lorem.words().split(' '),
-    folder: folderKey
+    folder: folderKey,
+    linesHighlighted: randLinesHighlightedArray
   }
   input2.title = input2.content.split('\n').shift()
 
@@ -53,7 +58,8 @@ test.serial('Update a note', (t) => {
     snippets: [{
       name: faker.system.fileName(),
       mode: 'text',
-      content: faker.lorem.lines()
+      content: faker.lorem.lines(),
+      linesHighlighted: randLinesHighlightedArray2
     }],
     tags: faker.lorem.words().split(' ')
   }
@@ -62,7 +68,8 @@ test.serial('Update a note', (t) => {
   const input4 = {
     type: 'MARKDOWN_NOTE',
     content: faker.lorem.lines(),
-    tags: faker.lorem.words().split(' ')
+    tags: faker.lorem.words().split(' '),
+    linesHighlighted: randLinesHighlightedArray2
   }
   input4.title = input4.content.split('\n').shift()
 
@@ -99,6 +106,8 @@ test.serial('Update a note', (t) => {
       t.is(input3.snippets[0].content, jsonData1.snippets[0].content)
       t.is(input3.snippets[0].name, data1.snippets[0].name)
       t.is(input3.snippets[0].name, jsonData1.snippets[0].name)
+      t.deepEqual(input3.snippets[0].linesHighlighted, data1.snippets[0].linesHighlighted)
+      t.deepEqual(input3.snippets[0].linesHighlighted, jsonData1.snippets[0].linesHighlighted)
 
       const jsonData2 = CSON.readFileSync(path.join(storagePath, 'notes', data2.key + '.cson'))
       t.is(input4.title, data2.title)
@@ -107,6 +116,8 @@ test.serial('Update a note', (t) => {
       t.is(input4.content, jsonData2.content)
       t.is(input4.tags.length, data2.tags.length)
       t.is(input4.tags.length, jsonData2.tags.length)
+      t.deepEqual(input4.linesHighlighted, data2.linesHighlighted)
+      t.deepEqual(input4.linesHighlighted, jsonData2.linesHighlighted)
     })
 })
 

From b539ac6335ac156ab244c986ef44c9feb2bd0603 Mon Sep 17 00:00:00 2001
From: MiguelPedrosa <pedrosa.miguel@gmail.com>
Date: Wed, 19 Dec 2018 20:57:27 +0000
Subject: [PATCH 080/159] Fixed windows debug path

---
 .vscode/launch.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.vscode/launch.json b/.vscode/launch.json
index a742a59e..9d1cc4ec 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -17,7 +17,7 @@
         "${workspaceFolder}/index.js"
       ],
       "windows": {
-        "runtimeExecutable": "${workspaceFolder}/node_modeules/.bin/electron.cmd"
+        "runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron.cmd"
       }
     },
     {

From 8d769d4c4b22596748067c7598960c93a856ce98 Mon Sep 17 00:00:00 2001
From: Christian Oliff <christianoliff@yahoo.com>
Date: Sat, 22 Dec 2018 12:00:19 +0900
Subject: [PATCH 081/159] Https link

---
 .editorconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.editorconfig b/.editorconfig
index a4730cbf..8c5bd614 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,4 +1,4 @@
-# EditorConfig is awesome: http://EditorConfig.org
+# EditorConfig is awesome: https://EditorConfig.org
 
 # top-most EditorConfig file
 root = true

From e93bf1cfe757821c8c5f618d5168cb50a092ad80 Mon Sep 17 00:00:00 2001
From: duartefrazao <duartemarquesmano@gmail.com>
Date: Sat, 22 Dec 2018 11:44:30 +0000
Subject: [PATCH 082/159] Removed bind in MarkdownEditor and
 MarkdownSplitEditor

---
 browser/components/MarkdownEditor.js      | 2 +-
 browser/components/MarkdownSplitEditor.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/browser/components/MarkdownEditor.js b/browser/components/MarkdownEditor.js
index 6c91ea1d..0043ea5c 100644
--- a/browser/components/MarkdownEditor.js
+++ b/browser/components/MarkdownEditor.js
@@ -276,7 +276,7 @@ class MarkdownEditor extends React.Component {
           fetchUrlTitle={config.editor.fetchUrlTitle}
           enableTableEditor={config.editor.enableTableEditor}
           linesHighlighted={linesHighlighted}
-          onChange={(e) => this.handleChange.bind(this)(e)}
+          onChange={(e) => this.handleChange(e)}
           onBlur={(e) => this.handleBlur(e)}
           spellCheck={config.editor.spellcheck}
         />
diff --git a/browser/components/MarkdownSplitEditor.js b/browser/components/MarkdownSplitEditor.js
index c1b9bd84..2f76b9fc 100644
--- a/browser/components/MarkdownSplitEditor.js
+++ b/browser/components/MarkdownSplitEditor.js
@@ -170,7 +170,7 @@ class MarkdownSplitEditor extends React.Component {
           storageKey={storageKey}
           noteKey={noteKey}
           linesHighlighted={linesHighlighted}
-          onChange={(e) => this.handleOnChange.bind(this)(e)}
+          onChange={(e) => this.handleOnChange(e)}
           onScroll={this.handleScroll.bind(this)}
           spellCheck={config.editor.spellcheck}
        />

From 692f6779d659e9b3e67a2a10f6167988c94a5754 Mon Sep 17 00:00:00 2001
From: roottool <smart.dog.lilienthal@gmail.com>
Date: Sun, 23 Dec 2018 01:13:57 +0900
Subject: [PATCH 083/159] fixed the checkboxes are too far right #2729

---
 browser/components/markdown.styl | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/browser/components/markdown.styl b/browser/components/markdown.styl
index b7f219b8..71cf987b 100644
--- a/browser/components/markdown.styl
+++ b/browser/components/markdown.styl
@@ -183,6 +183,10 @@ ul
     display list-item
     &.taskListItem
       list-style none
+      &>input
+        margin-left -1.6em
+      &>p
+        margin-left -1.8em
     p
       margin 0
   &>li>ul, &>li>ol

From 30e262d8aca6ef5358d5ed93458802d4960eaf05 Mon Sep 17 00:00:00 2001
From: Baptiste Augrain <daiyam@zokugun.org>
Date: Sun, 23 Dec 2018 17:01:46 +0100
Subject: [PATCH 084/159] fix min width of note list

---
 browser/main/Main.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/browser/main/Main.js b/browser/main/Main.js
index c426f2bd..57f97358 100644
--- a/browser/main/Main.js
+++ b/browser/main/Main.js
@@ -234,8 +234,8 @@ class Main extends React.Component {
     if (this.state.isRightSliderFocused) {
       const offset = this.refs.body.getBoundingClientRect().left
       let newListWidth = e.pageX - offset
-      if (newListWidth < 10) {
-        newListWidth = 10
+      if (newListWidth < 180) {
+        newListWidth = 180
       } else if (newListWidth > 600) {
         newListWidth = 600
       }

From 5ccb9bde28951c2b18824e5cafc5ee8690b26299 Mon Sep 17 00:00:00 2001
From: kazup01 <kazup.inc@gmail.com>
Date: Mon, 24 Dec 2018 14:10:52 +0900
Subject: [PATCH 085/159] Change IssueHunt image

---
 Backers.md                                    | 72 -------------------
 .../main/modals/PreferencesModal/InfoTab.js   |  5 ++
 readme.md                                     |  2 +-
 3 files changed, 6 insertions(+), 73 deletions(-)
 delete mode 100644 Backers.md

diff --git a/Backers.md b/Backers.md
deleted file mode 100644
index 18d221bf..00000000
--- a/Backers.md
+++ /dev/null
@@ -1,72 +0,0 @@
-<h1 align="center">Sponsors &amp; Backers</h1>
-
-Boostnote is an open source project. It's an independent project with its ongoing development made possible entirely thanks to the support by these awesome backers. If you'd like to join them, please consider:
-
-- [Become a backer or sponsor on Open Collective.](https://opencollective.com/boostnoteio)
-
----
-
-## Backers via OpenCollective
-
-### [Gold Sponsors / $1,000 per month](https://opencollective.com/boostnoteio/order/2259)
-- Get your logo on our Readme.md on GitHub and the frontpage of https://boostnote.io/.
-
-### [Silver Sponsors / $250 per month](https://opencollective.com/boostnoteio/order/2257)
-- Get your logo on our Readme.md on GitHub and the frontpage of https://boostnote.io/.
-
-### [Bronze Sponsors / $50 per month](https://opencollective.com/boostnoteio/order/2258)
-- Get your name and Url (or E-mail) on Readme.md on GitHub.
-
-### [Backers3 / $10 per month](https://opencollective.com/boostnoteio/order/2176)
-- [Ralph03](https://opencollective.com/ralph03)
-
-- [Nikolas Dan](https://opencollective.com/nikolas-dan)
-
-### [Backers2 / $5 per month](https://opencollective.com/boostnoteio/order/2175)
-- [Yeojong Kim](https://twitter.com/yeojoy)
-
-- [Scotia Draven](https://opencollective.com/scotia-draven)
-
-- [A. J. Vargas](https://opencollective.com/aj-vargas)
-
-### [Backers1](https://opencollective.com/boostnoteio/order/2563) and One-time sponsors
-- Ryosuke Tamura - $30
-
-- tatoosh11 - $10
-
-- Alexander Borovkov - $10
-
-- spoonhoop - $5
-
-- Drew Williams - $2
-
-- Andy Shaw - $2
-
-- mysafesky -$2
-
----
-
-## Backers via Bountysource
-https://salt.bountysource.com/teams/boostnote
-
-- Kuzz - $65
-
-- Intense Raiden - $45
-
-- ravy22 - $25
-
-- trentpolack	- $20
-
-- hikariru - $10
-
-- kolchan11 - $10
-
-- RonWalker22 - $10
-
-- hocchuc	- $5
-
-- Adam - $5
-
-- Steve	- $5
-
-- evmin	- $5
diff --git a/browser/main/modals/PreferencesModal/InfoTab.js b/browser/main/modals/PreferencesModal/InfoTab.js
index a6acc963..d618fa22 100644
--- a/browser/main/modals/PreferencesModal/InfoTab.js
+++ b/browser/main/modals/PreferencesModal/InfoTab.js
@@ -73,6 +73,11 @@ class InfoTab extends React.Component {
         <div styleName='header--sub'>{i18n.__('Community')}</div>
         <div styleName='top'>
           <ul styleName='list'>
+            <li>
+              <a href='https://issuehunt.io/repos/53266139'
+                onClick={(e) => this.handleLinkClick(e)}
+              >{i18n.__('Bounty on IssueHunt')}</a>
+            </li>
             <li>
               <a href='https://boostnote.io/#subscribe'
                 onClick={(e) => this.handleLinkClick(e)}
diff --git a/readme.md b/readme.md
index ef90dfcc..aba9b92a 100644
--- a/readme.md
+++ b/readme.md
@@ -27,7 +27,7 @@ Boostnote is an open source project. It's an independent project with its ongoin
 
 Issues on Boostnote can be funded by anyone and the money will be distributed to contributors and maintainers. If you use Boostnote please consider becoming a backer:
 
-[![issuehunt-image](https://github.com/BoostIO/issuehunt-materials/blob/master/issuehunt-badge@1x.png?raw=true)](https://issuehunt.io/repos/53266139)
+[![Let's fund issues in this repository](https://issuehunt.io/static/embed/issuehunt-button-v1.svg)](https://issuehunt.io/repos/53266139)
 
 ## Community
 - [Facebook Group](https://www.facebook.com/groups/boostnote/)

From 64abd564b4d939f7b1847345893e561706b2d650 Mon Sep 17 00:00:00 2001
From: Ryan Scott <rscott@gmail.com>
Date: Wed, 3 Oct 2018 21:18:25 -0500
Subject: [PATCH 086/159] Fix Cmd+Left to go to end of line on Mac

---
 browser/components/CodeEditor.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/browser/components/CodeEditor.js b/browser/components/CodeEditor.js
index 7719ed90..32c90463 100644
--- a/browser/components/CodeEditor.js
+++ b/browser/components/CodeEditor.js
@@ -177,6 +177,9 @@ export default class CodeEditor extends React.Component {
           }
         }
       },
+      'Cmd-Left': function (cm) {
+        cm.execCommand('goLineLeft')
+      },
       'Cmd-T': function (cm) {
         // Do nothing
       },

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 087/159] `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 21c61121b0545fabba1c3f6c2df94add8e8652b6 Mon Sep 17 00:00:00 2001
From: Guilherme Silva <guilhermejosesilva@gmail.com>
Date: Mon, 24 Dec 2018 09:46:25 +0000
Subject: [PATCH 088/159] Fixing code style probllems

---
 browser/components/CodeEditor.js              | 5 ++---
 browser/main/modals/PreferencesModal/UiTab.js | 1 -
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/browser/components/CodeEditor.js b/browser/components/CodeEditor.js
index 2d030f06..a3e771a3 100644
--- a/browser/components/CodeEditor.js
+++ b/browser/components/CodeEditor.js
@@ -623,7 +623,7 @@ export default class CodeEditor extends React.Component {
     if (prevProps.spellCheck !== this.props.spellCheck) {
       if (this.props.spellCheck === false) {
         spellcheck.setLanguage(this.editor, spellcheck.SPELLCHECK_DISABLED)
-        let elem = document.getElementById('editor-bottom-panel')
+        const elem = document.getElementById('editor-bottom-panel')
         elem.parentNode.removeChild(elem)
       } else {
         this.editor.addPanel(this.createSpellCheckPanel(), {position: 'bottom'})
@@ -703,10 +703,9 @@ export default class CodeEditor extends React.Component {
     this.editor.replaceSelection(imageMd)
   }
 
-
   handlePaste (editor, forceSmartPaste) {
     const { storageKey, noteKey, fetchUrlTitle, enableSmartPaste } = this.props
-    
+
     const isURL = str => {
       const matcher = /^(?:\w+:)?\/\/([^\s\.]+\.\S{2}|localhost[\:?\d]*)\S*$/
       return matcher.test(str)
diff --git a/browser/main/modals/PreferencesModal/UiTab.js b/browser/main/modals/PreferencesModal/UiTab.js
index 93f1dd13..c7b21e2d 100644
--- a/browser/main/modals/PreferencesModal/UiTab.js
+++ b/browser/main/modals/PreferencesModal/UiTab.js
@@ -100,7 +100,6 @@ class UiTab extends React.Component {
         matchingTriples: this.refs.matchingTriples.value,
         explodingPairs: this.refs.explodingPairs.value,
         spellcheck: this.refs.spellcheck.checked,
-        spellcheck: this.refs.spellcheck.checked,
         enableSmartPaste: this.refs.enableSmartPaste.checked
       },
       preview: {

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 089/159] 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>
 

From 6e8fe7308ca0a7460bb01ab01f31371d9b1a5109 Mon Sep 17 00:00:00 2001
From: vienai8d <31370233+vienai8d@users.noreply.github.com>
Date: Sat, 15 Dec 2018 08:28:07 +0900
Subject: [PATCH 090/159] implement feature 'saveTagsAlphabeticall'

---
 browser/main/Detail/TagSelect.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/browser/main/Detail/TagSelect.js b/browser/main/Detail/TagSelect.js
index 6ced475b..c5221f66 100644
--- a/browser/main/Detail/TagSelect.js
+++ b/browser/main/Detail/TagSelect.js
@@ -45,8 +45,14 @@ class TagSelect extends React.Component {
     value = _.isArray(value)
       ? value.slice()
       : []
-    value.push(newTag)
-    value = _.uniq(value)
+
+    if (!_.includes(value, newTag)) {
+      value.push(newTag)
+    }
+
+    if (this.props.saveTagsAlphabetically) {
+      value = _.sortBy(value)
+    }
 
     this.setState({
       newTag: ''

From 0340402dc1430c53cc36762eb7e0e83042e3bd19 Mon Sep 17 00:00:00 2001
From: mpj <11813607+empeje@users.noreply.github.com>
Date: Thu, 27 Dec 2018 11:12:36 +0700
Subject: [PATCH 091/159] Create FAQ.md

---
 FAQ.md | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 FAQ.md

diff --git a/FAQ.md b/FAQ.md
new file mode 100644
index 00000000..6393d8bb
--- /dev/null
+++ b/FAQ.md
@@ -0,0 +1,31 @@
+# Frequently Asked Questions
+
+
+<details><summary>Allowing dangerous HTML tags</summary>
+
+Sometimes it is useful to allow dangerous HTML tags to add interactivity to your notebook. One of the example is to use details/summary as a way to expand/collaps your todo-list.
+
+* How to enable:
+  * Go to **Preferences** → **Interface** → **Sanitization** → **Allow dangerous html tags**
+* Example note: Multiple todo-list
+  * Create new notes
+  * Paste the below code, and you'll see that you can expand/collaps the todo-list, and you can have multiple todo-list in your note.
+  
+```html
+<details><summary>What I want to do</summary>
+
+- [x] Create an awesome feature X
+- [ ] Do my homework
+
+</details>
+```
+
+</details>
+
+<details><summary>Other questions</summary>
+
+You can ask [here][ISSUES]
+
+</details>
+
+[ISSUES]: https://github.com/BoostIO/Boostnote/issues

From a06bdced8ab9978484ce83d1b1271505b6b8f743 Mon Sep 17 00:00:00 2001
From: mpj <11813607+empeje@users.noreply.github.com>
Date: Thu, 27 Dec 2018 13:19:54 +0700
Subject: [PATCH 092/159] Update FAQ.md

---
 FAQ.md | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/FAQ.md b/FAQ.md
index 6393d8bb..b1c16c8f 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -20,12 +20,8 @@ Sometimes it is useful to allow dangerous HTML tags to add interactivity to your
 </details>
 ```
 
-</details>
-
-<details><summary>Other questions</summary>
+# Other questions
 
 You can ask [here][ISSUES]
 
-</details>
-
 [ISSUES]: https://github.com/BoostIO/Boostnote/issues

From 9ebf949890a4f5acde8f7c9a3ad08d31ebbbf45b Mon Sep 17 00:00:00 2001
From: mpj <11813607+empeje@users.noreply.github.com>
Date: Thu, 27 Dec 2018 13:20:44 +0700
Subject: [PATCH 093/159] Update FAQ.md

---
 FAQ.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/FAQ.md b/FAQ.md
index b1c16c8f..3e1a577c 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -20,6 +20,8 @@ Sometimes it is useful to allow dangerous HTML tags to add interactivity to your
 </details>
 ```
 
+</details>
+
 # Other questions
 
 You can ask [here][ISSUES]

From 70e16d853e62f2dd5e66cbfabf5061cad94469a6 Mon Sep 17 00:00:00 2001
From: Junyoung Choi <fluke8259@gmail.com>
Date: Thu, 27 Dec 2018 15:36:20 +0900
Subject: [PATCH 094/159] Replace heading 1 with heading 2

---
 FAQ.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FAQ.md b/FAQ.md
index 3e1a577c..c7fc4016 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -22,7 +22,7 @@ Sometimes it is useful to allow dangerous HTML tags to add interactivity to your
 
 </details>
 
-# Other questions
+## Other questions
 
 You can ask [here][ISSUES]
 

From 3e645db3245cac5ce015c23a8564898a519360c2 Mon Sep 17 00:00:00 2001
From: HarlanLuo <luoxwen@gmail.com>
Date: Thu, 27 Dec 2018 21:36:20 +0800
Subject: [PATCH 095/159] add feature: colored tags

---
 browser/components/ColorPicker.js             | 63 +++++++++++++
 browser/components/ColorPicker.styl           | 25 ++++++
 browser/components/NoteItem.js                | 14 +--
 browser/components/TagListItem.js             |  8 +-
 browser/main/Detail/MarkdownNoteDetail.js     |  1 +
 browser/main/Detail/SnippetNoteDetail.js      |  1 +
 browser/main/Detail/TagSelect.js              |  6 +-
 browser/main/NoteList/index.js                |  1 +
 browser/main/SideNav/index.js                 | 88 +++++++++++++++++++
 browser/main/lib/ConfigManager.js             |  3 +-
 package.json                                  |  1 +
 tests/components/TagListItem.snapshot.test.js |  2 +-
 .../TagListItem.snapshot.test.js.snap         |  5 ++
 13 files changed, 205 insertions(+), 13 deletions(-)
 create mode 100644 browser/components/ColorPicker.js
 create mode 100644 browser/components/ColorPicker.styl

diff --git a/browser/components/ColorPicker.js b/browser/components/ColorPicker.js
new file mode 100644
index 00000000..f68aa8ec
--- /dev/null
+++ b/browser/components/ColorPicker.js
@@ -0,0 +1,63 @@
+import React from 'react'
+import PropTypes from 'prop-types'
+import { SketchPicker } from 'react-color'
+import CSSModules from 'browser/lib/CSSModules'
+import styles from './ColorPicker.styl'
+
+const componentHeight = 333
+
+class ColorPicker extends React.Component {
+  constructor (props) {
+    super(props)
+
+    this.state = {
+      color: this.props.color || '#888888'
+    }
+
+    this.onColorChange = this.onColorChange.bind(this)
+    this.handleConfirm = this.handleConfirm.bind(this)
+  }
+
+  onColorChange (color) {
+    this.setState({
+      color
+    })
+  }
+
+  handleConfirm () {
+    this.props.onConfirm(this.state.color)
+  }
+
+  render () {
+    const { onReset, onCancel, targetRect } = this.props
+    const { color } = this.state
+
+    const clientHeight = document.body.clientHeight
+    const alignX = targetRect.right + 4
+    let alignY = targetRect.top
+    if (targetRect.top + componentHeight > clientHeight) {
+      alignY = targetRect.bottom - componentHeight
+    }
+
+    return (
+      <div styleName='colorPicker' style={{top: `${alignY}px`, left: `${alignX}px`}}>
+        <SketchPicker color={color} onChange={this.onColorChange} />
+        <div styleName='footer'>
+          <button styleName='btn-reset' onClick={onReset}>Reset</button>
+          <button styleName='btn-cancel' onClick={onCancel}>Cancel</button>
+          <button styleName='btn-confirm' onClick={this.handleConfirm}>Confirm</button>
+        </div>
+      </div>
+    )
+  }
+}
+
+ColorPicker.propTypes = {
+  color: PropTypes.string,
+  targetRect: PropTypes.object,
+  onConfirm: PropTypes.func.isRequired,
+  onCancel: PropTypes.func.isRequired,
+  onReset: PropTypes.func.isRequired
+}
+
+export default CSSModules(ColorPicker, styles)
diff --git a/browser/components/ColorPicker.styl b/browser/components/ColorPicker.styl
new file mode 100644
index 00000000..4c5a269c
--- /dev/null
+++ b/browser/components/ColorPicker.styl
@@ -0,0 +1,25 @@
+.colorPicker
+  position fixed
+  z-index 10000
+  display flex
+  flex-direction column
+.footer
+  display flex
+  justify-content center
+  align-items center
+  padding 5px
+  & > button + button
+    margin-left 10px
+
+.btn-cancel,
+.btn-confirm,
+.btn-reset
+  height 1.6em
+  border 1px solid #888888
+  background-color #fff
+  font-size 16px
+  border-radius 4px
+.btn-confirm
+  background-color $ui-button-default--active-backgroundColor
+
+
diff --git a/browser/components/NoteItem.js b/browser/components/NoteItem.js
index 2fc70a39..cd97527c 100644
--- a/browser/components/NoteItem.js
+++ b/browser/components/NoteItem.js
@@ -15,8 +15,8 @@ import i18n from 'browser/lib/i18n'
  * @param {string} tagName
  * @return {React.Component}
  */
-const TagElement = ({ tagName }) => (
-  <span styleName='item-bottom-tagList-item' key={tagName}>
+const TagElement = ({ tagName, color }) => (
+  <span styleName='item-bottom-tagList-item' key={tagName} style={{backgroundColor: color}}>
     #{tagName}
   </span>
 )
@@ -27,7 +27,7 @@ const TagElement = ({ tagName }) => (
  * @param {boolean} showTagsAlphabetically
  * @return {React.Component}
  */
-const TagElementList = (tags, showTagsAlphabetically) => {
+const TagElementList = (tags, showTagsAlphabetically, tagConfig) => {
   if (!isArray(tags)) {
     return []
   }
@@ -35,7 +35,7 @@ const TagElementList = (tags, showTagsAlphabetically) => {
   if (showTagsAlphabetically) {
     return _.sortBy(tags).map(tag => TagElement({ tagName: tag }))
   } else {
-    return tags.map(tag => TagElement({ tagName: tag }))
+    return tags.map(tag => TagElement({ tagName: tag, color: tagConfig[tag] }))
   }
 }
 
@@ -59,7 +59,8 @@ const NoteItem = ({
   storageName,
   folderName,
   viewType,
-  showTagsAlphabetically
+  showTagsAlphabetically,
+  tagConfig
 }) => (
   <div
     styleName={isActive ? 'item--active' : 'item'}
@@ -97,7 +98,7 @@ const NoteItem = ({
       <div styleName='item-bottom'>
         <div styleName='item-bottom-tagList'>
           {note.tags.length > 0
-            ? TagElementList(note.tags, showTagsAlphabetically)
+            ? TagElementList(note.tags, showTagsAlphabetically, tagConfig)
             : <span
               style={{ fontStyle: 'italic', opacity: 0.5 }}
               styleName='item-bottom-tagList-empty'
@@ -127,6 +128,7 @@ const NoteItem = ({
 NoteItem.propTypes = {
   isActive: PropTypes.bool.isRequired,
   dateDisplay: PropTypes.string.isRequired,
+  tagConfig: PropTypes.object,
   note: PropTypes.shape({
     storage: PropTypes.string.isRequired,
     key: PropTypes.string.isRequired,
diff --git a/browser/components/TagListItem.js b/browser/components/TagListItem.js
index eec8ab14..64a74d63 100644
--- a/browser/components/TagListItem.js
+++ b/browser/components/TagListItem.js
@@ -12,9 +12,10 @@ import CSSModules from 'browser/lib/CSSModules'
 * @param {Function} handleClickNarrowToTag
 * @param {bool} isActive
 * @param {bool} isRelated
+* @param {string} bgColor tab backgroundColor
 */
 
-const TagListItem = ({name, handleClickTagListItem, handleClickNarrowToTag, handleContextMenu, isActive, isRelated, count}) => (
+const TagListItem = ({name, handleClickTagListItem, handleClickNarrowToTag, handleContextMenu, isActive, isRelated, count, color}) => (
   <div styleName='tagList-itemContainer' onContextMenu={e => handleContextMenu(e, name)}>
     {isRelated
       ? <button styleName={isActive ? 'tagList-itemNarrow-active' : 'tagList-itemNarrow'} onClick={() => handleClickNarrowToTag(name)}>
@@ -23,7 +24,7 @@ const TagListItem = ({name, handleClickTagListItem, handleClickNarrowToTag, hand
       : <div styleName={isActive ? 'tagList-itemNarrow-active' : 'tagList-itemNarrow'} />
     }
     <button styleName={isActive ? 'tagList-item-active' : 'tagList-item'} onClick={() => handleClickTagListItem(name)}>
-      <span styleName='tagList-item-name'>
+      <span styleName='tagList-item-name' style={{color}}>
         {`# ${name}`}
         <span styleName='tagList-item-count'>{count !== 0 ? count : ''}</span>
       </span>
@@ -33,7 +34,8 @@ const TagListItem = ({name, handleClickTagListItem, handleClickNarrowToTag, hand
 
 TagListItem.propTypes = {
   name: PropTypes.string.isRequired,
-  handleClickTagListItem: PropTypes.func.isRequired
+  handleClickTagListItem: PropTypes.func.isRequired,
+  color: PropTypes.string
 }
 
 export default CSSModules(TagListItem, styles)
diff --git a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/MarkdownNoteDetail.js
index bc6cd499..024f6424 100755
--- a/browser/main/Detail/MarkdownNoteDetail.js
+++ b/browser/main/Detail/MarkdownNoteDetail.js
@@ -437,6 +437,7 @@ class MarkdownNoteDetail extends React.Component {
           showTagsAlphabetically={config.ui.showTagsAlphabetically}
           data={data}
           onChange={this.handleUpdateTag.bind(this)}
+          tagConfig={config.tag}
         />
         <TodoListPercentage onClearCheckboxClick={(e) => this.handleClearTodo(e)} percentageOfTodo={getTodoPercentageOfCompleted(note.content)} />
       </div>
diff --git a/browser/main/Detail/SnippetNoteDetail.js b/browser/main/Detail/SnippetNoteDetail.js
index d8b5798d..96ea0941 100644
--- a/browser/main/Detail/SnippetNoteDetail.js
+++ b/browser/main/Detail/SnippetNoteDetail.js
@@ -788,6 +788,7 @@ class SnippetNoteDetail extends React.Component {
           showTagsAlphabetically={config.ui.showTagsAlphabetically}
           data={data}
           onChange={(e) => this.handleChange(e)}
+          tagConfig={config.tag}
         />
       </div>
       <div styleName='info-right'>
diff --git a/browser/main/Detail/TagSelect.js b/browser/main/Detail/TagSelect.js
index 6ced475b..d4411af9 100644
--- a/browser/main/Detail/TagSelect.js
+++ b/browser/main/Detail/TagSelect.js
@@ -179,13 +179,14 @@ class TagSelect extends React.Component {
   }
 
   render () {
-    const { value, className, showTagsAlphabetically } = this.props
+    const { value, className, showTagsAlphabetically, tagConfig } = this.props
 
     const tagList = _.isArray(value)
       ? (showTagsAlphabetically ? _.sortBy(value) : value).map((tag) => {
         return (
           <span styleName='tag'
             key={tag}
+            style={{backgroundColor: tagConfig[tag]}}
           >
             <span styleName='tag-label' onClick={(e) => this.handleTagLabelClick(tag)}>#{tag}</span>
             <button styleName='tag-removeButton'
@@ -240,7 +241,8 @@ TagSelect.contextTypes = {
 TagSelect.propTypes = {
   className: PropTypes.string,
   value: PropTypes.arrayOf(PropTypes.string),
-  onChange: PropTypes.func
+  onChange: PropTypes.func,
+  tagConfig: PropTypes.object
 }
 
 export default CSSModules(TagSelect, styles)
diff --git a/browser/main/NoteList/index.js b/browser/main/NoteList/index.js
index dbc9cfd3..8131c0e2 100644
--- a/browser/main/NoteList/index.js
+++ b/browser/main/NoteList/index.js
@@ -1047,6 +1047,7 @@ class NoteList extends React.Component {
               storageName={this.getNoteStorage(note).name}
               viewType={viewType}
               showTagsAlphabetically={config.ui.showTagsAlphabetically}
+              tagConfig={config.tag}
             />
           )
         }
diff --git a/browser/main/SideNav/index.js b/browser/main/SideNav/index.js
index b98d859d..d53568e0 100644
--- a/browser/main/SideNav/index.js
+++ b/browser/main/SideNav/index.js
@@ -20,6 +20,7 @@ import i18n from 'browser/lib/i18n'
 import context from 'browser/lib/context'
 import { remote } from 'electron'
 import { confirmDeleteNote } from 'browser/lib/confirmDeleteNote'
+import ColorPicker from 'browser/components/ColorPicker'
 
 function matchActiveTags (tags, activeTags) {
   return _.every(activeTags, v => tags.indexOf(v) >= 0)
@@ -27,6 +28,22 @@ function matchActiveTags (tags, activeTags) {
 
 class SideNav extends React.Component {
   // TODO: should not use electron stuff v0.7
+  constructor (props) {
+    super(props)
+
+    this.state = {
+      colorPickerState: {
+        show: false,
+        color: null,
+        tagName: null,
+        targetRect: null
+      }
+    }
+
+    this.dismissColorPicker = this.dismissColorPicker.bind(this)
+    this.handleColorPickerConfirm = this.handleColorPickerConfirm.bind(this)
+    this.handleColorPickerReset = this.handleColorPickerReset.bind(this)
+  }
 
   componentDidMount () {
     EventEmitter.on('side:preferences', this.handleMenuButtonClick)
@@ -104,9 +121,63 @@ class SideNav extends React.Component {
       click: this.deleteTag.bind(this, tag)
     })
 
+    menu.push({
+      label: i18n.__('Customize Color'),
+      click: this.displayColorPicker.bind(this, tag, e.target.getBoundingClientRect())
+    })
+
     context.popup(menu)
   }
 
+  dismissColorPicker () {
+    this.setState({
+      colorPickerState: {
+        show: false
+      }
+    })
+  }
+
+  displayColorPicker (tagName, rect) {
+    const { config } = this.props
+    this.setState({
+      colorPickerState: {
+        show: true,
+        color: config.tag && config.tag[tagName],
+        tagName,
+        targetRect: rect
+      }
+    })
+  }
+
+  handleColorPickerConfirm (color) {
+    const { dispatch, config: {tag} } = this.props
+    const { colorPickerState: { tagName } } = this.state
+    const tagConfig = Object.assign({}, tag, {[tagName]: color.hex})
+
+    const config = {tag: tagConfig}
+    ConfigManager.set(config)
+    dispatch({
+      type: 'SET_CONFIG',
+      config
+    })
+    this.dismissColorPicker()
+  }
+
+  handleColorPickerReset () {
+    const { dispatch, config: {tag} } = this.props
+    const { colorPickerState: { tagName } } = this.state
+    const tagConfig = Object.assign({}, tag)
+    delete tagConfig[tagName]
+
+    const config = {tag: tagConfig}
+    ConfigManager.set(config)
+    dispatch({
+      type: 'SET_CONFIG',
+      config
+    })
+    this.dismissColorPicker()
+  }
+
   handleToggleButtonClick (e) {
     const { dispatch, config } = this.props
 
@@ -241,6 +312,7 @@ class SideNav extends React.Component {
             isRelated={tag.related}
             key={tag.name}
             count={tag.size}
+            color={config.tag[tag.name]}
           />
         )
       })
@@ -333,6 +405,7 @@ class SideNav extends React.Component {
 
   render () {
     const { data, location, config, dispatch } = this.props
+    const { colorPickerState } = this.state
 
     const isFolded = config.isSideNavFolded
 
@@ -349,6 +422,20 @@ class SideNav extends React.Component {
         useDragHandle
       />
     })
+
+    let colorPicker
+    if (colorPickerState.show) {
+      colorPicker = (
+        <ColorPicker
+          color={colorPickerState.color}
+          targetRect={colorPickerState.targetRect}
+          onConfirm={this.handleColorPickerConfirm}
+          onCancel={this.dismissColorPicker}
+          onReset={this.handleColorPickerReset}
+        />
+      )
+    }
+
     const style = {}
     if (!isFolded) style.width = this.props.width
     const isTagActive = location.pathname.match(/tag/)
@@ -368,6 +455,7 @@ class SideNav extends React.Component {
           </div>
         </div>
         {this.SideNavComponent(isFolded, storageList)}
+        {colorPicker}
       </div>
     )
   }
diff --git a/browser/main/lib/ConfigManager.js b/browser/main/lib/ConfigManager.js
index 81165777..c70978f7 100644
--- a/browser/main/lib/ConfigManager.js
+++ b/browser/main/lib/ConfigManager.js
@@ -86,7 +86,8 @@ export const DEFAULT_CONFIG = {
     token: '',
     username: '',
     password: ''
-  }
+  },
+  tag: {}
 }
 
 function validate (config) {
diff --git a/package.json b/package.json
index f12360a0..9b0c1d31 100644
--- a/package.json
+++ b/package.json
@@ -97,6 +97,7 @@
     "react": "^15.5.4",
     "react-autosuggest": "^9.4.0",
     "react-codemirror": "^0.3.0",
+    "react-color": "^2.17.0",
     "react-debounce-render": "^4.0.1",
     "react-dom": "^15.0.2",
     "react-image-carousel": "^2.0.18",
diff --git a/tests/components/TagListItem.snapshot.test.js b/tests/components/TagListItem.snapshot.test.js
index 8bea2ccb..637844e6 100644
--- a/tests/components/TagListItem.snapshot.test.js
+++ b/tests/components/TagListItem.snapshot.test.js
@@ -3,7 +3,7 @@ import renderer from 'react-test-renderer'
 import TagListItem from 'browser/components/TagListItem'
 
 it('TagListItem renders correctly', () => {
-  const tagListItem = renderer.create(<TagListItem name='Test' handleClickTagListItem={jest.fn()} />)
+  const tagListItem = renderer.create(<TagListItem name='Test' handleClickTagListItem={jest.fn()} color='#000' />)
 
   expect(tagListItem.toJSON()).toMatchSnapshot()
 })
diff --git a/tests/components/__snapshots__/TagListItem.snapshot.test.js.snap b/tests/components/__snapshots__/TagListItem.snapshot.test.js.snap
index ad883222..d6939ec2 100644
--- a/tests/components/__snapshots__/TagListItem.snapshot.test.js.snap
+++ b/tests/components/__snapshots__/TagListItem.snapshot.test.js.snap
@@ -14,6 +14,11 @@ exports[`TagListItem renders correctly 1`] = `
   >
     <span
       className="tagList-item-name"
+      style={
+        Object {
+          "color": "#000",
+        }
+      }
     >
       # Test
       <span

From 6d4cee004173ab7297d0c060143763241f64940e Mon Sep 17 00:00:00 2001
From: "richardtks8@gmail.com" <richardtks8@gmail.com>
Date: Fri, 28 Dec 2018 02:15:24 +0800
Subject: [PATCH 096/159] allow menu bar to be set in the settings

---
 browser/main/Main.js                              | 11 +++++++++++
 browser/main/lib/ConfigManager.js                 |  6 ++++--
 browser/main/lib/shortcut.js                      |  3 +++
 browser/main/modals/PreferencesModal/HotkeyTab.js | 14 +++++++++++++-
 browser/main/modals/PreferencesModal/UiTab.js     | 11 +++++++++++
 lib/ipcServer.js                                  |  1 +
 lib/main-window.js                                |  3 +--
 7 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/browser/main/Main.js b/browser/main/Main.js
index 556c5daf..26fc8377 100644
--- a/browser/main/Main.js
+++ b/browser/main/Main.js
@@ -172,10 +172,21 @@ class Main extends React.Component {
     delete CodeMirror.keyMap.emacs['Ctrl-V']
 
     eventEmitter.on('editor:fullscreen', this.toggleFullScreen)
+    eventEmitter.on('menubar:togglemenubar', this.toggleMenuBarVisible.bind(this))
   }
 
   componentWillUnmount () {
     eventEmitter.off('editor:fullscreen', this.toggleFullScreen)
+    eventEmitter.off('menubar:togglemenubar', this.toggleMenuBarVisible.bind(this))
+  }
+
+  toggleMenuBarVisible () {
+    const { config } = this.props
+    const { ui } = config
+
+    const newUI = Object.assign(ui, {showMenuBar: !ui.showMenuBar})
+    const newConfig = Object.assign(config, newUI)
+    ConfigManager.set(newConfig)
   }
 
   handleLeftSlideMouseDown (e) {
diff --git a/browser/main/lib/ConfigManager.js b/browser/main/lib/ConfigManager.js
index 81165777..3af49afb 100644
--- a/browser/main/lib/ConfigManager.js
+++ b/browser/main/lib/ConfigManager.js
@@ -26,14 +26,16 @@ export const DEFAULT_CONFIG = {
     toggleMain: OSX ? 'Command + Alt + L' : 'Super + Alt + E',
     toggleMode: OSX ? 'Command + Alt + M' : 'Ctrl + M',
     deleteNote: OSX ? 'Command + Shift + Backspace' : 'Ctrl + Shift + Backspace',
-    pasteSmartly: OSX ? 'Command + Shift + V' : 'Ctrl + Shift + V'
+    pasteSmartly: OSX ? 'Command + Shift + V' : 'Ctrl + Shift + V',
+    toggleMenuBar: 'Alt'
   },
   ui: {
     language: 'en',
     theme: 'default',
     showCopyNotification: true,
     disableDirectWrite: false,
-    defaultNote: 'ALWAYS_ASK' // 'ALWAYS_ASK', 'SNIPPET_NOTE', 'MARKDOWN_NOTE'
+    defaultNote: 'ALWAYS_ASK', // 'ALWAYS_ASK', 'SNIPPET_NOTE', 'MARKDOWN_NOTE'
+    showMenuBar: false
   },
   editor: {
     theme: 'base16-light',
diff --git a/browser/main/lib/shortcut.js b/browser/main/lib/shortcut.js
index 93e33c9b..3165606a 100644
--- a/browser/main/lib/shortcut.js
+++ b/browser/main/lib/shortcut.js
@@ -6,5 +6,8 @@ module.exports = {
   },
   'deleteNote': () => {
     ee.emit('hotkey:deletenote')
+  },
+  'toggleMenuBar': () => {
+    ee.emit('menubar:togglemenubar')
   }
 }
diff --git a/browser/main/modals/PreferencesModal/HotkeyTab.js b/browser/main/modals/PreferencesModal/HotkeyTab.js
index 25098faa..218a68f6 100644
--- a/browser/main/modals/PreferencesModal/HotkeyTab.js
+++ b/browser/main/modals/PreferencesModal/HotkeyTab.js
@@ -80,7 +80,8 @@ class HotkeyTab extends React.Component {
       toggleMain: this.refs.toggleMain.value,
       toggleMode: this.refs.toggleMode.value,
       deleteNote: this.refs.deleteNote.value,
-      pasteSmartly: this.refs.pasteSmartly.value
+      pasteSmartly: this.refs.pasteSmartly.value,
+      toggleMenuBar: this.refs.toggleMenuBar.value
     }
     this.setState({
       config
@@ -128,6 +129,17 @@ class HotkeyTab extends React.Component {
               />
             </div>
           </div>
+          <div styleName='group-section'>
+            <div styleName='group-section-label'>{i18n.__('Show/Hide Menu Bar')}</div>
+            <div styleName='group-section-control'>
+              <input styleName='group-section-control-input'
+                onChange={(e) => this.handleHotkeyChange(e)}
+                ref='toggleMenuBar'
+                value={config.hotkey.toggleMenuBar}
+                type='text'
+              />
+            </div>
+          </div>
           <div styleName='group-section'>
             <div styleName='group-section-label'>{i18n.__('Toggle Editor Mode')}</div>
             <div styleName='group-section-control'>
diff --git a/browser/main/modals/PreferencesModal/UiTab.js b/browser/main/modals/PreferencesModal/UiTab.js
index a371cac8..263977ab 100644
--- a/browser/main/modals/PreferencesModal/UiTab.js
+++ b/browser/main/modals/PreferencesModal/UiTab.js
@@ -75,6 +75,7 @@ class UiTab extends React.Component {
         showTagsAlphabetically: this.refs.showTagsAlphabetically.checked,
         saveTagsAlphabetically: this.refs.saveTagsAlphabetically.checked,
         enableLiveNoteCounts: this.refs.enableLiveNoteCounts.checked,
+        showMenuBar: this.refs.showMenuBar.checked,
         disableDirectWrite: this.refs.uiD2w != null
           ? this.refs.uiD2w.checked
           : false
@@ -238,6 +239,16 @@ class UiTab extends React.Component {
             </div>
           </div>
 
+          <div styleName='group-checkBoxSection'>
+            <label>
+              <input onChange={(e) => this.handleUIChange(e)}
+                checked={this.state.config.ui.showMenuBar}
+                ref='showMenuBar'
+                type='checkbox'
+              />&nbsp;
+              {i18n.__('Show menu bar')}
+            </label>
+          </div>
           <div styleName='group-checkBoxSection'>
             <label>
               <input onChange={(e) => this.handleUIChange(e)}
diff --git a/lib/ipcServer.js b/lib/ipcServer.js
index 487a9a63..42e229d3 100644
--- a/lib/ipcServer.js
+++ b/lib/ipcServer.js
@@ -32,6 +32,7 @@ ipcMain.on('config-renew', (e, payload) => {
   globalShortcut.unregisterAll()
   var { config } = payload
 
+  mainWindow.setMenuBarVisibility(config.ui.showMenuBar)
   var errors = []
   try {
     globalShortcut.register(config.hotkey.toggleMain, toggleMainWindow)
diff --git a/lib/main-window.js b/lib/main-window.js
index 512782de..418fd442 100644
--- a/lib/main-window.js
+++ b/lib/main-window.js
@@ -6,7 +6,6 @@ const Config = require('electron-config')
 const config = new Config()
 const _ = require('lodash')
 
-var showMenu = process.platform !== 'win32'
 const windowSize = config.get('windowsize') || {
   x: null,
   y: null,
@@ -22,7 +21,6 @@ const mainWindow = new BrowserWindow({
   useContentSize: true,
   minWidth: 500,
   minHeight: 320,
-  autoHideMenuBar: showMenu,
   webPreferences: {
     zoomFactor: 1.0,
     enableBlinkFeatures: 'OverlayScrollbars'
@@ -33,6 +31,7 @@ const mainWindow = new BrowserWindow({
 const url = path.resolve(__dirname, './main.html')
 
 mainWindow.loadURL('file://' + url)
+mainWindow.setMenuBarVisibility(false)
 
 mainWindow.webContents.on('new-window', function (e) {
   e.preventDefault()

From 5b79d0439cfea8514f37a3da9681e5e211c1b515 Mon Sep 17 00:00:00 2001
From: Abner Soares Alves Junior <abner.alves@codeminer42.com>
Date: Thu, 27 Dec 2018 22:43:17 -0200
Subject: [PATCH 097/159] Add pt_BR translation to build documentation

---
 docs/build.md       | 10 +++---
 docs/de/build.md    | 10 +++---
 docs/fr/build.md    | 12 +++++---
 docs/pt_BR/build.md | 75 +++++++++++++++++++++++++++++++++++++++++++++
 docs/zh_TW/build.md | 10 +++---
 5 files changed, 101 insertions(+), 16 deletions(-)
 create mode 100644 docs/pt_BR/build.md

diff --git a/docs/build.md b/docs/build.md
index f2b3e5ac..eaf94666 100644
--- a/docs/build.md
+++ b/docs/build.md
@@ -1,10 +1,11 @@
 # Build
-This page is also available in [Japanese](https://github.com/BoostIO/Boostnote/blob/master/docs/jp/build.md), [Korean](https://github.com/BoostIO/Boostnote/blob/master/docs/ko/build.md), [Russain](https://github.com/BoostIO/Boostnote/blob/master/docs/ru/build.md), [Simplified Chinese](https://github.com/BoostIO/Boostnote/blob/master/docs/zh_CN/build.md), [French](https://github.com/BoostIO/Boostnote/blob/master/docs/fr/build.md) and [German](https://github.com/BoostIO/Boostnote/blob/master/docs/de/build.md).
+
+This page is also available in [Japanese](https://github.com/BoostIO/Boostnote/blob/master/docs/jp/build.md), [Korean](https://github.com/BoostIO/Boostnote/blob/master/docs/ko/build.md), [Russain](https://github.com/BoostIO/Boostnote/blob/master/docs/ru/build.md), [Simplified Chinese](https://github.com/BoostIO/Boostnote/blob/master/docs/zh_CN/build.md), [French](https://github.com/BoostIO/Boostnote/blob/master/docs/fr/build.md), [Portuguese](https://github.com/BoostIO/Boostnote/blob/master/docs/pt_BR/build.md) and [German](https://github.com/BoostIO/Boostnote/blob/master/docs/de/build.md).
 
 ## Environments
 
-* npm: 6.x
-* node: 8.x
+- npm: 6.x
+- node: 8.x
 
 ## Development
 
@@ -24,7 +25,9 @@ $ yarn run dev
 ```
 
 > ### Notice
+>
 > There are some cases where you have to refresh the app manually.
+>
 > 1. When editing a constructor method of a component
 > 2. When adding a new css class (similar to 1: the CSS class is re-written by each component. This process occurs at the Constructor method.)
 
@@ -51,7 +54,6 @@ Distribution packages are created by exec `grunt build` on Linux platform (e.g.
 
 After installing the supported version of `node` and `npm`, install build dependency packages.
 
-
 Ubuntu/Debian:
 
 ```
diff --git a/docs/de/build.md b/docs/de/build.md
index a3d8e274..65f2b8c3 100644
--- a/docs/de/build.md
+++ b/docs/de/build.md
@@ -1,10 +1,11 @@
 # Build
-Diese Seite ist auch verfügbar in [Japanisch](https://github.com/BoostIO/Boostnote/blob/master/docs/jp/build.md), [Koreanisch](https://github.com/BoostIO/Boostnote/blob/master/docs/ko/build.md), [Russisch](https://github.com/BoostIO/Boostnote/blob/master/docs/ru/build.md), [Vereinfachtem Chinesisch](https://github.com/BoostIO/Boostnote/blob/master/docs/zh_CN/build.md), [Französisch](https://github.com/BoostIO/Boostnote/blob/master/docs/fr/build.md) und [Deutsch](https://github.com/BoostIO/Boostnote/blob/master/docs/de/build.md).
+
+Diese Seite ist auch verfügbar in [Japanisch](https://github.com/BoostIO/Boostnote/blob/master/docs/jp/build.md), [Koreanisch](https://github.com/BoostIO/Boostnote/blob/master/docs/ko/build.md), [Russisch](https://github.com/BoostIO/Boostnote/blob/master/docs/ru/build.md), [Vereinfachtem Chinesisch](https://github.com/BoostIO/Boostnote/blob/master/docs/zh_CN/build.md), [Französisch](https://github.com/BoostIO/Boostnote/blob/master/docs/fr/build.md), [Portugiesisch](https://github.com/BoostIO/Boostnote/blob/master/docs/pt_BR/build.md) und [Deutsch](https://github.com/BoostIO/Boostnote/blob/master/docs/de/build.md).
 
 ## Umgebungen
 
-* npm: 6.x
-* node: 8.x
+- npm: 6.x
+- node: 8.x
 
 ## Entwicklung
 
@@ -24,7 +25,9 @@ $ yarn run dev
 ```
 
 > ### Notiz
+>
 > Es gibt einige Fälle bei denen die App manuell zu refreshen ist.
+>
 > 1. Wenn eine "constructor method" einer Komponente manuell editiert wird.
 > 2. Wenn eine neue CSS Klasse ergänzt wird (ähnlich wie 1: die CSS Klasse wird von jeder Komponenete neu geschrieben. Dieser Prozess passiert in der "Constructor method".)
 
@@ -51,7 +54,6 @@ Distributions Pakete können mittels `grunt build` auf Linux Plattformen (e.g. U
 
 Nach der Installation der supporteten Version von `node` and `npm`, installiere auch build dependency packages.
 
-
 Ubuntu/Debian:
 
 ```
diff --git a/docs/fr/build.md b/docs/fr/build.md
index e66a11aa..7628a3e1 100644
--- a/docs/fr/build.md
+++ b/docs/fr/build.md
@@ -1,10 +1,11 @@
 # Build
-Cette page est également disponible en [Anglais](https://github.com/BoostIO/Boostnote/blob/master/docs/build.md), [Japonais](https://github.com/BoostIO/Boostnote/blob/master/docs/jp/build.md), [Coréen](https://github.com/BoostIO/Boostnote/blob/master/docs/ko/build.md), [Russe](https://github.com/BoostIO/Boostnote/blob/master/docs/ru/build.md), [Chinois Simplifié](https://github.com/BoostIO/Boostnote/blob/master/docs/zh_CN/build.md) et en [Allemand](https://github.com/BoostIO/Boostnote/blob/master/docs/de/build.md)
+
+Cette page est également disponible en [Anglais](https://github.com/BoostIO/Boostnote/blob/master/docs/build.md), [Japonais](https://github.com/BoostIO/Boostnote/blob/master/docs/jp/build.md), [Coréen](https://github.com/BoostIO/Boostnote/blob/master/docs/ko/build.md), [Russe](https://github.com/BoostIO/Boostnote/blob/master/docs/ru/build.md), [Chinois Simplifié](https://github.com/BoostIO/Boostnote/blob/master/docs/zh_CN/build.md), [Portugais](https://github.com/BoostIO/Boostnote/blob/master/docs/pt_BR/build.md) et en [Allemand](https://github.com/BoostIO/Boostnote/blob/master/docs/de/build.md)
 
 ## Environnements
 
-* npm: 6.x
-* node: 8.x
+- npm: 6.x
+- node: 8.x
 
 ## Développement
 
@@ -16,6 +17,7 @@ Installez les paquets requis à l'aide de `yarn`.
 ```
 $ yarn
 ```
+
 Build et start
 
 ```
@@ -23,7 +25,9 @@ $ yarn run dev
 ```
 
 > ### Notice
+>
 > Il y a certains cas où vous voudrez relancer l'application manuellement.
+>
 > 1. Quand vous éditez la méthode constructeur dans un composant
 > 2. Quand vous ajoutez une nouvelle classe css. (Comme pour 1: la classe est réécrite pour chaque composant. Le process intervient dans la méthode constructeur)
 
@@ -37,6 +41,7 @@ Nous avons donc préparé un script séparé qui va rendre un fichier exécutabl
 ```
 grunt pre-build
 ```
+
 Vous trouverez l'exécutable dans le dossier `dist`.
 Note : l'auto updater ne marchera pas car l'application n'est pas signée.
 
@@ -50,7 +55,6 @@ Les paquets sont créés en exécutant `grunt build` sur une plateforme Linux (e
 
 Après avoir installé la version supportée de `node` et de `npm`, installer les paquets de builds.
 
-
 Ubuntu/Debian:
 
 ```
diff --git a/docs/pt_BR/build.md b/docs/pt_BR/build.md
new file mode 100644
index 00000000..07f0ce67
--- /dev/null
+++ b/docs/pt_BR/build.md
@@ -0,0 +1,75 @@
+# Build
+
+Esta página também está disponível em [Japônes](https://github.com/BoostIO/Boostnote/blob/master/docs/jp/build.md), [Coreano](https://github.com/BoostIO/Boostnote/blob/master/docs/ko/build.md), [Russo](https://github.com/BoostIO/Boostnote/blob/master/docs/ru/build.md), [Chinês simplificado](https://github.com/BoostIO/Boostnote/blob/master/docs/zh_CN/build.md), [Francês](https://github.com/BoostIO/Boostnote/blob/master/docs/fr/build.md) e [Alemão](https://github.com/BoostIO/Boostnote/blob/master/docs/de/build.md).
+
+## Ambiente
+
+- npm: 6.x
+- node: 8.x
+
+## Desenvolvimento
+
+Nós usamos o Webpack HMR para desenvolver o Boostnote.
+Executando os seguintes comandos, no diretório raiz do projeto, irá iniciar o Boostnote com as configurações padrão.
+
+Instala os pacotes necessários usando o yarn.
+
+```
+$ yarn
+```
+
+Gerar e iniciar.
+
+```
+$ yarn run dev
+```
+
+> ### Notice
+>
+> Existe alguns casos onde você precisa atualizar o app manualmente.
+>
+> 1. Quando editar um método construtor de um componente
+> 2. Quando adicionar uma nova classe de css (similiar ao 1: a classe do css é reescrita por cada componente. Esse processo ocorre através do método construtor)
+
+## Deploy
+
+Nós usamos o Grunt para automatizar o desenvolvimento.
+Você pode gerar o programa usando `grunt`. Contudo, nós não recomendamos isso porque a tarefa padrão inclui _codedesign_ e _authenticode_.
+
+Então nós preparamos um _script_ separado, o qual somente cria um executável.
+
+```
+grunt pre-build
+```
+
+Você irá encontrar o executável na pasta `dist`. Nota: o atualizador automático não funciona por que o app não está certificado.
+
+Se você achar isto necessário, você pode usar o _codesign_ ou o _authenticode_ com esse executável.
+
+## Faça seus próprios pacotes de distribuição (deb, rpm)
+
+Pacotes de distribuição são gerados através do comando `grunt build` em plataforma Linux (e.g. Ubuntu, Fedora).
+
+> Nota: você pode criar `.deb` e `.rpm` em um mesmo ambiente.
+
+Depois de instalar uma versão suportada do `node` e do `npm`, deve-se instalar as dependências para gerar os pacotes.
+
+Ubuntu/Debian:
+
+```
+$ sudo apt-get install -y rpm fakeroot
+```
+
+Fedora:
+
+```
+$ sudo dnf install -y dpkg dpkg-dev rpm-build fakeroot
+```
+
+Então execute `grunt build`.
+
+```
+$ grunt build
+```
+
+Você vai encontrar o `.deb` e o `.rpm` na pasta`dist`.
diff --git a/docs/zh_TW/build.md b/docs/zh_TW/build.md
index 65b086ac..151f946d 100644
--- a/docs/zh_TW/build.md
+++ b/docs/zh_TW/build.md
@@ -1,10 +1,11 @@
 # 編譯
-此文件還提供下列的語言 [日文](https://github.com/BoostIO/Boostnote/blob/master/docs/jp/build.md), [韓文](https://github.com/BoostIO/Boostnote/blob/master/docs/ko/build.md), [俄文](https://github.com/BoostIO/Boostnote/blob/master/docs/ru/build.md), [簡體中文](https://github.com/BoostIO/Boostnote/blob/master/docs/zh_CN/build.md), [法文](https://github.com/BoostIO/Boostnote/blob/master/docs/fr/build.md) and [德文](https://github.com/BoostIO/Boostnote/blob/master/docs/de/build.md).
+
+此文件還提供下列的語言 [日文](https://github.com/BoostIO/Boostnote/blob/master/docs/jp/build.md), [韓文](https://github.com/BoostIO/Boostnote/blob/master/docs/ko/build.md), [俄文](https://github.com/BoostIO/Boostnote/blob/master/docs/ru/build.md), [簡體中文](https://github.com/BoostIO/Boostnote/blob/master/docs/zh_CN/build.md), [法文](https://github.com/BoostIO/Boostnote/blob/master/docs/fr/build.md), [葡萄牙](https://github.com/BoostIO/Boostnote/blob/master/docs/pt_BR/build.md) and [德文](https://github.com/BoostIO/Boostnote/blob/master/docs/de/build.md).
 
 ## 環境
 
-* npm: 6.x
-* node: 8.x
+- npm: 6.x
+- node: 8.x
 
 ## 開發
 
@@ -25,7 +26,9 @@ $ yarn run dev
 ```
 
 > ### Notice
+>
 > There are some cases where you have to refresh the app manually.
+>
 > 1. When editing a constructor method of a component
 > 2. When adding a new css class (similar to 1: the CSS class is re-written by each component. This process occurs at the Constructor method.)
 
@@ -52,7 +55,6 @@ Distribution packages are created by exec `grunt build` on Linux platform (e.g.
 
 After installing the supported version of `node` and `npm`, install build dependency packages.
 
-
 Ubuntu/Debian:
 
 ```

From 57817fd90cf5d064ac8e1a48e923f9480e4e5abf Mon Sep 17 00:00:00 2001
From: Abner Soares Alves Junior <abner.alves@codeminer42.com>
Date: Thu, 27 Dec 2018 23:07:18 -0200
Subject: [PATCH 098/159] Add pt_BR translation to debug documentation

---
 docs/de/debug.md    | 12 +++++-------
 docs/debug.md       | 16 ++++++++++------
 docs/pt_BR/debug.md | 40 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 55 insertions(+), 13 deletions(-)
 create mode 100644 docs/pt_BR/debug.md

diff --git a/docs/de/debug.md b/docs/de/debug.md
index 6c3de3dc..a22ad98b 100644
--- a/docs/de/debug.md
+++ b/docs/de/debug.md
@@ -1,9 +1,8 @@
 # How to debug Boostnote (Electron app)
 
-Diese Seite ist auch verfügbar in [Japanisch](https://github.com/BoostIO/Boostnote/blob/master/docs/jp/debug.md), [Koreanisch](https://github.com/BoostIO/Boostnote/blob/master/docs/ko/debug.md), [Russisch](https://github.com/BoostIO/Boostnote/blob/master/docs/ru/debug.md), [Vereinfachtem Chinesisch](https://github.com/BoostIO/Boostnote/blob/master/docs/zh_CN/debug.md), [Französisch](https://github.com/BoostIO/Boostnote/blob/master/docs/fr/debug.md) und [Deutsch](https://github.com/BoostIO/Boostnote/blob/master/docs/de/debug.md).
+Diese Seite ist auch verfügbar in [Japanisch](https://github.com/BoostIO/Boostnote/blob/master/docs/jp/debug.md), [Koreanisch](https://github.com/BoostIO/Boostnote/blob/master/docs/ko/debug.md), [Russisch](https://github.com/BoostIO/Boostnote/blob/master/docs/ru/debug.md), [Vereinfachtem Chinesisch](https://github.com/BoostIO/Boostnote/blob/master/docs/zh_CN/debug.md), [Französisch](https://github.com/BoostIO/Boostnote/blob/master/docs/fr/debug.md), [Portugiesisch](https://github.com/BoostIO/Boostnote/blob/master/docs/pt_BR/debug.md) und [Deutsch](https://github.com/BoostIO/Boostnote/blob/master/docs/de/debug.md).
 
-
-Boostnote ist eine Electron App und basiert auf Chromium. 
+Boostnote ist eine Electron App und basiert auf Chromium.
 
 Zum Entwicklen verwendest du am Besten die `Developer Tools` von Google Chrome verwenden. Diese kannst du ganz einfach im unter dem Menüpunkt `View` mit `Toggle Developer Tools` aktivieren:
 
@@ -13,10 +12,9 @@ Die Anzeige der `Developer Tools` sieht in etwa so aus:
 
 ![Developer_Tools](https://cloud.githubusercontent.com/assets/11307908/24343545/eff9f3a6-127b-11e7-94cf-cb67bfda634a.png)
 
-
 ## Debugging
 
-Fehlermeldungen werden in der Regel in der `console` ausgegeben, die du über den gleichnamigen Reiter der `Developer Tools`  anzeigen lassen kannst. Zum Debuggen kannst du beispielsweise über den `debugger` Haltepunkte im Code setzen.
+Fehlermeldungen werden in der Regel in der `console` ausgegeben, die du über den gleichnamigen Reiter der `Developer Tools` anzeigen lassen kannst. Zum Debuggen kannst du beispielsweise über den `debugger` Haltepunkte im Code setzen.
 
 ![debugger](https://cloud.githubusercontent.com/assets/11307908/24343879/9459efea-127d-11e7-9943-f60bf7f66d4a.png)
 
@@ -24,8 +22,8 @@ Du kannst aber natürlich auch die Art von Debugging verwenden mit der du am bes
 
 ## Referenz
 
-* [Official document of Google Chrome about debugging](https://developer.chrome.com/devtools)
+- [Official document of Google Chrome about debugging](https://developer.chrome.com/devtools)
 
 ---
 
-Special thanks: Translated by [gino909](https://github.com/gino909), [mdeuerlein](https://github.com/mdeuerlein) 
+Special thanks: Translated by [gino909](https://github.com/gino909), [mdeuerlein](https://github.com/mdeuerlein)
diff --git a/docs/debug.md b/docs/debug.md
index a84a6bba..4cd8b361 100644
--- a/docs/debug.md
+++ b/docs/debug.md
@@ -1,8 +1,9 @@
 # How to debug Boostnote (Electron app)
 
-This page is also available in [Japanese](https://github.com/BoostIO/Boostnote/blob/master/docs/jp/debug.md), [Korean](https://github.com/BoostIO/Boostnote/blob/master/docs/ko/debug.md), [Russain](https://github.com/BoostIO/Boostnote/blob/master/docs/ru/debug.md), [Simplified Chinese](https://github.com/BoostIO/Boostnote/blob/master/docs/zh_CN/debug.md), [French](https://github.com/BoostIO/Boostnote/blob/master/docs/fr/debug.md) and [German](https://github.com/BoostIO/Boostnote/blob/master/docs/de/debug.md).
+This page is also available in [Japanese](https://github.com/BoostIO/Boostnote/blob/master/docs/jp/debug.md), [Korean](https://github.com/BoostIO/Boostnote/blob/master/docs/ko/debug.md), [Russain](https://github.com/BoostIO/Boostnote/blob/master/docs/ru/debug.md), [Simplified Chinese](https://github.com/BoostIO/Boostnote/blob/master/docs/zh_CN/debug.md), [French](https://github.com/BoostIO/Boostnote/blob/master/docs/fr/debug.md), [Portuguese](https://github.com/BoostIO/Boostnote/blob/master/docs/pt_BR/debug.md) and [German](https://github.com/BoostIO/Boostnote/blob/master/docs/de/debug.md).
 
 ## Debug with Google Chrome developer Tools
+
 Boostnote is an Electron app so it's based on Chromium; developers can use `Developer Tools` just like Google Chrome.
 
 You can toggle the `Developer Tools` like this:
@@ -14,6 +15,7 @@ The `Developer Tools` will look like this:
 When errors occur, the error messages are displayed at the `console`.
 
 ### Debugging
+
 For example, you can use the `debugger` to set a breakpoint in the code like this:
 
 ![debugger](https://cloud.githubusercontent.com/assets/11307908/24343879/9459efea-127d-11e7-9943-f60bf7f66d4a.png)
@@ -21,16 +23,18 @@ For example, you can use the `debugger` to set a breakpoint in the code like thi
 This is just an illustrative example, you should find a way to debug which fits your style.
 
 ### References
-* [Official document of Google Chrome about debugging](https://developer.chrome.com/devtools)
+
+- [Official document of Google Chrome about debugging](https://developer.chrome.com/devtools)
 
 ## Debug with Visual Studio Code
 
-1. Install **[Debugger for Chrome](https://marketplace.visualstudio.com/items?itemName=msjsdiag.debugger-for-chrome "Install Debugger for Chrome")** plugin for Visual Studio Code. Then restart it.
+1. Install **[Debugger for Chrome](https://marketplace.visualstudio.com/items?itemName=msjsdiag.debugger-for-chrome 'Install Debugger for Chrome')** plugin for Visual Studio Code. Then restart it.
 2. Pressing **Shift+Command+B** or running **Run Build Task** from the global **Terminal** menu, then pick the task named **Build Boostnote**. Or run `yarn run watch` from the terminal.
 3. When above task is running, open **Debug view** in **Activity Bar** on the side of VS Code or use shortcut **Shift+Command+D**.
 4. Select the configuration named **Boostnote All** from the **Debug configuration**, then click the green arrow button or press **F5** to start debugging.
 5. Now you should find **Boostnote** is running. You will see two processes running, one named **Boostnote Main** and the other named **Boostnote Renderer**. Now you can set **debug breakpoints** in vscode. If you find your **breakpoints** is unverified, you need to switch to the appropriate process between **Boostnote Renderer** and **Boostnote Main**.
 
-	### References
-	* [Electron application debugging](https://electronjs.org/docs/tutorial/application-debugging)
-	* [Debugger for Chrome](https://marketplace.visualstudio.com/items?itemName=msjsdiag.debugger-for-chrome)
\ No newline at end of file
+   ### References
+
+   - [Electron application debugging](https://electronjs.org/docs/tutorial/application-debugging)
+   - [Debugger for Chrome](https://marketplace.visualstudio.com/items?itemName=msjsdiag.debugger-for-chrome)
diff --git a/docs/pt_BR/debug.md b/docs/pt_BR/debug.md
new file mode 100644
index 00000000..3de15741
--- /dev/null
+++ b/docs/pt_BR/debug.md
@@ -0,0 +1,40 @@
+# Como debugar Boostnote (app Electron)
+
+Esta página também está disponível em [Japônes](https://github.com/BoostIO/Boostnote/blob/master/docs/jp/debug.md), [Coreano](https://github.com/BoostIO/Boostnote/blob/master/docs/ko/debug.md), [Russo](https://github.com/BoostIO/Boostnote/blob/master/docs/ru/debug.md), [Chinês simplificado](https://github.com/BoostIO/Boostnote/blob/master/docs/zh_CN/debug.md), [Francês](https://github.com/BoostIO/Boostnote/blob/master/docs/fr/debug.md) e [Alemão](https://github.com/BoostIO/Boostnote/blob/master/docs/de/debug.md).
+
+## Debugar com o Google Chrome developer Tools
+
+Boostnote é um app Electron, por isso ele é baseado no Chromium; desenvolvedores podem usar o `Developer Tools` igual no Google Chrome.
+
+Você pode habilitar e desabilitar o `Developer Tools` assim:
+![how_to_toggle_devTools](https://cloud.githubusercontent.com/assets/11307908/24343585/162187e2-127c-11e7-9c01-23578db03ecf.png)
+
+O `Developer Tools` deve parecer assim:
+![Developer_Tools](https://cloud.githubusercontent.com/assets/11307908/24343545/eff9f3a6-127b-11e7-94cf-cb67bfda634a.png)
+
+Quando erros acontecem, eles são apresentados na aba `console`.
+
+### Debugando
+
+Por exemplo, você pode usar o `debugger` para adicionar um _breakpoint_ (ponto de parada) no código dessa forma:
+
+![debugger](https://cloud.githubusercontent.com/assets/11307908/24343879/9459efea-127d-11e7-9943-f60bf7f66d4a.png)
+
+Isso é só um exemplo ilustrativo, mas você deve encontrar um jeito de debugar que encaixe no seu estilo.
+
+### Referências
+
+- [Documentação do Google Chrome sobre como debugar](https://developer.chrome.com/devtools)
+
+## Debugar com o Visual Studio Code (VS Code)
+
+1. Instale o plugin **[Debugger for Chrome](https://marketplace.visualstudio.com/items?itemName=msjsdiag.debugger-for-chrome 'Instale o pacote Debugger for Chrome')** para Visual Studio Code. Então reinicie-o.
+2. Pressione **Shift+Command+B** ou execute **Run Build Task** do menu global **Terminal**, então seleciona a task **Build Boostnote**. Ou execute `yarn run watch` no terminal.
+3. Quando a task acima estiver rodando, abra o **Debug view** na **Activity Bar** no lado do seu VS Code ou use o atalho **Shift+Command+D**.
+4. Selecione a configuração **Boostnote All** no **Debug configuration**, então clique na seta verde ou aperte **F5** para começar a debugar.
+5. Agora você deve encontrar seu **Boostnote** rodando. Você vai ver dois processos rodando, um com nome de **Boostnote Main** e outro com nome de **Boostnote Renderer**. Agora você pode adicionar os **debug breakpoints** no vscode. Se os seus **breakpoints** não forem alertados você pode precisar altenrar entre os processos **Boostnote Renderer** e **Boostnote Main**.
+
+### Referências
+
+- [Debugando uma aplicação Electron](https://electronjs.org/docs/tutorial/application-debugging)
+- [Debugger for Chrome](https://marketplace.visualstudio.com/items?itemName=msjsdiag.debugger-for-chrome)

From 4e97ac3b8c2922eb33266fce38ca9ddd5a4daa13 Mon Sep 17 00:00:00 2001
From: Christian Oliff <christianoliff@yahoo.com>
Date: Fri, 28 Dec 2018 10:11:44 +0900
Subject: [PATCH 099/159] Update mousetrap

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f12360a0..2784935d 100644
--- a/package.json
+++ b/package.json
@@ -90,7 +90,7 @@
     "mdurl": "^1.0.1",
     "mermaid": "^8.0.0-rc.8",
     "moment": "^2.10.3",
-    "mousetrap": "^1.6.1",
+    "mousetrap": "^1.6.2",
     "mousetrap-global-bind": "^1.1.0",
     "node-ipc": "^8.1.0",
     "raphael": "^2.2.7",

From 6367be213f1d7760637d57ba1b44bb1a59c23e9e Mon Sep 17 00:00:00 2001
From: HarlanLuo <luoxwen@gmail.com>
Date: Fri, 28 Dec 2018 11:13:05 +0800
Subject: [PATCH 100/159] rename config.tag to config.coloredTags

---
 browser/components/ColorPicker.styl       |  6 ++--
 browser/components/NoteItem.js            | 13 +++++----
 browser/main/Detail/MarkdownNoteDetail.js |  2 +-
 browser/main/Detail/SnippetNoteDetail.js  |  2 +-
 browser/main/Detail/TagSelect.js          |  6 ++--
 browser/main/NoteList/index.js            |  2 +-
 browser/main/SideNav/index.js             | 34 ++++++++++++-----------
 browser/main/lib/ConfigManager.js         |  2 +-
 package.json                              |  3 +-
 9 files changed, 37 insertions(+), 33 deletions(-)

diff --git a/browser/components/ColorPicker.styl b/browser/components/ColorPicker.styl
index 4c5a269c..927a0da2 100644
--- a/browser/components/ColorPicker.styl
+++ b/browser/components/ColorPicker.styl
@@ -17,9 +17,9 @@
   height 1.6em
   border 1px solid #888888
   background-color #fff
-  font-size 16px
-  border-radius 4px
+  font-size 15px
+  border-radius 2px
 .btn-confirm
-  background-color $ui-button-default--active-backgroundColor
+  background-color #1EC38B
 
 
diff --git a/browser/components/NoteItem.js b/browser/components/NoteItem.js
index cd97527c..70708223 100644
--- a/browser/components/NoteItem.js
+++ b/browser/components/NoteItem.js
@@ -13,6 +13,7 @@ import i18n from 'browser/lib/i18n'
 /**
  * @description Tag element component.
  * @param {string} tagName
+ * @param {string} color
  * @return {React.Component}
  */
 const TagElement = ({ tagName, color }) => (
@@ -25,9 +26,10 @@ const TagElement = ({ tagName, color }) => (
  * @description Tag element list component.
  * @param {Array|null} tags
  * @param {boolean} showTagsAlphabetically
+ * @param {Object} coloredTags
  * @return {React.Component}
  */
-const TagElementList = (tags, showTagsAlphabetically, tagConfig) => {
+const TagElementList = (tags, showTagsAlphabetically, coloredTags) => {
   if (!isArray(tags)) {
     return []
   }
@@ -35,7 +37,7 @@ const TagElementList = (tags, showTagsAlphabetically, tagConfig) => {
   if (showTagsAlphabetically) {
     return _.sortBy(tags).map(tag => TagElement({ tagName: tag }))
   } else {
-    return tags.map(tag => TagElement({ tagName: tag, color: tagConfig[tag] }))
+    return tags.map(tag => TagElement({ tagName: tag, color: coloredTags[tag] }))
   }
 }
 
@@ -46,6 +48,7 @@ const TagElementList = (tags, showTagsAlphabetically, tagConfig) => {
  * @param {Function} handleNoteClick
  * @param {Function} handleNoteContextMenu
  * @param {Function} handleDragStart
+ * @param {Object} coloredTags
  * @param {string} dateDisplay
  */
 const NoteItem = ({
@@ -60,7 +63,7 @@ const NoteItem = ({
   folderName,
   viewType,
   showTagsAlphabetically,
-  tagConfig
+  coloredTags
 }) => (
   <div
     styleName={isActive ? 'item--active' : 'item'}
@@ -98,7 +101,7 @@ const NoteItem = ({
       <div styleName='item-bottom'>
         <div styleName='item-bottom-tagList'>
           {note.tags.length > 0
-            ? TagElementList(note.tags, showTagsAlphabetically, tagConfig)
+            ? TagElementList(note.tags, showTagsAlphabetically, coloredTags)
             : <span
               style={{ fontStyle: 'italic', opacity: 0.5 }}
               styleName='item-bottom-tagList-empty'
@@ -128,7 +131,7 @@ const NoteItem = ({
 NoteItem.propTypes = {
   isActive: PropTypes.bool.isRequired,
   dateDisplay: PropTypes.string.isRequired,
-  tagConfig: PropTypes.object,
+  coloredTags: PropTypes.object,
   note: PropTypes.shape({
     storage: PropTypes.string.isRequired,
     key: PropTypes.string.isRequired,
diff --git a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/MarkdownNoteDetail.js
index 024f6424..ad7eb590 100755
--- a/browser/main/Detail/MarkdownNoteDetail.js
+++ b/browser/main/Detail/MarkdownNoteDetail.js
@@ -437,7 +437,7 @@ class MarkdownNoteDetail extends React.Component {
           showTagsAlphabetically={config.ui.showTagsAlphabetically}
           data={data}
           onChange={this.handleUpdateTag.bind(this)}
-          tagConfig={config.tag}
+          coloredTags={config.coloredTags}
         />
         <TodoListPercentage onClearCheckboxClick={(e) => this.handleClearTodo(e)} percentageOfTodo={getTodoPercentageOfCompleted(note.content)} />
       </div>
diff --git a/browser/main/Detail/SnippetNoteDetail.js b/browser/main/Detail/SnippetNoteDetail.js
index 96ea0941..237efb3c 100644
--- a/browser/main/Detail/SnippetNoteDetail.js
+++ b/browser/main/Detail/SnippetNoteDetail.js
@@ -788,7 +788,7 @@ class SnippetNoteDetail extends React.Component {
           showTagsAlphabetically={config.ui.showTagsAlphabetically}
           data={data}
           onChange={(e) => this.handleChange(e)}
-          tagConfig={config.tag}
+          coloredTags={config.coloredTags}
         />
       </div>
       <div styleName='info-right'>
diff --git a/browser/main/Detail/TagSelect.js b/browser/main/Detail/TagSelect.js
index d4411af9..caf0cf39 100644
--- a/browser/main/Detail/TagSelect.js
+++ b/browser/main/Detail/TagSelect.js
@@ -179,14 +179,14 @@ class TagSelect extends React.Component {
   }
 
   render () {
-    const { value, className, showTagsAlphabetically, tagConfig } = this.props
+    const { value, className, showTagsAlphabetically, coloredTags } = this.props
 
     const tagList = _.isArray(value)
       ? (showTagsAlphabetically ? _.sortBy(value) : value).map((tag) => {
         return (
           <span styleName='tag'
             key={tag}
-            style={{backgroundColor: tagConfig[tag]}}
+            style={{backgroundColor: coloredTags[tag]}}
           >
             <span styleName='tag-label' onClick={(e) => this.handleTagLabelClick(tag)}>#{tag}</span>
             <button styleName='tag-removeButton'
@@ -242,7 +242,7 @@ TagSelect.propTypes = {
   className: PropTypes.string,
   value: PropTypes.arrayOf(PropTypes.string),
   onChange: PropTypes.func,
-  tagConfig: PropTypes.object
+  coloredTags: PropTypes.object
 }
 
 export default CSSModules(TagSelect, styles)
diff --git a/browser/main/NoteList/index.js b/browser/main/NoteList/index.js
index 8131c0e2..ca513c04 100644
--- a/browser/main/NoteList/index.js
+++ b/browser/main/NoteList/index.js
@@ -1047,7 +1047,7 @@ class NoteList extends React.Component {
               storageName={this.getNoteStorage(note).name}
               viewType={viewType}
               showTagsAlphabetically={config.ui.showTagsAlphabetically}
-              tagConfig={config.tag}
+              coloredTags={config.coloredTags}
             />
           )
         }
diff --git a/browser/main/SideNav/index.js b/browser/main/SideNav/index.js
index d53568e0..640bedbf 100644
--- a/browser/main/SideNav/index.js
+++ b/browser/main/SideNav/index.js
@@ -32,7 +32,7 @@ class SideNav extends React.Component {
     super(props)
 
     this.state = {
-      colorPickerState: {
+      colorPicker: {
         show: false,
         color: null,
         tagName: null,
@@ -131,7 +131,7 @@ class SideNav extends React.Component {
 
   dismissColorPicker () {
     this.setState({
-      colorPickerState: {
+      colorPicker: {
         show: false
       }
     })
@@ -140,9 +140,9 @@ class SideNav extends React.Component {
   displayColorPicker (tagName, rect) {
     const { config } = this.props
     this.setState({
-      colorPickerState: {
+      colorPicker: {
         show: true,
-        color: config.tag && config.tag[tagName],
+        color: config.coloredTags[tagName],
         tagName,
         targetRect: rect
       }
@@ -150,11 +150,11 @@ class SideNav extends React.Component {
   }
 
   handleColorPickerConfirm (color) {
-    const { dispatch, config: {tag} } = this.props
-    const { colorPickerState: { tagName } } = this.state
-    const tagConfig = Object.assign({}, tag, {[tagName]: color.hex})
+    const { dispatch, config: {coloredTags} } = this.props
+    const { colorPicker: { tagName } } = this.state
+    const newColoredTags = Object.assign({}, coloredTags, {[tagName]: color.hex})
 
-    const config = {tag: tagConfig}
+    const config = { coloredTags: newColoredTags }
     ConfigManager.set(config)
     dispatch({
       type: 'SET_CONFIG',
@@ -164,12 +164,13 @@ class SideNav extends React.Component {
   }
 
   handleColorPickerReset () {
-    const { dispatch, config: {tag} } = this.props
-    const { colorPickerState: { tagName } } = this.state
-    const tagConfig = Object.assign({}, tag)
-    delete tagConfig[tagName]
+    const { dispatch, config: {coloredTags} } = this.props
+    const { colorPicker: { tagName } } = this.state
+    const newColoredTags = Object.assign({}, coloredTags)
 
-    const config = {tag: tagConfig}
+    delete newColoredTags[tagName]
+
+    const config = { coloredTags: newColoredTags }
     ConfigManager.set(config)
     dispatch({
       type: 'SET_CONFIG',
@@ -278,6 +279,7 @@ class SideNav extends React.Component {
 
   tagListComponent () {
     const { data, location, config } = this.props
+    const { colorPicker } = this.state
     const activeTags = this.getActiveTags(location.pathname)
     const relatedTags = this.getRelatedTags(activeTags, data.noteMap)
     let tagList = _.sortBy(data.tagNoteMap.map(
@@ -308,11 +310,11 @@ class SideNav extends React.Component {
             handleClickTagListItem={this.handleClickTagListItem.bind(this)}
             handleClickNarrowToTag={this.handleClickNarrowToTag.bind(this)}
             handleContextMenu={this.handleTagContextMenu.bind(this)}
-            isActive={this.getTagActive(location.pathname, tag.name)}
+            isActive={this.getTagActive(location.pathname, tag.name) || (colorPicker.tagName === tag.name)}
             isRelated={tag.related}
             key={tag.name}
             count={tag.size}
-            color={config.tag[tag.name]}
+            color={config.coloredTags[tag.name]}
           />
         )
       })
@@ -405,7 +407,7 @@ class SideNav extends React.Component {
 
   render () {
     const { data, location, config, dispatch } = this.props
-    const { colorPickerState } = this.state
+    const { colorPicker: colorPickerState } = this.state
 
     const isFolded = config.isSideNavFolded
 
diff --git a/browser/main/lib/ConfigManager.js b/browser/main/lib/ConfigManager.js
index c70978f7..b8cfa1ef 100644
--- a/browser/main/lib/ConfigManager.js
+++ b/browser/main/lib/ConfigManager.js
@@ -87,7 +87,7 @@ export const DEFAULT_CONFIG = {
     username: '',
     password: ''
   },
-  tag: {}
+  coloredTags: {}
 }
 
 function validate (config) {
diff --git a/package.json b/package.json
index 9b0c1d31..af266309 100644
--- a/package.json
+++ b/package.json
@@ -97,7 +97,7 @@
     "react": "^15.5.4",
     "react-autosuggest": "^9.4.0",
     "react-codemirror": "^0.3.0",
-    "react-color": "^2.17.0",
+    "react-color": "^2.2.2",
     "react-debounce-render": "^4.0.1",
     "react-dom": "^15.0.2",
     "react-image-carousel": "^2.0.18",
@@ -154,7 +154,6 @@
     "merge-stream": "^1.0.0",
     "mock-require": "^3.0.1",
     "nib": "^1.1.0",
-    "react-color": "^2.2.2",
     "react-css-modules": "^3.7.6",
     "react-input-autosize": "^1.1.0",
     "react-router": "^2.4.0",

From 699006a3e93ebf8e1651fbac75fc9e29ea6d9bf4 Mon Sep 17 00:00:00 2001
From: HarlanLuo <luoxwen@gmail.com>
Date: Fri, 28 Dec 2018 12:05:59 +0800
Subject: [PATCH 101/159] Improve ui of colored tags

---
 browser/components/ColorPicker.js             |  9 +++++--
 browser/components/ColorPicker.styl           | 24 ++++++++++++++-----
 browser/components/TagListItem.js             |  7 +++---
 browser/components/TagListItem.styl           |  5 ++++
 .../modals/PreferencesModal/FolderItem.styl   |  2 +-
 .../TagListItem.snapshot.test.js.snap         |  7 ++++--
 6 files changed, 40 insertions(+), 14 deletions(-)

diff --git a/browser/components/ColorPicker.js b/browser/components/ColorPicker.js
index f68aa8ec..9e0199c2 100644
--- a/browser/components/ColorPicker.js
+++ b/browser/components/ColorPicker.js
@@ -4,20 +4,24 @@ import { SketchPicker } from 'react-color'
 import CSSModules from 'browser/lib/CSSModules'
 import styles from './ColorPicker.styl'
 
-const componentHeight = 333
+const componentHeight = 330
 
 class ColorPicker extends React.Component {
   constructor (props) {
     super(props)
 
     this.state = {
-      color: this.props.color || '#888888'
+      color: this.props.color || '#939395'
     }
 
     this.onColorChange = this.onColorChange.bind(this)
     this.handleConfirm = this.handleConfirm.bind(this)
   }
 
+  componentWillReceiveProps (nextProps) {
+    this.onColorChange(nextProps.color)
+  }
+
   onColorChange (color) {
     this.setState({
       color
@@ -41,6 +45,7 @@ class ColorPicker extends React.Component {
 
     return (
       <div styleName='colorPicker' style={{top: `${alignY}px`, left: `${alignX}px`}}>
+        <div styleName='cover' onClick={onCancel} />
         <SketchPicker color={color} onChange={this.onColorChange} />
         <div styleName='footer'>
           <button styleName='btn-reset' onClick={onReset}>Reset</button>
diff --git a/browser/components/ColorPicker.styl b/browser/components/ColorPicker.styl
index 927a0da2..6e4aceb8 100644
--- a/browser/components/ColorPicker.styl
+++ b/browser/components/ColorPicker.styl
@@ -1,25 +1,37 @@
 .colorPicker
   position fixed
-  z-index 10000
+  z-index 2
   display flex
   flex-direction column
+
+.cover
+  position fixed
+  top 0
+  right 0
+  bottom 0
+  left 0
+
 .footer
   display flex
   justify-content center
+  z-index 2
   align-items center
-  padding 5px
   & > button + button
     margin-left 10px
 
 .btn-cancel,
 .btn-confirm,
 .btn-reset
-  height 1.6em
-  border 1px solid #888888
-  background-color #fff
-  font-size 15px
+  vertical-align middle
+  height 25px
+  margin-top 2.5px
+  colorDefaultButton()
   border-radius 2px
+  border $ui-border
+  padding 0 5px
 .btn-confirm
   background-color #1EC38B
+  &:hover
+    background-color darken(#1EC38B, 25%)
 
 
diff --git a/browser/components/TagListItem.js b/browser/components/TagListItem.js
index 64a74d63..9aa00a1d 100644
--- a/browser/components/TagListItem.js
+++ b/browser/components/TagListItem.js
@@ -10,8 +10,8 @@ import CSSModules from 'browser/lib/CSSModules'
 * @param {string} name
 * @param {Function} handleClickTagListItem
 * @param {Function} handleClickNarrowToTag
-* @param {bool} isActive
-* @param {bool} isRelated
+* @param {boolean} isActive
+* @param {boolean} isRelated
 * @param {string} bgColor tab backgroundColor
 */
 
@@ -24,7 +24,8 @@ const TagListItem = ({name, handleClickTagListItem, handleClickNarrowToTag, hand
       : <div styleName={isActive ? 'tagList-itemNarrow-active' : 'tagList-itemNarrow'} />
     }
     <button styleName={isActive ? 'tagList-item-active' : 'tagList-item'} onClick={() => handleClickTagListItem(name)}>
-      <span styleName='tagList-item-name' style={{color}}>
+      <span styleName='tagList-item-color' style={{backgroundColor: color || 'transparent'}} />
+      <span styleName='tagList-item-name'>
         {`# ${name}`}
         <span styleName='tagList-item-count'>{count !== 0 ? count : ''}</span>
       </span>
diff --git a/browser/components/TagListItem.styl b/browser/components/TagListItem.styl
index 555520b0..9f407a17 100644
--- a/browser/components/TagListItem.styl
+++ b/browser/components/TagListItem.styl
@@ -71,6 +71,11 @@
   padding-right 15px
   font-size 13px
 
+.tagList-item-color
+  height 26px
+  width 3px
+  display inline-block
+
 body[data-theme="white"]
   .tagList-item
     color $ui-inactive-text-color
diff --git a/browser/main/modals/PreferencesModal/FolderItem.styl b/browser/main/modals/PreferencesModal/FolderItem.styl
index 2ded3ada..618e9bc4 100644
--- a/browser/main/modals/PreferencesModal/FolderItem.styl
+++ b/browser/main/modals/PreferencesModal/FolderItem.styl
@@ -62,7 +62,7 @@
 .folderItem-right-button
   vertical-align middle
   height 25px
-  margin-top 2.5px
+  margin-top 2px
   colorDefaultButton()
   border-radius 2px
   border $ui-border
diff --git a/tests/components/__snapshots__/TagListItem.snapshot.test.js.snap b/tests/components/__snapshots__/TagListItem.snapshot.test.js.snap
index d6939ec2..e3798130 100644
--- a/tests/components/__snapshots__/TagListItem.snapshot.test.js.snap
+++ b/tests/components/__snapshots__/TagListItem.snapshot.test.js.snap
@@ -13,12 +13,15 @@ exports[`TagListItem renders correctly 1`] = `
     onClick={[Function]}
   >
     <span
-      className="tagList-item-name"
+      className="tagList-item-color"
       style={
         Object {
-          "color": "#000",
+          "backgroundColor": "#000",
         }
       }
+    />
+    <span
+      className="tagList-item-name"
     >
       # Test
       <span

From 74825dddbf3d98762749de9ddb7a321495f20a0e Mon Sep 17 00:00:00 2001
From: Abner Soares Alves Junior <abner.alves@codeminer42.com>
Date: Fri, 28 Dec 2018 09:59:22 -0200
Subject: [PATCH 102/159] Minor tweaks on portuguese translation

---
 docs/pt_BR/build.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/pt_BR/build.md b/docs/pt_BR/build.md
index 07f0ce67..ad539996 100644
--- a/docs/pt_BR/build.md
+++ b/docs/pt_BR/build.md
@@ -10,7 +10,7 @@ Esta página também está disponível em [Japônes](https://github.com/BoostIO/
 ## Desenvolvimento
 
 Nós usamos o Webpack HMR para desenvolver o Boostnote.
-Executando os seguintes comandos, no diretório raiz do projeto, irá iniciar o Boostnote com as configurações padrão.
+Ao executar os seguintes comandos no diretório raiz do projeto, o Boostnote será iniciado com as configurações padrão.
 
 Instala os pacotes necessários usando o yarn.
 
@@ -42,7 +42,7 @@ Então nós preparamos um _script_ separado, o qual somente cria um executável.
 grunt pre-build
 ```
 
-Você irá encontrar o executável na pasta `dist`. Nota: o atualizador automático não funciona por que o app não está certificado.
+Você irá encontrar o executável na pasta `dist`. Nota: o atualizador automático não funciona porque o app não está certificado.
 
 Se você achar isto necessário, você pode usar o _codesign_ ou o _authenticode_ com esse executável.
 

From 0cf6487cad923092a61a9e8440f4706fc31e0513 Mon Sep 17 00:00:00 2001
From: HarlanLuo <luoxwen@gmail.com>
Date: Fri, 28 Dec 2018 22:12:51 +0800
Subject: [PATCH 103/159] invert text color in colored tags

---
 browser/components/NoteItem.js   | 18 +++++++++++++-----
 browser/main/Detail/TagSelect.js | 12 ++++++++++--
 package.json                     |  1 +
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/browser/components/NoteItem.js b/browser/components/NoteItem.js
index 70708223..5e8d009f 100644
--- a/browser/components/NoteItem.js
+++ b/browser/components/NoteItem.js
@@ -4,6 +4,7 @@
 import PropTypes from 'prop-types'
 import React from 'react'
 import { isArray } from 'lodash'
+import invertColor from 'invert-color'
 import CSSModules from 'browser/lib/CSSModules'
 import { getTodoStatus } from 'browser/lib/getTodoStatus'
 import styles from './NoteItem.styl'
@@ -16,11 +17,18 @@ import i18n from 'browser/lib/i18n'
  * @param {string} color
  * @return {React.Component}
  */
-const TagElement = ({ tagName, color }) => (
-  <span styleName='item-bottom-tagList-item' key={tagName} style={{backgroundColor: color}}>
-    #{tagName}
-  </span>
-)
+const TagElement = ({ tagName, color }) => {
+  const style = {}
+  if (color) {
+    style.backgroundColor = color
+    style.color = invertColor(color, { black: '#222', white: '#f1f1f1', threshold: 0.3 })
+  }
+  return (
+    <span styleName='item-bottom-tagList-item' key={tagName} style={style}>
+      #{tagName}
+    </span>
+  )
+}
 
 /**
  * @description Tag element list component.
diff --git a/browser/main/Detail/TagSelect.js b/browser/main/Detail/TagSelect.js
index caf0cf39..511ecf1a 100644
--- a/browser/main/Detail/TagSelect.js
+++ b/browser/main/Detail/TagSelect.js
@@ -1,5 +1,6 @@
 import PropTypes from 'prop-types'
 import React from 'react'
+import invertColor from 'invert-color'
 import CSSModules from 'browser/lib/CSSModules'
 import styles from './TagSelect.styl'
 import _ from 'lodash'
@@ -183,12 +184,19 @@ class TagSelect extends React.Component {
 
     const tagList = _.isArray(value)
       ? (showTagsAlphabetically ? _.sortBy(value) : value).map((tag) => {
+        const wrapperStyle = {}
+        const textStyle = {}
+        const color = coloredTags[tag]
+        if (color) {
+          wrapperStyle.backgroundColor = color
+          textStyle.color = invertColor(color, { black: '#222', white: '#f1f1f1' })
+        }
         return (
           <span styleName='tag'
             key={tag}
-            style={{backgroundColor: coloredTags[tag]}}
+            style={wrapperStyle}
           >
-            <span styleName='tag-label' onClick={(e) => this.handleTagLabelClick(tag)}>#{tag}</span>
+            <span styleName='tag-label' style={textStyle} onClick={(e) => this.handleTagLabelClick(tag)}>#{tag}</span>
             <button styleName='tag-removeButton'
               onClick={(e) => this.handleTagRemoveButtonClick(tag)}
             >
diff --git a/package.json b/package.json
index af266309..57ab674d 100644
--- a/package.json
+++ b/package.json
@@ -69,6 +69,7 @@
     "i18n-2": "^0.7.2",
     "iconv-lite": "^0.4.19",
     "immutable": "^3.8.1",
+    "invert-color": "^2.0.0",
     "js-sequence-diagrams": "^1000000.0.6",
     "js-yaml": "^3.12.0",
     "katex": "^0.9.0",

From 440b50b4e8bba27b0bc8bea9e1f4869c81a59fdc Mon Sep 17 00:00:00 2001
From: vienai8d <31370233+vienai8d@users.noreply.github.com>
Date: Sat, 29 Dec 2018 15:08:03 +0900
Subject: [PATCH 104/159] add translation about interface in preferences

---
 locales/ja.json | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/locales/ja.json b/locales/ja.json
index 9cfc2986..355bd0a0 100644
--- a/locales/ja.json
+++ b/locales/ja.json
@@ -68,11 +68,15 @@
 	"Enable smart quotes": "スマートクォートを有効にする",
 	"Bring in web page title when pasting URL on editor": "URLを貼り付けた時にWebページのタイトルを取得する",
 	"Enable smart table editor": "スマートテーブルエディタを有効にする",
+	"Enable HTML paste": "HTML貼り付けを有効にする",
+	"Matching character pairs": "自動補完する括弧ペアの列記",
+	"Matching character triples": "自動補完する３文字括弧の列記",
+	"Exploding character pairs": "改行時に空行を挿入する括弧ペアの列記",
 	"Preview": "プレビュー",
 	"Preview Font Size": "プレビュー時フォントサイズ",
 	"Preview Font Family": "プレビュー時フォント",
 	"Code Block Theme": "コードブロックのテーマ",
-  "Allow line through checkbox": "チェック済みチェックボックスのテキストに取り消し線を付与する",
+	"Allow line through checkbox": "チェック済みチェックボックスのテキストに取り消し線を付与する",
 	"Allow preview to scroll past the last line": "プレビュー時に最終行以降にスクロールできるようにする",
 	"When scrolling, synchronize preview with editor": "エディタとプレビューのスクロールを同期する",
 	"Show line numbers for preview code blocks": "プレビュー時のコードブロック内に行番号を表示する",
@@ -149,6 +153,7 @@
 	"Show/Hide Boostnote": "Boostnote の表示／非表示",
 	"Toggle Editor Mode": "エディタモードの切替",
 	"Delete Note": "ノート削除",
+	"Paste HTML": "HTMLで貼り付け",
 	"Restore": "リストア",
 	"Permanent Delete": "永久に削除",
 	"Confirm note deletion": "ノート削除確認",

From 48a905bf6f13f98090ba8cdf5bb367c5159e41f9 Mon Sep 17 00:00:00 2001
From: "richardtks8@gmail.com" <richardtks8@gmail.com>
Date: Sat, 29 Dec 2018 15:34:36 +0800
Subject: [PATCH 105/159] decrease the height of tags scrollbar

---
 browser/main/Detail/TagSelect.styl   | 6 ++++--
 browser/styles/Detail/TagSelect.styl | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/browser/main/Detail/TagSelect.styl b/browser/main/Detail/TagSelect.styl
index 9e8ae68a..844561c6 100644
--- a/browser/main/Detail/TagSelect.styl
+++ b/browser/main/Detail/TagSelect.styl
@@ -6,13 +6,15 @@
   width 96%
   overflow-x auto
   white-space nowrap
-  margin-top 31px
+  top 50px
   position absolute
+  &::-webkit-scrollbar
+    height 8px
 
 .tag
   display flex
   align-items center
-  margin 0px 2px
+  margin 0px 2px 2px
   padding 2px 4px
   background-color alpha($ui-tag-backgroundColor, 3%)
   border-radius 4px
diff --git a/browser/styles/Detail/TagSelect.styl b/browser/styles/Detail/TagSelect.styl
index 17e9f993..8900422c 100644
--- a/browser/styles/Detail/TagSelect.styl
+++ b/browser/styles/Detail/TagSelect.styl
@@ -4,8 +4,10 @@
     border none
     background-color transparent
     outline none
-    padding 0 4px
+    padding 2px 4px
+    margin 0px 2px 2px
     font-size 13px
+    height 23px
 
   ul
     position fixed

From 39442bcafe8bf2e8c1d7029b20011b9908dc6633 Mon Sep 17 00:00:00 2001
From: HarlanLuo <luoxwen@gmail.com>
Date: Sat, 29 Dec 2018 22:23:48 +0800
Subject: [PATCH 106/159] invert icon-x color when tag text color is inverted

---
 browser/main/Detail/TagSelect.js | 11 +++++++++--
 resources/icon/icon-x-light.svg  | 17 +++++++++++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 resources/icon/icon-x-light.svg

diff --git a/browser/main/Detail/TagSelect.js b/browser/main/Detail/TagSelect.js
index 511ecf1a..4b924aa3 100644
--- a/browser/main/Detail/TagSelect.js
+++ b/browser/main/Detail/TagSelect.js
@@ -186,10 +186,17 @@ class TagSelect extends React.Component {
       ? (showTagsAlphabetically ? _.sortBy(value) : value).map((tag) => {
         const wrapperStyle = {}
         const textStyle = {}
+        const BLACK = '#333333'
+        const WHITE = '#f1f1f1'
         const color = coloredTags[tag]
+        const invertedColor = color && invertColor(color, { black: BLACK, white: WHITE })
+        let iconRemove = '../resources/icon/icon-x.svg'
         if (color) {
           wrapperStyle.backgroundColor = color
-          textStyle.color = invertColor(color, { black: '#222', white: '#f1f1f1' })
+          textStyle.color = invertedColor
+        }
+        if (invertedColor === WHITE) {
+          iconRemove = '../resources/icon/icon-x-light.svg'
         }
         return (
           <span styleName='tag'
@@ -200,7 +207,7 @@ class TagSelect extends React.Component {
             <button styleName='tag-removeButton'
               onClick={(e) => this.handleTagRemoveButtonClick(tag)}
             >
-              <img className='tag-removeButton-icon' src='../resources/icon/icon-x.svg' width='8px' />
+              <img className='tag-removeButton-icon' src={iconRemove} width='8px' />
             </button>
           </span>
         )
diff --git a/resources/icon/icon-x-light.svg b/resources/icon/icon-x-light.svg
new file mode 100644
index 00000000..39828f0b
--- /dev/null
+++ b/resources/icon/icon-x-light.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="14px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 47.1 (45422) - http://www.bohemiancoding.com/sketch -->
+    <title>x</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
+        <g id="Feather" transform="translate(-1910.000000, -644.000000)" stroke="#c1c1c1" stroke-width="2">
+            <g id="Group" transform="translate(175.000000, 332.000000)">
+                <g id="x" transform="translate(1736.000000, 313.000000)">
+                    <path d="M12,0 L0,12" id="Shape"></path>
+                    <path d="M0,0 L12,12" id="Shape"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file

From 071f7cb035c522ea5451362b24d5573a227f5bed Mon Sep 17 00:00:00 2001
From: tool root <smart.dog.lilienthal@gmail.com>
Date: Sun, 30 Dec 2018 16:20:19 +0900
Subject: [PATCH 107/159] rewrote the function code to MarkdownPreview.js 
 #2644 #2662

---
 browser/components/MarkdownPreview.js         | 27 ++++++++++++++++++-
 .../main/lib/dataApi/attachmentManagement.js  | 27 -------------------
 2 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/browser/components/MarkdownPreview.js b/browser/components/MarkdownPreview.js
index 9f190773..4c638dc9 100755
--- a/browser/components/MarkdownPreview.js
+++ b/browser/components/MarkdownPreview.js
@@ -398,6 +398,31 @@ export default class MarkdownPreview extends React.Component {
     }
   }
 
+  /**
+   * @description Convert special characters between three ```
+   * @param {string[]} splitWithCodeTag Array of HTML strings separated by three ```
+   * @returns {string} HTML in which special characters between three ``` have been converted
+   */
+  escapeHtmlCharactersInCodeTag (splitWithCodeTag) {
+    for (let index = 0; index < splitWithCodeTag.length; index++) {
+      const codeTagRequired = (splitWithCodeTag[index] !== '\`\`\`' && index < splitWithCodeTag.length - 1)
+      if (codeTagRequired) {
+        splitWithCodeTag.splice((index + 1), 0, '\`\`\`')
+      }
+    }
+    let inCodeTag = false
+    let result = ''
+    for (let content of splitWithCodeTag) {
+      if (content === '\`\`\`') {
+        inCodeTag = !inCodeTag
+      } else if (inCodeTag) {
+        content = escapeHtmlCharacters(content)
+      }
+      result += content
+    }
+    return result
+  }
+
   getScrollBarStyle () {
     const { theme } = this.props
 
@@ -640,7 +665,7 @@ export default class MarkdownPreview extends React.Component {
     this.refs.root.contentWindow.document.body.setAttribute('data-theme', theme)
     if (sanitize === 'NONE') {
       const splitWithCodeTag = value.split('```')
-      value = attachmentManagement.escapeHtmlCharactersInCodeTag(splitWithCodeTag)
+      value = this.escapeHtmlCharactersInCodeTag(splitWithCodeTag)
     }
     const renderedHTML = this.markdown.render(value)
     attachmentManagement.migrateAttachments(value, storagePath, noteKey)
diff --git a/browser/main/lib/dataApi/attachmentManagement.js b/browser/main/lib/dataApi/attachmentManagement.js
index d4cebded..6a0315f7 100644
--- a/browser/main/lib/dataApi/attachmentManagement.js
+++ b/browser/main/lib/dataApi/attachmentManagement.js
@@ -7,7 +7,6 @@ const fse = require('fs-extra')
 const escapeStringRegexp = require('escape-string-regexp')
 const sander = require('sander')
 import i18n from 'browser/lib/i18n'
-import { escapeHtmlCharacters } from '../../../lib/utils'
 
 const STORAGE_FOLDER_PLACEHOLDER = ':storage'
 const DESTINATION_FOLDER = 'attachments'
@@ -221,31 +220,6 @@ function migrateAttachments (markdownContent, storagePath, noteKey) {
   }
 }
 
-/**
- * @description Convert special characters between ```
- * @param {string[]} splitWithCodeTag Array of HTML strings separated by ```
- * @returns {string} HTML in which special characters between ``` have been converted
- */
-function escapeHtmlCharactersInCodeTag (splitWithCodeTag) {
-  for (let index = 0; index < splitWithCodeTag.length; index++) {
-    const codeTagRequired = (splitWithCodeTag[index] !== '\`\`\`' && index < splitWithCodeTag.length - 1)
-    if (codeTagRequired) {
-      splitWithCodeTag.splice((index + 1), 0, '\`\`\`')
-    }
-  }
-  let inCodeTag = false
-  let result = ''
-  for (let content of splitWithCodeTag) {
-    if (content === '\`\`\`') {
-      inCodeTag = !inCodeTag
-    } else if (inCodeTag) {
-      content = escapeHtmlCharacters(content)
-    }
-    result += content
-  }
-  return result
-}
-
 /**
  * @description Fixes the URLs embedded in the generated HTML so that they again refer actual local files.
  * @param {String} renderedHTML HTML in that the links should be fixed
@@ -607,7 +581,6 @@ function handleAttachmentLinkPaste (storageKey, noteKey, linkText) {
 
 module.exports = {
   copyAttachment,
-  escapeHtmlCharactersInCodeTag,
   fixLocalURLS,
   generateAttachmentMarkdown,
   handleAttachmentDrop,

From a9feddf6f69fdde9b0f5eb450678b5e4a017354c Mon Sep 17 00:00:00 2001
From: HarlanLuo <luoxwen@gmail.com>
Date: Sun, 30 Dec 2018 19:23:43 +0800
Subject: [PATCH 108/159] fix bug missing param colored tags in sorted list

---
 browser/components/NoteItem.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser/components/NoteItem.js b/browser/components/NoteItem.js
index 5e8d009f..625bb38d 100644
--- a/browser/components/NoteItem.js
+++ b/browser/components/NoteItem.js
@@ -43,7 +43,7 @@ const TagElementList = (tags, showTagsAlphabetically, coloredTags) => {
   }
 
   if (showTagsAlphabetically) {
-    return _.sortBy(tags).map(tag => TagElement({ tagName: tag }))
+    return _.sortBy(tags).map(tag => TagElement({ tagName: tag, color: coloredTags[tag] }))
   } else {
     return tags.map(tag => TagElement({ tagName: tag, color: coloredTags[tag] }))
   }

From b4e4d7055fbefe44c0321220144013fdd6d54419 Mon Sep 17 00:00:00 2001
From: HarlanLuo <luoxwen@gmail.com>
Date: Sun, 30 Dec 2018 20:49:26 +0800
Subject: [PATCH 109/159] improve style of color-picker

---
 browser/components/ColorPicker.styl | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/browser/components/ColorPicker.styl b/browser/components/ColorPicker.styl
index 6e4aceb8..fbc1212a 100644
--- a/browser/components/ColorPicker.styl
+++ b/browser/components/ColorPicker.styl
@@ -25,10 +25,12 @@
   vertical-align middle
   height 25px
   margin-top 2.5px
-  colorDefaultButton()
   border-radius 2px
-  border $ui-border
+  border none
   padding 0 5px
+  background-color $default-button-background
+  &:hover
+    background-color $default-button-background--hover
 .btn-confirm
   background-color #1EC38B
   &:hover

From deb2cd0156b3bdc8ccb6fbaca3b2678e51f634b0 Mon Sep 17 00:00:00 2001
From: HarlanLuo <luoxwen@gmail.com>
Date: Tue, 1 Jan 2019 16:23:15 +0800
Subject: [PATCH 110/159] new feature: auto detect snippet language

only try to detect after pasting and mode has not been set and default snippet language is "Auto Detect"
---
 browser/components/CodeEditor.js              | 97 ++++++++++++++++++-
 browser/lib/newNote.js                        |  4 +-
 browser/main/Detail/SnippetNoteDetail.js      |  8 +-
 browser/main/modals/PreferencesModal/UiTab.js |  1 +
 package.json                                  |  1 +
 5 files changed, 104 insertions(+), 7 deletions(-)

diff --git a/browser/components/CodeEditor.js b/browser/components/CodeEditor.js
index e9d6badc..6243cf5c 100644
--- a/browser/components/CodeEditor.js
+++ b/browser/components/CodeEditor.js
@@ -2,6 +2,7 @@ import PropTypes from 'prop-types'
 import React from 'react'
 import _ from 'lodash'
 import CodeMirror from 'codemirror'
+import hljs from 'highlight.js'
 import 'codemirror-mode-elixir'
 import attachmentManagement from 'browser/main/lib/dataApi/attachmentManagement'
 import convertModeName from 'browser/lib/convertModeName'
@@ -37,6 +38,85 @@ function translateHotkey (hotkey) {
   return hotkey.replace(/\s*\+\s*/g, '-').replace(/Command/g, 'Cmd').replace(/Control/g, 'Ctrl')
 }
 
+const languageMaps = {
+  brainfuck: 'Brainfuck',
+  cpp: 'C++',
+  cs: 'C#',
+  clojure: 'Clojure',
+  'clojure-repl': 'ClojureScript',
+  cmake: 'CMake',
+  coffeescript: 'CoffeeScript',
+  crystal: 'Crystal',
+  css: 'CSS',
+  d: 'D',
+  dart: 'Dart',
+  delphi: 'Pascal',
+  diff: 'Diff',
+  django: 'Django',
+  dockerfile: 'Dockerfile',
+  ebnf: 'EBNF',
+  elm: 'Elm',
+  erlang: 'Erlang',
+  'erlang-repl': 'Erlang',
+  fortran: 'Fortran',
+  fsharp: 'F#',
+  gherkin: 'Gherkin',
+  go: 'Go',
+  groovy: 'Groovy',
+  haml: 'HAML',
+  haskell: 'Haskell',
+  haxe: 'Haxe',
+  http: 'HTTP',
+  ini: 'toml',
+  java: 'Java',
+  javascript: 'JavaScript',
+  json: 'JSON',
+  julia: 'Julia',
+  kotlin: 'Kotlin',
+  less: 'LESS',
+  livescript: 'LiveScript',
+  lua: 'Lua',
+  markdown: 'Markdown',
+  mathematica: 'Mathematica',
+  nginx: 'Nginx',
+  nsis: 'NSIS',
+  objectivec: 'Objective-C',
+  ocaml: 'Ocaml',
+  perl: 'Perl',
+  php: 'PHP',
+  powershell: 'PowerShell',
+  properties: 'Properties files',
+  protobuf: 'ProtoBuf',
+  python: 'Python',
+  puppet: 'Puppet',
+  q: 'Q',
+  r: 'R',
+  ruby: 'Ruby',
+  rust: 'Rust',
+  sas: 'SAS',
+  scala: 'Scala',
+  scheme: 'Scheme',
+  scss: 'SCSS',
+  shell: 'Shell',
+  smalltalk: 'Smalltalk',
+  sml: 'SML',
+  sql: 'SQL',
+  stylus: 'Stylus',
+  swift: 'Swift',
+  tcl: 'Tcl',
+  tex: 'LaTex',
+  typescript: 'TypeScript',
+  twig: 'Twig',
+  vbnet: 'VB.NET',
+  vbscript: 'VBScript',
+  verilog: 'Verilog',
+  vhdl: 'VHDL',
+  xml: 'HTML',
+  xquery: 'XQuery',
+  yaml: 'YAML',
+  elixir: 'Elixir'
+}
+
 export default class CodeEditor extends React.Component {
   constructor (props) {
     super(props)
@@ -274,7 +354,11 @@ export default class CodeEditor extends React.Component {
       extraKeys: this.defaultKeyMap
     })
 
-    this.setMode(this.props.mode)
+    if (!this.props.mode && this.props.value) {
+      this.autoDetectLanguage(this.props.value)
+    } else {
+      this.setMode(this.props.mode)
+    }
 
     this.editor.on('focus', this.focusHandler)
     this.editor.on('blur', this.blurHandler)
@@ -644,7 +728,7 @@ export default class CodeEditor extends React.Component {
   }
 
   setMode (mode) {
-    let syntax = CodeMirror.findModeByName(convertModeName(mode))
+    let syntax = CodeMirror.findModeByName(convertModeName(mode || 'text'))
     if (syntax == null) syntax = CodeMirror.findModeByName('Plain Text')
 
     this.editor.setOption('mode', syntax.mime)
@@ -796,6 +880,11 @@ export default class CodeEditor extends React.Component {
     this.editor.replaceSelection(imageMd)
   }
 
+  autoDetectLanguage (content) {
+    const res = hljs.highlightAuto(content, Object.keys(languageMaps))
+    this.setMode(languageMaps[res.language])
+  }
+
   handlePaste (editor, forceSmartPaste) {
     const { storageKey, noteKey, fetchUrlTitle, enableSmartPaste } = this.props
 
@@ -892,6 +981,10 @@ export default class CodeEditor extends React.Component {
         this.handlePasteText(editor, pastedTxt)
       }
     }
+
+    if (!this.props.mode) {
+      this.autoDetectLanguage(editor.doc.getValue())
+    }
   }
 
   handleScroll (e) {
diff --git a/browser/lib/newNote.js b/browser/lib/newNote.js
index 9511f847..d8ef196f 100644
--- a/browser/lib/newNote.js
+++ b/browser/lib/newNote.js
@@ -46,6 +46,8 @@ export function createSnippetNote (storage, folder, dispatch, location, params,
     tags = params.tagname.split(' ')
   }
 
+  const defaultLanguage = config.editor.snippetDefaultLanguage === 'Auto Detect' ? null : config.editor.snippetDefaultLanguage
+
   return dataApi
     .createNote(storage, {
       type: 'SNIPPET_NOTE',
@@ -56,7 +58,7 @@ export function createSnippetNote (storage, folder, dispatch, location, params,
       snippets: [
         {
           name: '',
-          mode: config.editor.snippetDefaultLanguage || 'text',
+          mode: defaultLanguage,
           content: '',
           linesHighlighted: []
         }
diff --git a/browser/main/Detail/SnippetNoteDetail.js b/browser/main/Detail/SnippetNoteDetail.js
index d8b5798d..12545335 100644
--- a/browser/main/Detail/SnippetNoteDetail.js
+++ b/browser/main/Detail/SnippetNoteDetail.js
@@ -599,12 +599,14 @@ class SnippetNoteDetail extends React.Component {
   }
 
   addSnippet () {
-    const { config } = this.props
+    const { config: { editor: { snippetDefaultLanguage } } } = this.props
     const { note } = this.state
 
+    const defaultLanguage = snippetDefaultLanguage === 'Auto Detect' ? null : snippetDefaultLanguage
+
     note.snippets = note.snippets.concat([{
       name: '',
-      mode: config.editor.snippetDefaultLanguage || 'text',
+      mode: defaultLanguage,
       content: '',
       linesHighlighted: []
     }])
@@ -696,8 +698,6 @@ class SnippetNoteDetail extends React.Component {
 
     const viewList = note.snippets.map((snippet, index) => {
       const isActive = this.state.snippetIndex === index
-      let syntax = CodeMirror.findModeByName(convertModeName(snippet.mode))
-      if (syntax == null) syntax = CodeMirror.findModeByName('Plain Text')
       return <div styleName='tabView'
         key={index}
         style={{zIndex: isActive ? 5 : 4}}
diff --git a/browser/main/modals/PreferencesModal/UiTab.js b/browser/main/modals/PreferencesModal/UiTab.js
index a371cac8..c8646c39 100644
--- a/browser/main/modals/PreferencesModal/UiTab.js
+++ b/browser/main/modals/PreferencesModal/UiTab.js
@@ -481,6 +481,7 @@ class UiTab extends React.Component {
                 ref='editorSnippetDefaultLanguage'
                 onChange={(e) => this.handleUIChange(e)}
               >
+                <option key='Auto Detect' value='Auto Detect'>Auto Detect</option>
                 {
                   _.sortBy(CodeMirror.modeInfo.map(mode => mode.name)).map(name => (<option key={name} value={name}>{name}</option>))
                 }
diff --git a/package.json b/package.json
index f12360a0..578e2c7b 100644
--- a/package.json
+++ b/package.json
@@ -66,6 +66,7 @@
     "flowchart.js": "^1.6.5",
     "font-awesome": "^4.3.0",
     "fs-extra": "^5.0.0",
+    "highlight.js": "^9.13.1",
     "i18n-2": "^0.7.2",
     "iconv-lite": "^0.4.19",
     "immutable": "^3.8.1",

From 2a5da746c7c6490f16409eed26067ca9728c075c Mon Sep 17 00:00:00 2001
From: vienai8d <31370233+vienai8d@users.noreply.github.com>
Date: Tue, 1 Jan 2019 18:39:39 +0900
Subject: [PATCH 111/159] add translation about content menu

---
 locales/ja.json | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/locales/ja.json b/locales/ja.json
index 355bd0a0..5eb6b3cb 100644
--- a/locales/ja.json
+++ b/locales/ja.json
@@ -26,6 +26,9 @@
 	"Storage Locations": "ストレージ",
 	"Add Storage Location": "ストレージロケーションを追加",
 	"Add Folder": "フォルダを追加",
+	"Create new folder": "新規フォルダ作成",
+	"Folder name": "フォルダ名",
+	"Create": "作成",
 	"Select Folder": "フォルダを選択",
 	"Open Storage folder": "ストレージフォルダを開く",
 	"Unlink": "リンク解除",
@@ -122,7 +125,19 @@
 	"French": "フランス語",
 	"Show \"Saved to Clipboard\" notification when copying": "クリップボードコピー時に \"クリップボードに保存\" 通知を表示する",
 	"All Notes": "すべてのノート",
+	"Pin to Top": "一番上にピン留め",
+	"Remove pin": "ピン削除",
+	"Clone Note": "ノート複製",
+	"Copy Note Link": "ノートのリンクをコピー",
+	"Publish Blog": "ブログを公開",
 	"Starred": "スター付き",
+	"Empty Trash": "ゴミ箱を空にする",
+	"Restore Note": "ノート復元",
+	"Rename Folder": "フォルダの名称変更",
+	"Export Folder": "フォルダの書き出し",
+	"Export as txt": ".txtで書き出す",
+	"Export as md": ".mdで書き出す",
+	"Delete Folder": "フォルダ削除",
 	"Are you sure to ": "本当に ",
 	" delete": "このフォルダを",
 	"this folder?": "削除しますか？",
@@ -184,6 +199,7 @@
 	"Cloud-Syncing-and-Backup": "Cloud-Syncing-and-Backup",
 	"Location": "ロケーション",
 	"Add": "追加",
+	"Export Storage": "ストレージの書き出し",
 	"Unlink Storage": "ストレージのリンクを解除",
 	"Unlinking removes this linked storage from Boostnote. No data is removed, please manually delete the folder from your hard drive if needed.": "リンクの解除ではBoostnoteからリンクされたストレージを削除しますが、データは削除されません。データを削除する場合はご自身でハードドライブからフォルダを削除してください。",
 	"Editor Rulers": "罫線",

From 2bbe39120a04dd378e952975ba5ed0adb81b28ec Mon Sep 17 00:00:00 2001
From: vienai8d <31370233+vienai8d@users.noreply.github.com>
Date: Tue, 1 Jan 2019 23:10:29 +0900
Subject: [PATCH 112/159] use FullscreenButton instead of current button

---
 browser/main/Detail/SnippetNoteDetail.js | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/browser/main/Detail/SnippetNoteDetail.js b/browser/main/Detail/SnippetNoteDetail.js
index d8b5798d..8b3db151 100644
--- a/browser/main/Detail/SnippetNoteDetail.js
+++ b/browser/main/Detail/SnippetNoteDetail.js
@@ -20,6 +20,7 @@ import _ from 'lodash'
 import {findNoteTitle} from 'browser/lib/findNoteTitle'
 import convertModeName from 'browser/lib/convertModeName'
 import AwsMobileAnalyticsConfig from 'browser/main/lib/AwsMobileAnalyticsConfig'
+import FullscreenButton from './FullscreenButton'
 import TrashButton from './TrashButton'
 import RestoreButton from './RestoreButton'
 import PermanentDeleteButton from './PermanentDeleteButton'
@@ -796,11 +797,7 @@ class SnippetNoteDetail extends React.Component {
           isActive={note.isStarred}
         />
 
-        <button styleName='control-fullScreenButton' title={i18n.__('Fullscreen')}
-          onMouseDown={(e) => this.handleFullScreenButton(e)}>
-          <img styleName='iconInfo' src='../resources/icon/icon-full.svg' />
-          <span styleName='tooltip'>{i18n.__('Fullscreen')}</span>
-        </button>
+        <FullscreenButton onClick={(e) => this.handleFullScreenButton(e)} />
 
         <TrashButton onClick={(e) => this.handleTrashButtonClick(e)} />
 

From fce89fe8befa684c94b89c005bb5b5ec2b6de910 Mon Sep 17 00:00:00 2001
From: Douglas Caina <caina27@gmail.com>
Date: Tue, 1 Jan 2019 22:20:23 +0100
Subject: [PATCH 113/159] Update pt-BR.json

## Description
There was a misspelling on the word "escluir", the correct one is "excluir", as you can see on [google translate](https://translate.google.com/?source=osdd#view=home&op=translate&sl=pt&tl=en&text=excluir)


## Type of changes

- :white_circle: Bug fix (Change that fixed an issue)
- :white_circle: Breaking change (Change that can cause existing functionality to change)
- :white_circle: Improvement (Change that improves the code. Maybe performance or development improvement)
- :white_circle: Feature (Change that adds new functionality)
- :white_circle: Documentation change (Change that modifies documentation. Maybe typo fixes)

## Checklist:

- :white_circle: My code follows [the project code style](docs/code_style.md)
- :white_circle: I have written test for my code and it has been tested
- :white_circle: All existing tests have been passed
- :white_circle: I have attached a screenshot/video to visualize my change if possible
---
 locales/pt-BR.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/locales/pt-BR.json b/locales/pt-BR.json
index 6b3126cc..273466eb 100644
--- a/locales/pt-BR.json
+++ b/locales/pt-BR.json
@@ -33,7 +33,7 @@
 	"White": "Branco",
 	"Solarized Dark": "Escuro Solarizado",
 	"Dark": "Escuro",
-	"Show a confirmation dialog when deleting notes": "Mostrar um diálogo de confirmação ao escluir notas",
+	"Show a confirmation dialog when deleting notes": "Mostrar um diálogo de confirmação ao excluir notas",
 	"Editor Theme": "Tema do Editor",
 	"Editor Font Size": "Tamanho da Fonte do Editor",
 	"Editor Font Family": "Família da Fonte do Editor",

From 0a0c1c45a16d438cdb14d22cdd6f1ebbd67d0545 Mon Sep 17 00:00:00 2001
From: vienai8d <31370233+vienai8d@users.noreply.github.com>
Date: Tue, 1 Jan 2019 22:00:30 +0900
Subject: [PATCH 114/159] translate tooltip texts into Japanese

---
 locales/ja.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/locales/ja.json b/locales/ja.json
index 9cfc2986..832bc308 100644
--- a/locales/ja.json
+++ b/locales/ja.json
@@ -8,7 +8,10 @@
 	"to create a new note": "ノートを新規に作成",
 	"Toggle Mode": "モード切替",
 	"Add tag...": "タグを追加...",
+  "Star": "お気に入り",
+  "Fullscreen": "全画面",
 	"Trash": "ゴミ箱",
+  "Info": "情報",
 	"MODIFICATION DATE": "修正日",
 	"Words": "ワード",
 	"Letters": "文字",

From 5cf4a0e09d47522f4f727885755a9dc92900fc2a Mon Sep 17 00:00:00 2001
From: vienai8d <31370233+vienai8d@users.noreply.github.com>
Date: Wed, 2 Jan 2019 02:49:10 +0900
Subject: [PATCH 115/159] localize StarButton for Japanese

---
 browser/main/Detail/StarButton.js   | 2 +-
 browser/main/Detail/StarButton.styl | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/browser/main/Detail/StarButton.js b/browser/main/Detail/StarButton.js
index d74809cd..8000970d 100644
--- a/browser/main/Detail/StarButton.js
+++ b/browser/main/Detail/StarButton.js
@@ -54,7 +54,7 @@ class StarButton extends React.Component {
             : '../resources/icon/icon-star.svg'
           }
         />
-        <span styleName='tooltip'>{i18n.__('Star')}</span>
+        <span lang={i18n.locale} styleName='tooltip'>{i18n.__('Star')}</span>
       </button>
     )
   }
diff --git a/browser/main/Detail/StarButton.styl b/browser/main/Detail/StarButton.styl
index d5fd755b..e9c523e9 100644
--- a/browser/main/Detail/StarButton.styl
+++ b/browser/main/Detail/StarButton.styl
@@ -21,6 +21,11 @@
   opacity 0
   transition 0.1s
 
+.tooltip:lang(ja)
+  @extend .tooltip
+  right 103px
+  width 70px
+
 .root--active
   @extend .root
   transition 0.15s

From caa6c8d4b94045ad2f31f645f63fe77c3db162eb Mon Sep 17 00:00:00 2001
From: vienai8d <31370233+vienai8d@users.noreply.github.com>
Date: Wed, 2 Jan 2019 11:01:37 +0900
Subject: [PATCH 116/159] localize FullscreenButton for Japanese

---
 browser/main/Detail/FullscreenButton.js   | 2 +-
 browser/main/Detail/FullscreenButton.styl | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/browser/main/Detail/FullscreenButton.js b/browser/main/Detail/FullscreenButton.js
index ee212603..3a86a751 100644
--- a/browser/main/Detail/FullscreenButton.js
+++ b/browser/main/Detail/FullscreenButton.js
@@ -11,7 +11,7 @@ const FullscreenButton = ({
 }) => (
   <button styleName='control-fullScreenButton' title={i18n.__('Fullscreen')} onMouseDown={(e) => onClick(e)}>
     <img styleName='iconInfo' src='../resources/icon/icon-full.svg' />
-    <span styleName='tooltip'>{i18n.__('Fullscreen')}({hotkey})</span>
+    <span lang={i18n.locale} styleName='tooltip'>{i18n.__('Fullscreen')}({hotkey})</span>
   </button>
 )
 
diff --git a/browser/main/Detail/FullscreenButton.styl b/browser/main/Detail/FullscreenButton.styl
index cc1a8dff..133577f3 100644
--- a/browser/main/Detail/FullscreenButton.styl
+++ b/browser/main/Detail/FullscreenButton.styl
@@ -17,6 +17,10 @@
   opacity 0
   transition 0.1s
 
+.tooltip:lang(ja)
+  @extend .tooltip
+  right 35px
+
 body[data-theme="dark"]
   .control-fullScreenButton
     topBarButtonDark()
\ No newline at end of file

From d0f5ec8adae8dae5d00b8a80a62757bab4e20665 Mon Sep 17 00:00:00 2001
From: vienai8d <31370233+vienai8d@users.noreply.github.com>
Date: Wed, 2 Jan 2019 11:03:40 +0900
Subject: [PATCH 117/159] fix FullscreenButton

---
 browser/main/Detail/FullscreenButton.js | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/browser/main/Detail/FullscreenButton.js b/browser/main/Detail/FullscreenButton.js
index 3a86a751..bd76447c 100644
--- a/browser/main/Detail/FullscreenButton.js
+++ b/browser/main/Detail/FullscreenButton.js
@@ -5,15 +5,17 @@ import styles from './FullscreenButton.styl'
 import i18n from 'browser/lib/i18n'
 
 const OSX = global.process.platform === 'darwin'
-const hotkey = (OSX ? i18n.__('Command(⌘)') : i18n.__('Ctrl(^)')) + '+B'
 const FullscreenButton = ({
  onClick
-}) => (
-  <button styleName='control-fullScreenButton' title={i18n.__('Fullscreen')} onMouseDown={(e) => onClick(e)}>
-    <img styleName='iconInfo' src='../resources/icon/icon-full.svg' />
-    <span lang={i18n.locale} styleName='tooltip'>{i18n.__('Fullscreen')}({hotkey})</span>
-  </button>
-)
+}) => {
+  const hotkey = (OSX ? i18n.__('Command(⌘)') : i18n.__('Ctrl(^)')) + '+B'
+  return (
+    <button styleName='control-fullScreenButton' title={i18n.__('Fullscreen')} onMouseDown={(e) => onClick(e)}>
+      <img styleName='iconInfo' src='../resources/icon/icon-full.svg' />
+      <span lang={i18n.locale} styleName='tooltip'>{i18n.__('Fullscreen')}({hotkey})</span>
+    </button>
+  )
+}
 
 FullscreenButton.propTypes = {
   onClick: PropTypes.func.isRequired

From b05ba64db8c1b3c32e22fc520fd939f78e487000 Mon Sep 17 00:00:00 2001
From: vienai8d <31370233+vienai8d@users.noreply.github.com>
Date: Wed, 2 Jan 2019 11:07:15 +0900
Subject: [PATCH 118/159] localize TrashButton for Japanese

---
 browser/main/Detail/TrashButton.js   | 2 +-
 browser/main/Detail/TrashButton.styl | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/browser/main/Detail/TrashButton.js b/browser/main/Detail/TrashButton.js
index 473c2d0b..d26be66e 100644
--- a/browser/main/Detail/TrashButton.js
+++ b/browser/main/Detail/TrashButton.js
@@ -11,7 +11,7 @@ const TrashButton = ({
     onClick={(e) => onClick(e)}
   >
     <img styleName='iconInfo' src='../resources/icon/icon-trash.svg' />
-    <span styleName='tooltip'>{i18n.__('Trash')}</span>
+    <span lang={i18n.locale} styleName='tooltip'>{i18n.__('Trash')}</span>
   </button>
 )
 
diff --git a/browser/main/Detail/TrashButton.styl b/browser/main/Detail/TrashButton.styl
index 7c7af878..a82cfa6b 100644
--- a/browser/main/Detail/TrashButton.styl
+++ b/browser/main/Detail/TrashButton.styl
@@ -17,6 +17,10 @@
   opacity 0
   transition 0.1s
 
+.tooltip:lang(ja)
+  @extend .tooltip
+  right 46px
+
 .control-trashButton--in-trash
   top 60px
   topBarButtonRight()

From e6a927e5afcf5298d2bc679470d04ec2be7be8b3 Mon Sep 17 00:00:00 2001
From: vienai8d <31370233+vienai8d@users.noreply.github.com>
Date: Wed, 2 Jan 2019 11:10:07 +0900
Subject: [PATCH 119/159] localize ToggleModeButton for Japanese

---
 browser/main/Detail/ToggleModeButton.js   | 2 +-
 browser/main/Detail/ToggleModeButton.styl | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/browser/main/Detail/ToggleModeButton.js b/browser/main/Detail/ToggleModeButton.js
index 7c026429..fcbaab34 100644
--- a/browser/main/Detail/ToggleModeButton.js
+++ b/browser/main/Detail/ToggleModeButton.js
@@ -14,7 +14,7 @@ const ToggleModeButton = ({
     <div styleName={editorType === 'EDITOR_PREVIEW' ? 'active' : 'non-active'} onClick={() => onClick('EDITOR_PREVIEW')}>
       <img styleName='item-star' src={editorType === 'EDITOR_PREVIEW' ? '' : '../resources/icon/icon-mode-split-on-active.svg'} />
     </div>
-    <span styleName='tooltip'>{i18n.__('Toggle Mode')}</span>
+    <span lang={i18n.locale} styleName='tooltip'>{i18n.__('Toggle Mode')}</span>
   </div>
 )
 
diff --git a/browser/main/Detail/ToggleModeButton.styl b/browser/main/Detail/ToggleModeButton.styl
index 73f5acbd..2b47b932 100644
--- a/browser/main/Detail/ToggleModeButton.styl
+++ b/browser/main/Detail/ToggleModeButton.styl
@@ -40,6 +40,11 @@
   opacity 0
   transition 0.1s
 
+.tooltip:lang(ja)
+  @extend .tooltip
+  left -8px
+  width 70px
+
 body[data-theme="dark"]
   .control-fullScreenButton
     topBarButtonDark()

From 04fdb67fc978e0d85d502cd7daa9839cd39b82f5 Mon Sep 17 00:00:00 2001
From: Rahul Gurung <gurungrahul2@gmail.com>
Date: Wed, 2 Jan 2019 12:38:26 +0530
Subject: [PATCH 120/159] #2194 - fixes Hotkey not working

---
 browser/main/lib/ConfigManager.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser/main/lib/ConfigManager.js b/browser/main/lib/ConfigManager.js
index 81165777..25e6e918 100644
--- a/browser/main/lib/ConfigManager.js
+++ b/browser/main/lib/ConfigManager.js
@@ -208,7 +208,7 @@ function assignConfigValues (originalConfig, rcConfig) {
 function rewriteHotkey (config) {
   const keys = [...Object.keys(config.hotkey)]
   keys.forEach(key => {
-    config.hotkey[key] = config.hotkey[key].replace(/Cmd/g, 'Command')
+    config.hotkey[key] = config.hotkey[key].replace(/Cmd\s/g, 'Command ')
     config.hotkey[key] = config.hotkey[key].replace(/Opt\s/g, 'Option ')
   })
   return config

From 082a078b511d96458dfe0b4a6e5c3a73cf0f3cf2 Mon Sep 17 00:00:00 2001
From: HarlanLuo <luoxwen@gmail.com>
Date: Fri, 4 Jan 2019 21:55:58 +0800
Subject: [PATCH 121/159] check config before auto detect language

---
 browser/components/CodeEditor.js         | 6 ++++--
 browser/main/Detail/SnippetNoteDetail.js | 5 ++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/browser/components/CodeEditor.js b/browser/components/CodeEditor.js
index 6243cf5c..48634993 100644
--- a/browser/components/CodeEditor.js
+++ b/browser/components/CodeEditor.js
@@ -354,7 +354,7 @@ export default class CodeEditor extends React.Component {
       extraKeys: this.defaultKeyMap
     })
 
-    if (!this.props.mode && this.props.value) {
+    if (!this.props.mode && this.props.value && this.props.autoDetect) {
       this.autoDetectLanguage(this.props.value)
     } else {
       this.setMode(this.props.mode)
@@ -982,7 +982,7 @@ export default class CodeEditor extends React.Component {
       }
     }
 
-    if (!this.props.mode) {
+    if (!this.props.mode && this.props.autoDetect) {
       this.autoDetectLanguage(editor.doc.getValue())
     }
   }
@@ -1184,6 +1184,7 @@ CodeEditor.propTypes = {
   onBlur: PropTypes.func,
   onChange: PropTypes.func,
   readOnly: PropTypes.bool,
+  autoDetect: PropTypes.bool,
   spellCheck: PropTypes.bool
 }
 
@@ -1195,5 +1196,6 @@ CodeEditor.defaultProps = {
   fontFamily: 'Monaco, Consolas',
   indentSize: 4,
   indentType: 'space',
+  autoDetect: false,
   spellCheck: false
 }
diff --git a/browser/main/Detail/SnippetNoteDetail.js b/browser/main/Detail/SnippetNoteDetail.js
index 12545335..e9b0ee37 100644
--- a/browser/main/Detail/SnippetNoteDetail.js
+++ b/browser/main/Detail/SnippetNoteDetail.js
@@ -674,6 +674,8 @@ class SnippetNoteDetail extends React.Component {
     const storageKey = note.storage
     const folderKey = note.folder
 
+    const autoDetect = config.editor.snippetDefaultLanguage === 'Auto Detect'
+
     let editorFontSize = parseInt(config.editor.fontSize, 10)
     if (!(editorFontSize > 0 && editorFontSize < 101)) editorFontSize = 14
     let editorIndentSize = parseInt(config.editor.indentSize, 10)
@@ -713,7 +715,7 @@ class SnippetNoteDetail extends React.Component {
             storageKey={storageKey}
           />
           : <CodeEditor styleName='tabView-content'
-            mode={snippet.mode}
+            mode={snippet.mode || (autoDetect ? null : config.editor.snippetDefaultLanguage)}
             value={snippet.content}
             linesHighlighted={snippet.linesHighlighted}
             theme={config.editor.theme}
@@ -733,6 +735,7 @@ class SnippetNoteDetail extends React.Component {
             ref={'code-' + index}
             enableSmartPaste={config.editor.enableSmartPaste}
             hotkey={config.hotkey}
+            autoDetect={autoDetect}
           />
         }
       </div>

From 406e230ed3192cc05988bcac29ec7806def4e321 Mon Sep 17 00:00:00 2001
From: Foo-x <www.sand.x@gmail.com>
Date: Thu, 10 Jan 2019 23:26:47 +0900
Subject: [PATCH 122/159] Fix bullet position of LaTeX equation in list

---
 browser/components/markdown.styl | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/browser/components/markdown.styl b/browser/components/markdown.styl
index da767a9f..304fa1ee 100644
--- a/browser/components/markdown.styl
+++ b/browser/components/markdown.styl
@@ -61,6 +61,8 @@ body
   // allow inline line breaks
   .katex
     white-space initial
+  .katex .katex-html
+    display inline-flex
   .katex .mfrac>.vlist>span:nth-child(2)
     top 0 !important
   .katex-error

From aac13dcdcabb2f975cf7a27b64dae24a37c27517 Mon Sep 17 00:00:00 2001
From: Milo Todt <milo@milotodt.com>
Date: Sat, 12 Jan 2019 08:26:31 -0800
Subject: [PATCH 123/159] Updated build.md to include directions for checking
 out PRs

---
 docs/build.md | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/docs/build.md b/docs/build.md
index eaf94666..f60361aa 100644
--- a/docs/build.md
+++ b/docs/build.md
@@ -31,6 +31,34 @@ $ yarn run dev
 > 1. When editing a constructor method of a component
 > 2. When adding a new css class (similar to 1: the CSS class is re-written by each component. This process occurs at the Constructor method.)
 
+## Accessing code used in Pull Requests
+Visit the page for the pull request and look at the end of the url for the PR number
+<pre>
+https://github.com/BoostIO/Boostnote/pull/2794
+</pre>
+In the following, replace <PR> with that number (no brackets).
+For the above url, you would replace <PR> with 2794
+
+_If you do not have a local copy the master branch yet_
+```
+git clone https://github.com/BoostIO/Boostnote.git
+cd Boostnote
+git fetch origin pull/2612/head:<PR>
+git checkout <PR>
+```
+
+_If you already have the master branch_
+```
+git fetch origin pull/2612/head:<PR>
+git checkout <PR>
+```
+
+_To compile and run the code_
+```
+yarn
+yarn build
+```
+
 ## Deploy
 
 We use Grunt to automate deployment.

From 5e9bd2fd2d7a66671e7c91051366ed53984ba4d4 Mon Sep 17 00:00:00 2001
From: Milo Todt <milo@milotodt.com>
Date: Sat, 12 Jan 2019 08:34:14 -0800
Subject: [PATCH 124/159] escaped angle brackets

---
 docs/build.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/build.md b/docs/build.md
index f60361aa..91176611 100644
--- a/docs/build.md
+++ b/docs/build.md
@@ -36,8 +36,8 @@ Visit the page for the pull request and look at the end of the url for the PR nu
 <pre>
 https://github.com/BoostIO/Boostnote/pull/2794
 </pre>
-In the following, replace <PR> with that number (no brackets).
-For the above url, you would replace <PR> with 2794
+In the following, replace \<PR> with that number (no brackets).
+For the above url, you would replace \<PR> with 2794
 
 _If you do not have a local copy the master branch yet_
 ```

From 7b8fb5644089c07f2d6300f07bd9bded4b92e91f Mon Sep 17 00:00:00 2001
From: Milo Todt <milo@milotodt.com>
Date: Sat, 12 Jan 2019 08:38:18 -0800
Subject: [PATCH 125/159] fixed error in url

---
 docs/build.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/build.md b/docs/build.md
index 91176611..36aea9a7 100644
--- a/docs/build.md
+++ b/docs/build.md
@@ -43,13 +43,13 @@ _If you do not have a local copy the master branch yet_
 ```
 git clone https://github.com/BoostIO/Boostnote.git
 cd Boostnote
-git fetch origin pull/2612/head:<PR>
+git fetch origin pull/<PR>/head:<PR>
 git checkout <PR>
 ```
 
 _If you already have the master branch_
 ```
-git fetch origin pull/2612/head:<PR>
+git fetch origin pull/<PR>/head:<PR>
 git checkout <PR>
 ```
 

From 6fb72bd44ab4428b0a66ad4a52502e7fddacfb2e Mon Sep 17 00:00:00 2001
From: Milo Todt <milo@milotodt.com>
Date: Sat, 12 Jan 2019 09:46:51 -0800
Subject: [PATCH 126/159] minor typo

---
 docs/build.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/build.md b/docs/build.md
index 36aea9a7..08a1b5dc 100644
--- a/docs/build.md
+++ b/docs/build.md
@@ -39,7 +39,7 @@ https://github.com/BoostIO/Boostnote/pull/2794
 In the following, replace \<PR> with that number (no brackets).
 For the above url, you would replace \<PR> with 2794
 
-_If you do not have a local copy the master branch yet_
+_If you do not have a local copy of the master branch yet_
 ```
 git clone https://github.com/BoostIO/Boostnote.git
 cd Boostnote

From e298739cb9021a18136ab6bfded44604258b6b07 Mon Sep 17 00:00:00 2001
From: Milo Todt <milo@milotodt.com>
Date: Sat, 12 Jan 2019 12:34:25 -0800
Subject: [PATCH 127/159] fixed typo

---
 docs/build.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/build.md b/docs/build.md
index 08a1b5dc..095f8628 100644
--- a/docs/build.md
+++ b/docs/build.md
@@ -56,7 +56,7 @@ git checkout <PR>
 _To compile and run the code_
 ```
 yarn
-yarn build
+yarn run dev
 ```
 
 ## Deploy

From 47d7cef2148d0307080303efbe82268523a80c0b Mon Sep 17 00:00:00 2001
From: Milo Todt <milo@milotodt.com>
Date: Sat, 12 Jan 2019 15:50:33 -0800
Subject: [PATCH 128/159] Update copywrite year

2018->2019
---
 readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.md b/readme.md
index aba9b92a..d1eb710b 100644
--- a/readme.md
+++ b/readme.md
@@ -41,7 +41,7 @@ Issues on Boostnote can be funded by anyone and the money will be distributed to
 * Website: https://boostnote.io
 * Newsletters: https://boostnote.io/#subscribe
 * [Development](https://github.com/BoostIO/Boostnote/blob/master/docs/build.md): Development configurations for Boostnote.
-* Copyright (C) 2016 - 2018 BoostIO, Inc.
+* Copyright (C) 2016 - 2019 BoostIO, Inc.
 
 
 #### License

From a8e601e5e00d94eb726581f1bb49296bbfd16136 Mon Sep 17 00:00:00 2001
From: Milo Todt <milo@milotodt.com>
Date: Sat, 12 Jan 2019 16:09:25 -0800
Subject: [PATCH 129/159] Update InfoTab.js

---
 browser/main/modals/PreferencesModal/InfoTab.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser/main/modals/PreferencesModal/InfoTab.js b/browser/main/modals/PreferencesModal/InfoTab.js
index d618fa22..dafabb02 100644
--- a/browser/main/modals/PreferencesModal/InfoTab.js
+++ b/browser/main/modals/PreferencesModal/InfoTab.js
@@ -134,7 +134,7 @@ class InfoTab extends React.Component {
             >{i18n.__('Development')}</a>{i18n.__(' : Development configurations for Boostnote.')}
           </li>
           <li styleName='cc'>
-            {i18n.__('Copyright (C) 2017 - 2018 BoostIO')}
+            {i18n.__('Copyright (C) 2017 - 2019 BoostIO')}
           </li>
           <li styleName='cc'>
             {i18n.__('License: GPL v3')}

From a0bfd9e497a3b742b47977033f4f0c026fbd8e77 Mon Sep 17 00:00:00 2001
From: Milo Todt <milo@milotodt.com>
Date: Sat, 12 Jan 2019 17:58:19 -0800
Subject: [PATCH 130/159] Disables updates in development mode

---
 lib/main-app.js | 11 ++++++++---
 package.json    |  1 +
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/lib/main-app.js b/lib/main-app.js
index f25d07d2..7a31d282 100644
--- a/lib/main-app.js
+++ b/lib/main-app.js
@@ -2,7 +2,8 @@ const electron = require('electron')
 const app = electron.app
 const Menu = electron.Menu
 const ipc = electron.ipcMain
-const GhReleases = require('electron-gh-releases')
+const GhReleases = require('electron-gh-releases') 
+const isDev = require('electron-is-dev') //isDev is True if running in development mode. Overide by setting ELECTRON_IS_DEV environment variable to 1
 // electron.crashReporter.start()
 var ipcServer = null
 
@@ -35,6 +36,10 @@ const updater = new GhReleases(ghReleasesOpts)
 // Check for updates
 // `status` returns true if there is a new update available
 function checkUpdate () {
+  if (isDev){ //Prevents app from attempting to update when in dev mode.
+    console.log("Updates are disabled in Development mode, see main-app.js")
+    return true
+  }
   if (process.platform === 'linux' || isUpdateReady) {
     return true
   }
@@ -94,12 +99,12 @@ app.on('ready', function () {
 
   // Check update every day
   setInterval(function () {
-    checkUpdate()
+    if(!isDev) checkUpdate()
   }, 1000 * 60 * 60 * 24)
 
   // Check update after 10 secs to prevent file locking of Windows
   setTimeout(() => {
-    checkUpdate()
+    if(!isDev) checkUpdate()
 
     ipc.on('update-check', function (event, msg) {
       if (isUpdateReady) {
diff --git a/package.json b/package.json
index 95b4ecd7..568d3852 100644
--- a/package.json
+++ b/package.json
@@ -59,6 +59,7 @@
     "codemirror-mode-elixir": "^1.1.1",
     "electron-config": "^1.0.0",
     "electron-gh-releases": "^2.0.4",
+    "electron-is-dev": "^1.0.1",
     "escape-string-regexp": "^1.0.5",
     "file-uri-to-path": "^1.0.0",
     "file-url": "^2.0.2",

From fa77cda0b473bf3a3e5389aa64c9e84a92c2739e Mon Sep 17 00:00:00 2001
From: Milo Todt <milo@milotodt.com>
Date: Sat, 12 Jan 2019 17:59:04 -0800
Subject: [PATCH 131/159] whitespace

---
 lib/main-app.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/main-app.js b/lib/main-app.js
index 7a31d282..c5645940 100644
--- a/lib/main-app.js
+++ b/lib/main-app.js
@@ -2,8 +2,8 @@ const electron = require('electron')
 const app = electron.app
 const Menu = electron.Menu
 const ipc = electron.ipcMain
-const GhReleases = require('electron-gh-releases') 
-const isDev = require('electron-is-dev') //isDev is True if running in development mode. Overide by setting ELECTRON_IS_DEV environment variable to 1
+const GhReleases = require('electron-gh-releases')
+const isDev = require('electron-is-dev') // isDev is True if running in development mode. Overide by setting ELECTRON_IS_DEV environment variable to 1
 // electron.crashReporter.start()
 var ipcServer = null
 
@@ -36,8 +36,8 @@ const updater = new GhReleases(ghReleasesOpts)
 // Check for updates
 // `status` returns true if there is a new update available
 function checkUpdate () {
-  if (isDev){ //Prevents app from attempting to update when in dev mode.
-    console.log("Updates are disabled in Development mode, see main-app.js")
+  if (isDev) { // Prevents app from attempting to update when in dev mode.
+    console.log('Updates are disabled in Development mode, see main-app.js')
     return true
   }
   if (process.platform === 'linux' || isUpdateReady) {
@@ -99,12 +99,12 @@ app.on('ready', function () {
 
   // Check update every day
   setInterval(function () {
-    if(!isDev) checkUpdate()
+    if (!isDev) checkUpdate()
   }, 1000 * 60 * 60 * 24)
 
   // Check update after 10 secs to prevent file locking of Windows
   setTimeout(() => {
-    if(!isDev) checkUpdate()
+    if (!isDev) checkUpdate()
 
     ipc.on('update-check', function (event, msg) {
       if (isUpdateReady) {

From 951a126d63e7ff3abda89e1dcbc7eec3e2d59a38 Mon Sep 17 00:00:00 2001
From: Milo Todt <milo@milotodt.com>
Date: Sat, 12 Jan 2019 18:51:03 -0800
Subject: [PATCH 132/159] Update LICENSE

---
 LICENSE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LICENSE b/LICENSE
index 7472c9eb..2d1ab131 100644
--- a/LICENSE
+++ b/LICENSE
@@ -2,7 +2,7 @@ GPL-3.0
 
 Boostnote - an open source note-taking app made for programmers just like you.
 
-Copyright (C) 2017 - 2018 BoostIO
+Copyright (C) 2017 - 2019 BoostIO
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

From 038154c4415cccca429c2d8c353822e07805e610 Mon Sep 17 00:00:00 2001
From: Milo Todt <milo@milotodt.com>
Date: Sun, 13 Jan 2019 17:21:30 -0800
Subject: [PATCH 133/159] Removed uneeded "electron-is-dev" package

---
 lib/main-app.js | 2 +-
 package.json    | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/main-app.js b/lib/main-app.js
index c5645940..57d6b26c 100644
--- a/lib/main-app.js
+++ b/lib/main-app.js
@@ -3,7 +3,7 @@ const app = electron.app
 const Menu = electron.Menu
 const ipc = electron.ipcMain
 const GhReleases = require('electron-gh-releases')
-const isDev = require('electron-is-dev') // isDev is True if running in development mode. Overide by setting ELECTRON_IS_DEV environment variable to 1
+const isDev = 'ELECTRON_IS_DEV' in process.env
 // electron.crashReporter.start()
 var ipcServer = null
 
diff --git a/package.json b/package.json
index 568d3852..95b4ecd7 100644
--- a/package.json
+++ b/package.json
@@ -59,7 +59,6 @@
     "codemirror-mode-elixir": "^1.1.1",
     "electron-config": "^1.0.0",
     "electron-gh-releases": "^2.0.4",
-    "electron-is-dev": "^1.0.1",
     "escape-string-regexp": "^1.0.5",
     "file-uri-to-path": "^1.0.0",
     "file-url": "^2.0.2",

From 99b53f4a55c6957796b345d8f6a5a19ddb3f73d7 Mon Sep 17 00:00:00 2001
From: Milo Todt <milo@milotodt.com>
Date: Sun, 13 Jan 2019 18:21:12 -0800
Subject: [PATCH 134/159] added filter.

---
 browser/main/lib/dataApi/init.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/browser/main/lib/dataApi/init.js b/browser/main/lib/dataApi/init.js
index 7f81e90b..adab0232 100644
--- a/browser/main/lib/dataApi/init.js
+++ b/browser/main/lib/dataApi/init.js
@@ -4,6 +4,7 @@ const resolveStorageData = require('./resolveStorageData')
 const resolveStorageNotes = require('./resolveStorageNotes')
 const consts = require('browser/lib/consts')
 const path = require('path')
+const fs = require('fs')
 const CSON = require('@rokt33r/season')
 /**
  * @return {Object} all storages and notes
@@ -19,11 +20,14 @@ const CSON = require('@rokt33r/season')
  * 2. legacy
  * 3. empty directory
  */
+
 function init () {
   const fetchStorages = function () {
     let rawStorages
     try {
       rawStorages = JSON.parse(window.localStorage.getItem('storages'))
+      // Remove storages who's location is inaccesible.
+      rawStorages = rawStorages.filter(storage => fs.existsSync(storage.path))
       if (!_.isArray(rawStorages)) throw new Error('Cached data is not valid.')
     } catch (e) {
       console.warn('Failed to parse cached data from localStorage', e)

From 8d817066e85f8841036dff8d122694ca27bee5a1 Mon Sep 17 00:00:00 2001
From: Milo Todt <milo@milotodt.com>
Date: Sun, 13 Jan 2019 18:35:24 -0800
Subject: [PATCH 135/159] Added a few more checks in related methods to prevent
 simular errors

---
 browser/main/lib/dataApi/init.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/browser/main/lib/dataApi/init.js b/browser/main/lib/dataApi/init.js
index adab0232..5149c263 100644
--- a/browser/main/lib/dataApi/init.js
+++ b/browser/main/lib/dataApi/init.js
@@ -40,6 +40,7 @@ function init () {
 
   const fetchNotes = function (storages) {
     const findNotesFromEachStorage = storages
+    .filter(storage => fs.existsSync(storage.path))
       .map((storage) => {
         return resolveStorageNotes(storage)
           .then((notes) => {
@@ -54,7 +55,7 @@ function init () {
                 })
               }
             })
-            if (unknownCount > 0) {
+            if (unknownCount > 0 && fs.existsSync(storage.path)) {
               CSON.writeFileSync(path.join(storage.path, 'boostnote.json'), _.pick(storage, ['folders', 'version']))
             }
             return notes

From f566b567be5ab80da1889313a3a46532b4e773b8 Mon Sep 17 00:00:00 2001
From: roottool <smart.dog.lilienthal@gmail.com>
Date: Wed, 16 Jan 2019 01:52:44 +0900
Subject: [PATCH 136/159] add zoom-in and zoom-out action of images #1448

---
 browser/components/MarkdownPreview.js | 74 +++++++++++++++++++++++++++
 browser/components/markdown.styl      |  1 +
 2 files changed, 75 insertions(+)

diff --git a/browser/components/MarkdownPreview.js b/browser/components/MarkdownPreview.js
index 4c638dc9..3a2be4ec 100755
--- a/browser/components/MarkdownPreview.js
+++ b/browser/components/MarkdownPreview.js
@@ -832,6 +832,80 @@ export default class MarkdownPreview extends React.Component {
         )
       }
     )
+
+    document.querySelectorAll('iframe').forEach(item => {
+      const rect = item.getBoundingClientRect()
+      const imgList = item.contentWindow.document.body.querySelectorAll('img')
+      for (const img of imgList) {
+        img.onclick = function () {
+          const zoomImg = document.createElement('img')
+          const magnification = document.body.clientWidth / img.width
+          const top = document.body.clientHeight / 2 - img.height * magnification / 2
+          // TODO: DRY and const animationSpeed
+          zoomImg.src = img.src
+          zoomImg.style = `
+            position: absolute;
+            top: ${top}px;
+            left: 0;
+            width: 100%;
+            height: ${img.height * magnification}px;
+            `
+          zoomImg.animate([
+            {
+              top: `${img.y + rect.top}px`,
+              left: `${img.x + rect.left}px`,
+              width: `${img.width}px`,
+              height: `${img.height}px`
+            },
+            {
+              top: `${top}px`,
+              left: 0,
+              width: `100%`,
+              height: `${img.height * magnification}px`
+            }
+          ], 300)
+
+          const overlay = document.createElement('div')
+          overlay.style = `
+            background-color: rgba(0,0,0,0.5);
+            cursor: zoom-out;
+            position: absolute;
+            top: 0;
+            left: 0;
+            width: 100%;
+            height: ${document.body.clientHeight}px;
+            z-index: 100;
+          `
+          overlay.onclick = function () {
+            zoomImg.style = `
+              position: absolute;
+              top: ${img.y + rect.top}px;
+              left: ${img.x + rect.left}px;
+              width: ${img.width}px;
+              height: ${img.height}px;
+              `
+            const zoomOutImgAnimation = zoomImg.animate([
+              {
+                top: `${top}px`,
+                left: 0,
+                width: `100%`,
+                height: `${img.height * magnification}px`
+              },
+              {
+                top: `${img.y + rect.top}px`,
+                left: `${img.x + rect.left}px`,
+                width: `${img.width}px`,
+                height: `${img.height}px`
+              }
+            ], 300)
+            zoomOutImgAnimation.onfinish = () => overlay.remove()
+          }
+
+          overlay.appendChild(zoomImg)
+          document.body.appendChild(overlay)
+        }
+      }
+    })
   }
 
   focus () {
diff --git a/browser/components/markdown.styl b/browser/components/markdown.styl
index da767a9f..89c26032 100644
--- a/browser/components/markdown.styl
+++ b/browser/components/markdown.styl
@@ -163,6 +163,7 @@ p
   white-space pre-line
   word-wrap break-word
 img
+  cursor zoom-in
   max-width 100%
 strong, b
   font-weight bold

From 72df418953336c0c6edd79f2fe12e2a8a50db051 Mon Sep 17 00:00:00 2001
From: roottool <smart.dog.lilienthal@gmail.com>
Date: Wed, 16 Jan 2019 18:10:28 +0900
Subject: [PATCH 137/159] DRY my code #1448

---
 browser/components/MarkdownPreview.js | 53 ++++++++++++---------------
 1 file changed, 23 insertions(+), 30 deletions(-)

diff --git a/browser/components/MarkdownPreview.js b/browser/components/MarkdownPreview.js
index 3a2be4ec..c3b31665 100755
--- a/browser/components/MarkdownPreview.js
+++ b/browser/components/MarkdownPreview.js
@@ -837,11 +837,24 @@ export default class MarkdownPreview extends React.Component {
       const rect = item.getBoundingClientRect()
       const imgList = item.contentWindow.document.body.querySelectorAll('img')
       for (const img of imgList) {
-        img.onclick = function () {
-          const zoomImg = document.createElement('img')
+        img.onclick = () => {
           const magnification = document.body.clientWidth / img.width
           const top = document.body.clientHeight / 2 - img.height * magnification / 2
-          // TODO: DRY and const animationSpeed
+          const animationSpeed = 300
+          const originalImgRect = {
+            top: `${img.y + rect.top}px`,
+            left: `${img.x + rect.left}px`,
+            width: `${img.width}px`,
+            height: `${img.height}px`
+          }
+          const zoomInImgRect = {
+            top: `${top}px`,
+            left: 0,
+            width: `100%`,
+            height: `${img.height * magnification}px`
+          }
+
+          const zoomImg = document.createElement('img')
           zoomImg.src = img.src
           zoomImg.style = `
             position: absolute;
@@ -851,19 +864,9 @@ export default class MarkdownPreview extends React.Component {
             height: ${img.height * magnification}px;
             `
           zoomImg.animate([
-            {
-              top: `${img.y + rect.top}px`,
-              left: `${img.x + rect.left}px`,
-              width: `${img.width}px`,
-              height: `${img.height}px`
-            },
-            {
-              top: `${top}px`,
-              left: 0,
-              width: `100%`,
-              height: `${img.height * magnification}px`
-            }
-          ], 300)
+            originalImgRect,
+            zoomInImgRect
+          ], animationSpeed)
 
           const overlay = document.createElement('div')
           overlay.style = `
@@ -876,7 +879,7 @@ export default class MarkdownPreview extends React.Component {
             height: ${document.body.clientHeight}px;
             z-index: 100;
           `
-          overlay.onclick = function () {
+          overlay.onclick = () => {
             zoomImg.style = `
               position: absolute;
               top: ${img.y + rect.top}px;
@@ -885,19 +888,9 @@ export default class MarkdownPreview extends React.Component {
               height: ${img.height}px;
               `
             const zoomOutImgAnimation = zoomImg.animate([
-              {
-                top: `${top}px`,
-                left: 0,
-                width: `100%`,
-                height: `${img.height * magnification}px`
-              },
-              {
-                top: `${img.y + rect.top}px`,
-                left: `${img.x + rect.left}px`,
-                width: `${img.width}px`,
-                height: `${img.height}px`
-              }
-            ], 300)
+              zoomInImgRect,
+              originalImgRect
+            ], animationSpeed)
             zoomOutImgAnimation.onfinish = () => overlay.remove()
           }
 

From ea5970ab1cc62c596bd254fa820b005e5700570b Mon Sep 17 00:00:00 2001
From: roottool <smart.dog.lilienthal@gmail.com>
Date: Wed, 16 Jan 2019 22:47:42 +0900
Subject: [PATCH 138/159] change a magnification by image size #1448

---
 browser/components/MarkdownPreview.js | 39 ++++++++++++++++-----------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/browser/components/MarkdownPreview.js b/browser/components/MarkdownPreview.js
index c3b31665..7a74c4f6 100755
--- a/browser/components/MarkdownPreview.js
+++ b/browser/components/MarkdownPreview.js
@@ -838,30 +838,39 @@ export default class MarkdownPreview extends React.Component {
       const imgList = item.contentWindow.document.body.querySelectorAll('img')
       for (const img of imgList) {
         img.onclick = () => {
-          const magnification = document.body.clientWidth / img.width
-          const top = document.body.clientHeight / 2 - img.height * magnification / 2
-          const animationSpeed = 300
+          const widthMagnification = document.body.clientWidth / img.width
+          const heightMagnification = document.body.clientHeight / img.height
+          const baseOnWidth = widthMagnification < heightMagnification
+          const magnification = baseOnWidth ? widthMagnification : heightMagnification
+
+          const zoomImgWidth = img.width * magnification
+          const zoomImgHeight = img.height * magnification
+          const zoomInImgTop = document.body.clientHeight / 2 - zoomImgHeight / 2
+          const zoomInImgLeft = document.body.clientWidth / 2 - zoomImgWidth / 2
+          const originalImgTop = img.y + rect.top
+          const originalImgLeft = img.x + rect.left
           const originalImgRect = {
-            top: `${img.y + rect.top}px`,
-            left: `${img.x + rect.left}px`,
+            top: `${originalImgTop}px`,
+            left: `${originalImgLeft}px`,
             width: `${img.width}px`,
             height: `${img.height}px`
           }
           const zoomInImgRect = {
-            top: `${top}px`,
-            left: 0,
-            width: `100%`,
-            height: `${img.height * magnification}px`
+            top: `${baseOnWidth ? zoomInImgTop : 0}px`,
+            left: `${baseOnWidth ? 0 : zoomInImgLeft}px`,
+            width: `${zoomImgWidth}px`,
+            height: `${zoomImgHeight}px`
           }
+          const animationSpeed = 300
 
           const zoomImg = document.createElement('img')
           zoomImg.src = img.src
           zoomImg.style = `
             position: absolute;
-            top: ${top}px;
-            left: 0;
-            width: 100%;
-            height: ${img.height * magnification}px;
+            top: ${baseOnWidth ? zoomInImgTop : 0}px;
+            left: ${baseOnWidth ? 0 : zoomInImgLeft}px;
+            width: ${zoomImgWidth};
+            height: ${zoomImgHeight}px;
             `
           zoomImg.animate([
             originalImgRect,
@@ -882,8 +891,8 @@ export default class MarkdownPreview extends React.Component {
           overlay.onclick = () => {
             zoomImg.style = `
               position: absolute;
-              top: ${img.y + rect.top}px;
-              left: ${img.x + rect.left}px;
+              top: ${originalImgTop}px;
+              left: ${originalImgLeft}px;
               width: ${img.width}px;
               height: ${img.height}px;
               `

From 294bf742cdd2b9dfbd589e991cd7687490047d41 Mon Sep 17 00:00:00 2001
From: roottool <smart.dog.lilienthal@gmail.com>
Date: Wed, 16 Jan 2019 23:14:21 +0900
Subject: [PATCH 139/159] change variable name #1448

---
 browser/components/MarkdownPreview.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/browser/components/MarkdownPreview.js b/browser/components/MarkdownPreview.js
index 7a74c4f6..abaebad3 100755
--- a/browser/components/MarkdownPreview.js
+++ b/browser/components/MarkdownPreview.js
@@ -845,8 +845,8 @@ export default class MarkdownPreview extends React.Component {
 
           const zoomImgWidth = img.width * magnification
           const zoomImgHeight = img.height * magnification
-          const zoomInImgTop = document.body.clientHeight / 2 - zoomImgHeight / 2
-          const zoomInImgLeft = document.body.clientWidth / 2 - zoomImgWidth / 2
+          const zoomImgTop = document.body.clientHeight / 2 - zoomImgHeight / 2
+          const zoomImgLeft = document.body.clientWidth / 2 - zoomImgWidth / 2
           const originalImgTop = img.y + rect.top
           const originalImgLeft = img.x + rect.left
           const originalImgRect = {
@@ -856,8 +856,8 @@ export default class MarkdownPreview extends React.Component {
             height: `${img.height}px`
           }
           const zoomInImgRect = {
-            top: `${baseOnWidth ? zoomInImgTop : 0}px`,
-            left: `${baseOnWidth ? 0 : zoomInImgLeft}px`,
+            top: `${baseOnWidth ? zoomImgTop : 0}px`,
+            left: `${baseOnWidth ? 0 : zoomImgLeft}px`,
             width: `${zoomImgWidth}px`,
             height: `${zoomImgHeight}px`
           }
@@ -867,8 +867,8 @@ export default class MarkdownPreview extends React.Component {
           zoomImg.src = img.src
           zoomImg.style = `
             position: absolute;
-            top: ${baseOnWidth ? zoomInImgTop : 0}px;
-            left: ${baseOnWidth ? 0 : zoomInImgLeft}px;
+            top: ${baseOnWidth ? zoomImgTop : 0}px;
+            left: ${baseOnWidth ? 0 : zoomImgLeft}px;
             width: ${zoomImgWidth};
             height: ${zoomImgHeight}px;
             `

From 3fe45e9cbb9ef8a13c5ee21f7bf7ba1f6fe8dc45 Mon Sep 17 00:00:00 2001
From: Milo Todt <milo@milotodt.com>
Date: Wed, 16 Jan 2019 16:09:07 -0800
Subject: [PATCH 140/159] Added cheatsheets to menu

---
 lib/main-menu.js | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/lib/main-menu.js b/lib/main-menu.js
index 05921347..dcd85217 100644
--- a/lib/main-menu.js
+++ b/lib/main-menu.js
@@ -383,6 +383,27 @@ const help = {
     {
       label: 'Changelog',
       click () { shell.openExternal('https://github.com/BoostIO/boost-releases') }
+    },
+    {
+      label: 'Cheatsheets',
+      submenu: [
+        {
+          label: 'Markdown',
+          click () { shell.openExternal('https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet') }
+        },
+        {
+          label: 'Latex',
+          click () { shell.openExternal('https://katex.org/docs/supported.html') }
+        },
+        {
+          label: 'HTML',
+          click () { shell.openExternal('https://htmlcheatsheet.com/') }
+        },
+        {
+          label: 'Boostnote',
+          click () { shell.openExternal('https://github.com/TobseF/boostnote-markdown-cheatsheet/blob/master/BOOSTNOTE_MARKDOWN_CHEAT_SHEET.md') }
+        }
+      ]
     }
   ]
 }

From eea01f10ace4d8393875ede77a868c84ea1a1661 Mon Sep 17 00:00:00 2001
From: Milo Todt <milo@milotodt.com>
Date: Thu, 17 Jan 2019 17:00:07 -0800
Subject: [PATCH 141/159] Added catch for exceptions, removed uneeded duplicate
 test.

---
 browser/main/lib/dataApi/init.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/browser/main/lib/dataApi/init.js b/browser/main/lib/dataApi/init.js
index 5149c263..0dbcc182 100644
--- a/browser/main/lib/dataApi/init.js
+++ b/browser/main/lib/dataApi/init.js
@@ -55,8 +55,12 @@ function init () {
                 })
               }
             })
-            if (unknownCount > 0 && fs.existsSync(storage.path)) {
-              CSON.writeFileSync(path.join(storage.path, 'boostnote.json'), _.pick(storage, ['folders', 'version']))
+            if (unknownCount > 0) {
+              try {
+                CSON.writeFileSync(path.join(storage.path, 'boostnote.json'), _.pick(storage, ['folders', 'version']))
+              } catch (e) {
+                console.log('Error writting boostnote.json: ' + e + ' from init.js')
+              }
             }
             return notes
           })

From c3a980836ad74ced7a0738b65bcc3ded674bdc33 Mon Sep 17 00:00:00 2001
From: Milo Todt <milo@milotodt.com>
Date: Sun, 20 Jan 2019 21:04:56 -0800
Subject: [PATCH 142/159] change to isDev

---
 lib/main-app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/main-app.js b/lib/main-app.js
index 57d6b26c..7225dd9b 100644
--- a/lib/main-app.js
+++ b/lib/main-app.js
@@ -3,7 +3,7 @@ const app = electron.app
 const Menu = electron.Menu
 const ipc = electron.ipcMain
 const GhReleases = require('electron-gh-releases')
-const isDev = 'ELECTRON_IS_DEV' in process.env
+const isDev = 'ELECTRON_IS_DEV' in process.env && process.env.NODE_ENV !== 'production'
 // electron.crashReporter.start()
 var ipcServer = null
 

From b32865488e427f116067d9451f27e5e49d64470a Mon Sep 17 00:00:00 2001
From: Nguyen Viet Hung <viethungax@gmail.com>
Date: Tue, 22 Jan 2019 16:07:44 +0700
Subject: [PATCH 143/159] fixed app body background (#2791)

---
 browser/main/global.styl | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/browser/main/global.styl b/browser/main/global.styl
index e04060c2..d864993d 100644
--- a/browser/main/global.styl
+++ b/browser/main/global.styl
@@ -97,6 +97,7 @@ modalBackColor = white
 
 
 body[data-theme="dark"]
+  background-color $ui-dark-backgroundColor
   ::-webkit-scrollbar-thumb
     background-color rgba(0, 0, 0, 0.3)
   .ModalBase
@@ -148,6 +149,7 @@ body[data-theme="dark"]
   z-index modalZIndex + 5
 
 body[data-theme="solarized-dark"]
+  background-color $ui-solarized-dark-backgroundColor
   ::-webkit-scrollbar-thumb
     background-color rgba(0, 0, 0, 0.3)
   .ModalBase
@@ -157,6 +159,7 @@ body[data-theme="solarized-dark"]
     color: $ui-solarized-dark-text-color
 
 body[data-theme="monokai"]
+  background-color $ui-monokai-backgroundColor
   ::-webkit-scrollbar-thumb
     background-color rgba(0, 0, 0, 0.3)
   .ModalBase
@@ -166,6 +169,7 @@ body[data-theme="monokai"]
     color: $ui-monokai-text-color
 
 body[data-theme="dracula"]
+  background-color $ui-dracula-backgroundColor
   ::-webkit-scrollbar-thumb
     background-color rgba(0, 0, 0, 0.3)
   .ModalBase

From 667ece7d3f3f52ae8e468b727da68a7531f38fe9 Mon Sep 17 00:00:00 2001
From: Milo Todt <milo@milotodt.com>
Date: Tue, 22 Jan 2019 19:59:27 -0800
Subject: [PATCH 144/159] Update main-app.js

---
 lib/main-app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/main-app.js b/lib/main-app.js
index 7225dd9b..88e44294 100644
--- a/lib/main-app.js
+++ b/lib/main-app.js
@@ -3,7 +3,7 @@ const app = electron.app
 const Menu = electron.Menu
 const ipc = electron.ipcMain
 const GhReleases = require('electron-gh-releases')
-const isDev = 'ELECTRON_IS_DEV' in process.env && process.env.NODE_ENV !== 'production'
+const isDev = process.env.NODE_ENV !== 'production'
 // electron.crashReporter.start()
 var ipcServer = null
 

From 33fb03066edc3dcc2af2754eac6c0471ceac4a88 Mon Sep 17 00:00:00 2001
From: roottool <smart.dog.lilienthal@gmail.com>
Date: Fri, 25 Jan 2019 20:06:43 +0900
Subject: [PATCH 145/159] Reduced the count of calculation

---
 browser/components/MarkdownPreview.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/browser/components/MarkdownPreview.js b/browser/components/MarkdownPreview.js
index abaebad3..8ee90e37 100755
--- a/browser/components/MarkdownPreview.js
+++ b/browser/components/MarkdownPreview.js
@@ -845,8 +845,8 @@ export default class MarkdownPreview extends React.Component {
 
           const zoomImgWidth = img.width * magnification
           const zoomImgHeight = img.height * magnification
-          const zoomImgTop = document.body.clientHeight / 2 - zoomImgHeight / 2
-          const zoomImgLeft = document.body.clientWidth / 2 - zoomImgWidth / 2
+        const zoomImgTop = (document.body.clientHeight - zoomImgHeight) / 2
+        const zoomImgLeft = (document.body.clientWidth - zoomImgWidth) / 2
           const originalImgTop = img.y + rect.top
           const originalImgLeft = img.x + rect.left
           const originalImgRect = {

From 4cce52f9ce34c85a4feedb92a3f83e67c22931c9 Mon Sep 17 00:00:00 2001
From: roottool <smart.dog.lilienthal@gmail.com>
Date: Fri, 25 Jan 2019 23:17:05 +0900
Subject: [PATCH 146/159] changed default editor font #1995

---
 browser/main/lib/ConfigManager.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser/main/lib/ConfigManager.js b/browser/main/lib/ConfigManager.js
index 059589d0..8512ce26 100644
--- a/browser/main/lib/ConfigManager.js
+++ b/browser/main/lib/ConfigManager.js
@@ -41,7 +41,7 @@ export const DEFAULT_CONFIG = {
     theme: 'base16-light',
     keyMap: 'sublime',
     fontSize: '14',
-    fontFamily: win ? 'Segoe UI' : 'Monaco, Consolas',
+    fontFamily: win ? 'Consolas' : 'Monaco',
     indentType: 'space',
     indentSize: '2',
     enableRulers: false,

From 1683d63f33337f87386e9c28f3b439eefff84bc4 Mon Sep 17 00:00:00 2001
From: roottool <smart.dog.lilienthal@gmail.com>
Date: Sat, 26 Jan 2019 01:03:37 +0900
Subject: [PATCH 147/159] Modified indent

---
 browser/components/MarkdownPreview.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/browser/components/MarkdownPreview.js b/browser/components/MarkdownPreview.js
index 8ee90e37..e93312ef 100755
--- a/browser/components/MarkdownPreview.js
+++ b/browser/components/MarkdownPreview.js
@@ -845,8 +845,8 @@ export default class MarkdownPreview extends React.Component {
 
           const zoomImgWidth = img.width * magnification
           const zoomImgHeight = img.height * magnification
-        const zoomImgTop = (document.body.clientHeight - zoomImgHeight) / 2
-        const zoomImgLeft = (document.body.clientWidth - zoomImgWidth) / 2
+          const zoomImgTop = (document.body.clientHeight - zoomImgHeight) / 2
+          const zoomImgLeft = (document.body.clientWidth - zoomImgWidth) / 2
           const originalImgTop = img.y + rect.top
           const originalImgLeft = img.x + rect.left
           const originalImgRect = {

From 4b1469748be941259adc040cb29c0150498e360c Mon Sep 17 00:00:00 2001
From: Junyoung Choi <fluke8259@gmail.com>
Date: Sat, 26 Jan 2019 12:25:05 +0900
Subject: [PATCH 148/159] v0.11.13

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 95b4ecd7..c448264d 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "boost",
   "productName": "Boostnote",
-  "version": "0.11.12",
+  "version": "0.11.13",
   "main": "index.js",
   "description": "Boostnote",
   "license": "GPL-3.0",

From 79254a562fa7bf093ae68c554dee6c0963217eba Mon Sep 17 00:00:00 2001
From: Junyoung Choi <fluke8259@gmail.com>
Date: Sat, 26 Jan 2019 12:29:20 +0900
Subject: [PATCH 149/159] Update contributors

---
 package.json | 5 +++--
 readme.md    | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index c448264d..62a0ced8 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,7 @@
     "storage",
     "electron"
   ],
-  "author": "Dick Choi <fluke8259@gmail.com> (https://github.com/Rokt33r)",
+  "author": "Junyoung Choi <fluke8259@gmail.com> (https://github.com/Rokt33r)",
   "contributors": [
     "Kazu Yokomizo (https://github.com/kazup01)",
     "dojineko (https://github.com/dojineko)",
@@ -41,7 +41,8 @@
     "Yoshihisa Mochihara (https://github.com/yosmoc)",
     "Mike Resoli (https://github.com/mikeres0)",
     "tjado (https://github.com/tejado)",
-    "Sota Sugiura (https://github.com/sota1235)"
+    "Sota Sugiura (https://github.com/sota1235)",
+    "Milo Todt (https://github.com/MiloTodt)"
   ],
   "bugs": {
     "url": "https://github.com/BoostIO/Boostnote/issues"
diff --git a/readme.md b/readme.md
index d1eb710b..5657cb0a 100644
--- a/readme.md
+++ b/readme.md
@@ -12,6 +12,7 @@
  </p>
 
 ## Authors & Maintainers
+
 - [Rokt33r](https://github.com/rokt33r)
 - [Sosuke](https://github.com/sosukesuzuki)
 - [Kazz](https://github.com/kazup01)
@@ -23,7 +24,7 @@ Thank you to all the people who have contributed to Boostnote!
 <a href="https://github.com/BoostIO/Boostnote/graphs/contributors"><img src="https://opencollective.com/boostnoteio/contributors.svg?width=890" /></a>
 
 ## Supporting Boostnote
-Boostnote is an open source project. It's an independent project with its ongoing development made possible thanks to the support by our amazing backers. 
+Boostnote is an open source project. It's an independent project with its ongoing development made possible thanks to the support by our amazing backers.
 
 Issues on Boostnote can be funded by anyone and the money will be distributed to contributors and maintainers. If you use Boostnote please consider becoming a backer:
 

From 74535c9cba3eec9b037f85d8c3d03220747cc518 Mon Sep 17 00:00:00 2001
From: Junyoung Choi <fluke8259@gmail.com>
Date: Sat, 26 Jan 2019 12:30:22 +0900
Subject: [PATCH 150/159] Update yarn.lock

---
 yarn.lock | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 604880e5..c6fce749 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4337,6 +4337,11 @@ he@^1.1.1:
   version "1.1.1"
   resolved "http://registry.npm.taobao.org/he/download/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
 
+highlight.js@^9.13.1:
+  version "9.13.1"
+  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.13.1.tgz#054586d53a6863311168488a0f58d6c505ce641e"
+  integrity sha512-Sc28JNQNDzaH6PORtRLMvif9RSn1mYuOoX3omVjnb0+HbpPygU2ALBI0R/wsiqCb4/fcp07Gdo8g+fhtFrQl6A==
+
 highlight.js@^9.3.0:
   version "9.12.0"
   resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.12.0.tgz#e6d9dbe57cbefe60751f02af336195870c90c01e"
@@ -4652,6 +4657,11 @@ invariant@^2.0.0, invariant@^2.2.1, invariant@^2.2.2:
   dependencies:
     loose-envify "^1.0.0"
 
+invert-color@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/invert-color/-/invert-color-2.0.0.tgz#894ab1f7494a6e45f5e74c2f99ec042cd67dd23e"
+  integrity sha512-9s6IATlhOAr0/0MPUpLdMpk81ixIu8IqwPwORssXBauFT/4ff/iyEOcojd0UYuPwkDbJvL1+blIZGhqVIaAm5Q==
+
 invert-kv@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
@@ -6316,9 +6326,10 @@ mousetrap-global-bind@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/mousetrap-global-bind/-/mousetrap-global-bind-1.1.0.tgz#cd7de9222bd0646fa2e010d54c84a74c26a88edd"
 
-mousetrap@^1.6.1:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/mousetrap/-/mousetrap-1.6.1.tgz#2a085f5c751294c75e7e81f6ec2545b29cbf42d9"
+mousetrap@^1.6.2:
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/mousetrap/-/mousetrap-1.6.2.tgz#caadd9cf886db0986fb2fee59a82f6bd37527587"
+  integrity sha512-jDjhi7wlHwdO6q6DS7YRmSHcuI+RVxadBkLt3KHrhd3C2b+w5pKefg3oj5beTcHZyVFA9Aksf+yEE1y5jxUjVA==
 
 ms@2.0.0:
   version "2.0.0"

From a113b99de0eb37f3f2ac09fa09a55d007e882097 Mon Sep 17 00:00:00 2001
From: ehhc <ehhc@users.noreply.github.com>
Date: Sat, 26 Jan 2019 17:21:53 +0100
Subject: [PATCH 151/159] Strange url-handling reverted + tests modified so
 that they might find that issue in the future + test modified so that they
 both contain tests for posix and windows path separator -> fixes #2834

---
 .../main/lib/dataApi/attachmentManagement.js  |  15 +-
 tests/dataApi/attachmentManagement.test.js    | 161 +++++++++++-------
 2 files changed, 105 insertions(+), 71 deletions(-)

diff --git a/browser/main/lib/dataApi/attachmentManagement.js b/browser/main/lib/dataApi/attachmentManagement.js
index 6a0315f7..1d1d36ac 100644
--- a/browser/main/lib/dataApi/attachmentManagement.js
+++ b/browser/main/lib/dataApi/attachmentManagement.js
@@ -227,15 +227,7 @@ function migrateAttachments (markdownContent, storagePath, noteKey) {
  * @returns {String} postprocessed HTML in which all :storage references are mapped to the actual paths.
  */
 function fixLocalURLS (renderedHTML, storagePath) {
-  /*
-    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) {
+  return renderedHTML.replace(new RegExp('/?' + STORAGE_FOLDER_PLACEHOLDER + '.*?"', '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))
   })
@@ -429,7 +421,10 @@ function replaceNoteKeyWithNewNoteKey (noteContent, oldNoteKey, newNoteKey) {
  * @returns {String} Input without the references
  */
 function removeStorageAndNoteReferences (input, noteKey) {
-  return input.replace(new RegExp(mdurl.encode(path.sep), 'g'), path.sep).replace(new RegExp(STORAGE_FOLDER_PLACEHOLDER + '(' + escapeStringRegexp(path.sep) + noteKey + ')?', 'g'), DESTINATION_FOLDER)
+  return input.replace(new RegExp('/?' + STORAGE_FOLDER_PLACEHOLDER + '.*?("|])', '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 + '(' + escapeStringRegexp(path.sep) + noteKey + ')?', 'g'), DESTINATION_FOLDER)
 }
 
 /**
diff --git a/tests/dataApi/attachmentManagement.test.js b/tests/dataApi/attachmentManagement.test.js
index a4cc8082..470df436 100644
--- a/tests/dataApi/attachmentManagement.test.js
+++ b/tests/dataApi/attachmentManagement.test.js
@@ -171,6 +171,7 @@ it('should replace the all ":storage" path with the actual storage path', functi
 
 it('should replace the ":storage" path with the actual storage path when they have different path separators', function () {
   const storageFolder = systemUnderTest.DESTINATION_FOLDER
+  const noteKey = '9c9c4ba3-bc1e-441f-9866-c1e9a806e31c'
   const testInput =
     '<html>\n' +
     '    <head>\n' +
@@ -179,10 +180,10 @@ it('should replace the ":storage" path with the actual storage path when they ha
     '    <body data-theme="default">\n' +
     '        <h2 data-line="0" id="Headline">Headline</h2>\n' +
     '        <p data-line="2">\n' +
-    '            <img src=":storage' + mdurl.encode(path.win32.sep) + '0.6r4zdgc22xp.png" alt="dummyImage.png" >\n' +
+    '            <img src=":storage' + mdurl.encode(path.win32.sep) + noteKey + mdurl.encode(path.win32.sep) + '0.6r4zdgc22xp.png" alt="dummyImage.png" >\n' +
     '        </p>\n' +
     '        <p data-line="4">\n' +
-    '            <a href=":storage' + mdurl.encode(path.posix.sep) + '0.q2i4iw0fyx.pdf">dummyPDF.pdf</a>\n' +
+    '            <a href=":storage' + mdurl.encode(path.posix.sep) + noteKey + mdurl.encode(path.posix.sep) + '0.q2i4iw0fyx.pdf">dummyPDF.pdf</a>\n' +
     '        </p>\n' +
     '    </body>\n' +
     '</html>'
@@ -195,10 +196,10 @@ it('should replace the ":storage" path with the actual storage path when they ha
     '    <body data-theme="default">\n' +
     '        <h2 data-line="0" id="Headline">Headline</h2>\n' +
     '        <p data-line="2">\n' +
-    '            <img src="file:///' + storagePath + path.sep + storageFolder + path.sep + '0.6r4zdgc22xp.png" alt="dummyImage.png" >\n' +
+    '            <img src="file:///' + storagePath + path.sep + storageFolder + path.sep + noteKey + path.sep + '0.6r4zdgc22xp.png" alt="dummyImage.png" >\n' +
     '        </p>\n' +
     '        <p data-line="4">\n' +
-    '            <a href="file:///' + storagePath + path.sep + storageFolder + path.sep + '0.q2i4iw0fyx.pdf">dummyPDF.pdf</a>\n' +
+    '            <a href="file:///' + storagePath + path.sep + storageFolder + path.sep + noteKey + path.sep + '0.q2i4iw0fyx.pdf">dummyPDF.pdf</a>\n' +
     '        </p>\n' +
     '    </body>\n' +
     '</html>'
@@ -251,28 +252,17 @@ it('should test that getAttachmentsInMarkdownContent finds all attachments when
 
 it('should test that getAbsolutePathsOfAttachmentsInContent returns all absolute paths', function () {
   const dummyStoragePath = 'dummyStoragePath'
-  const testInput =
-    '<html>\n' +
-    '    <head>\n' +
-    '        //header\n' +
-    '    </head>\n' +
-    '    <body data-theme="default">\n' +
-    '        <h2 data-line="0" id="Headline">Headline</h2>\n' +
-    '        <p data-line="2">\n' +
-    '            <img src=":storage' + mdurl.encode(path.sep) + '9c9c4ba3-bc1e-441f-9866-c1e9a806e31c' + mdurl.encode(path.sep) + '0.6r4zdgc22xp.png" alt="dummyImage.png" >\n' +
-    '        </p>\n' +
-    '        <p data-line="4">\n' +
-    '            <a href=":storage' + mdurl.encode(path.sep) + '9c9c4ba3-bc1e-441f-9866-c1e9a806e31c' + mdurl.encode(path.sep) + '0.q2i4iw0fyx.pdf">dummyPDF.pdf</a>\n' +
-    '        </p>\n' +
-    '        <p data-line="6">\n' +
-    '            <img src=":storage' + mdurl.encode(path.sep) + '9c9c4ba3-bc1e-441f-9866-c1e9a806e31c' + mdurl.encode(path.sep) + 'd6c5ee92.jpg" alt="dummyImage2.jpg">\n' +
-    '        </p>\n' +
-    '    </body>\n' +
-    '</html>'
+  const noteKey = '9c9c4ba3-bc1e-441f-9866-c1e9a806e31c'
+  const testInput = '"# Test\n' +
+    '\n' +
+    '![Screenshot1](:storage' + path.win32.sep + noteKey + path.win32.sep + '0.6r4zdgc22xp.png)\n' +
+    '![Screenshot2](:storage' + path.posix.sep + noteKey + path.posix.sep + '0.q2i4iw0fyx.pdf)\n' +
+    '![Screenshot3](:storage' + path.win32.sep + noteKey + path.posix.sep + 'd6c5ee92.jpg)"'
+
   const actual = systemUnderTest.getAbsolutePathsOfAttachmentsInContent(testInput, dummyStoragePath)
-  const expected = [dummyStoragePath + path.sep + systemUnderTest.DESTINATION_FOLDER + path.sep + '9c9c4ba3-bc1e-441f-9866-c1e9a806e31c' + path.sep + '0.6r4zdgc22xp.png',
-    dummyStoragePath + path.sep + systemUnderTest.DESTINATION_FOLDER + path.sep + '9c9c4ba3-bc1e-441f-9866-c1e9a806e31c' + path.sep + '0.q2i4iw0fyx.pdf',
-    dummyStoragePath + path.sep + systemUnderTest.DESTINATION_FOLDER + path.sep + '9c9c4ba3-bc1e-441f-9866-c1e9a806e31c' + path.sep + 'd6c5ee92.jpg']
+  const expected = [dummyStoragePath + path.sep + systemUnderTest.DESTINATION_FOLDER + path.sep + noteKey + path.sep + '0.6r4zdgc22xp.png',
+    dummyStoragePath + path.sep + systemUnderTest.DESTINATION_FOLDER + path.sep + noteKey + path.sep + '0.q2i4iw0fyx.pdf',
+    dummyStoragePath + path.sep + systemUnderTest.DESTINATION_FOLDER + path.sep + noteKey + path.sep + 'd6c5ee92.jpg']
   expect(actual).toEqual(expect.arrayContaining(expected))
 })
 
@@ -287,13 +277,13 @@ it('should remove the all ":storage" and noteKey references', function () {
     '    <body data-theme="default">\n' +
     '        <h2 data-line="0" id="Headline">Headline</h2>\n' +
     '        <p data-line="2">\n' +
-    '            <img src=":storage' + mdurl.encode(path.sep) + noteKey + mdurl.encode(path.sep) + '0.6r4zdgc22xp.png" alt="dummyImage.png" >\n' +
+    '            <img src=":storage' + mdurl.encode(path.win32.sep) + noteKey + mdurl.encode(path.win32.sep) + '0.6r4zdgc22xp.png" alt="dummyImage.png" >\n' +
     '        </p>\n' +
     '        <p data-line="4">\n' +
-    '            <a href=":storage' + mdurl.encode(path.sep) + noteKey + mdurl.encode(path.sep) + '0.q2i4iw0fyx.pdf">dummyPDF.pdf</a>\n' +
+    '            <a href=":storage' + mdurl.encode(path.posix.sep) + noteKey + mdurl.encode(path.posix.sep) + '0.q2i4iw0fyx.pdf">dummyPDF.pdf</a>\n' +
     '        </p>\n' +
     '        <p data-line="6">\n' +
-    '            <img src=":storage' + mdurl.encode(path.sep) + noteKey + mdurl.encode(path.sep) + 'd6c5ee92.jpg" alt="dummyImage2.jpg">\n' +
+    '            <img src=":storage' + mdurl.encode(path.win32.sep) + noteKey + mdurl.encode(path.posix.sep) + 'd6c5ee92.jpg" alt="dummyImage2.jpg">\n' +
     '        </p>\n' +
     '    </body>\n' +
     '</html>'
@@ -323,8 +313,8 @@ it('should make sure that "removeStorageAndNoteReferences" works with markdown c
   const noteKey = 'noteKey'
   const testInput =
     'Test input' +
-    '![' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.sep + noteKey + path.sep + 'image.jpg](imageName}) \n' +
-    '[' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.sep + noteKey + path.sep + 'pdf.pdf](pdf})'
+    '![' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.win32.sep + noteKey + path.win32.sep + 'image.jpg](imageName}) \n' +
+    '[' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.posix.sep + noteKey + path.posix.sep + 'pdf.pdf](pdf})'
 
   const expectedOutput =
     'Test input' +
@@ -476,8 +466,8 @@ it('should test that moveAttachments returns a correct modified content version'
   const newNoteKey = 'newNoteKey'
   const testInput =
     'Test input' +
-    '![' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.sep + oldNoteKey + path.sep + 'image.jpg](imageName}) \n' +
-    '[' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.sep + oldNoteKey + path.sep + 'pdf.pdf](pdf})'
+    '![' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.win32.sep + oldNoteKey + path.win32.sep + 'image.jpg](imageName}) \n' +
+    '[' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.posix.sep + oldNoteKey + path.posix.sep + 'pdf.pdf](pdf})'
   const expectedOutput =
     'Test input' +
     '![' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.sep + newNoteKey + path.sep + 'image.jpg](imageName}) \n' +
@@ -492,8 +482,8 @@ it('should test that cloneAttachments modifies the content of the new note corre
   const newNote = {key: 'newNoteKey', content: 'oldNoteContent', storage: 'storageKey', type: 'MARKDOWN_NOTE'}
   const testInput =
     'Test input' +
-    '![' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.sep + oldNote.key + path.sep + 'image.jpg](imageName}) \n' +
-    '[' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.sep + oldNote.key + path.sep + 'pdf.pdf](pdf})'
+    '![' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.win32.sep + oldNote.key + path.win32.sep + 'image.jpg](imageName}) \n' +
+    '[' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.posix.sep + oldNote.key + path.posix.sep + 'pdf.pdf](pdf})'
   newNote.content = testInput
   findStorage.findStorage = jest.fn()
   findStorage.findStorage.mockReturnValue({path: 'dummyStoragePath'})
@@ -516,8 +506,8 @@ it('should test that cloneAttachments finds all attachments and copies them to t
   const newNote = {key: 'newNoteKey', content: 'oldNoteContent', storage: 'storageKeyNewNote', type: 'MARKDOWN_NOTE'}
   const testInput =
     'Test input' +
-    '![' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.sep + oldNote.key + path.sep + 'image.jpg](imageName}) \n' +
-    '[' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.sep + oldNote.key + path.sep + 'pdf.pdf](pdf})'
+    '![' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.win32.sep + oldNote.key + path.win32.sep + 'image.jpg](imageName}) \n' +
+    '[' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.posix.sep + oldNote.key + path.posix.sep + 'pdf.pdf](pdf})'
   oldNote.content = testInput
   newNote.content = testInput
 
@@ -566,14 +556,22 @@ it('should test that isAttachmentLink works correctly', function () {
   expect(systemUnderTest.isAttachmentLink('text')).toBe(false)
   expect(systemUnderTest.isAttachmentLink('text [linkText](link)')).toBe(false)
   expect(systemUnderTest.isAttachmentLink('text ![linkText](link)')).toBe(false)
-  expect(systemUnderTest.isAttachmentLink('[linkText](' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.sep + 'noteKey' + path.sep + 'pdf.pdf)')).toBe(true)
-  expect(systemUnderTest.isAttachmentLink('![linkText](' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.sep + 'noteKey' + path.sep + 'pdf.pdf )')).toBe(true)
-  expect(systemUnderTest.isAttachmentLink('text [ linkText](' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.sep + 'noteKey' + path.sep + 'pdf.pdf)')).toBe(true)
-  expect(systemUnderTest.isAttachmentLink('text ![linkText ](' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.sep + 'noteKey' + path.sep + 'pdf.pdf)')).toBe(true)
-  expect(systemUnderTest.isAttachmentLink('[linkText](' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.sep + 'noteKey' + path.sep + 'pdf.pdf) test')).toBe(true)
-  expect(systemUnderTest.isAttachmentLink('![linkText](' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.sep + 'noteKey' + path.sep + 'pdf.pdf) test')).toBe(true)
-  expect(systemUnderTest.isAttachmentLink('text [linkText](' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.sep + 'noteKey' + path.sep + 'pdf.pdf) test')).toBe(true)
-  expect(systemUnderTest.isAttachmentLink('text ![linkText](' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.sep + 'noteKey' + path.sep + 'pdf.pdf) test')).toBe(true)
+  expect(systemUnderTest.isAttachmentLink('[linkText](' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.win32.sep + 'noteKey' + path.win32.sep + 'pdf.pdf)')).toBe(true)
+  expect(systemUnderTest.isAttachmentLink('![linkText](' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.win32.sep + 'noteKey' + path.win32.sep + 'pdf.pdf )')).toBe(true)
+  expect(systemUnderTest.isAttachmentLink('text [ linkText](' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.win32.sep + 'noteKey' + path.win32.sep + 'pdf.pdf)')).toBe(true)
+  expect(systemUnderTest.isAttachmentLink('text ![linkText ](' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.win32.sep + 'noteKey' + path.win32.sep + 'pdf.pdf)')).toBe(true)
+  expect(systemUnderTest.isAttachmentLink('[linkText](' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.win32.sep + 'noteKey' + path.win32.sep + 'pdf.pdf) test')).toBe(true)
+  expect(systemUnderTest.isAttachmentLink('![linkText](' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.win32.sep + 'noteKey' + path.win32.sep + 'pdf.pdf) test')).toBe(true)
+  expect(systemUnderTest.isAttachmentLink('text [linkText](' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.win32.sep + 'noteKey' + path.win32.sep + 'pdf.pdf) test')).toBe(true)
+  expect(systemUnderTest.isAttachmentLink('text ![linkText](' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.win32.sep + 'noteKey' + path.win32.sep + 'pdf.pdf) test')).toBe(true)
+  expect(systemUnderTest.isAttachmentLink('[linkText](' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.posix.sep + 'noteKey' + path.posix.sep + 'pdf.pdf)')).toBe(true)
+  expect(systemUnderTest.isAttachmentLink('![linkText](' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.posix.sep + 'noteKey' + path.posix.sep + 'pdf.pdf )')).toBe(true)
+  expect(systemUnderTest.isAttachmentLink('text [ linkText](' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.posix.sep + 'noteKey' + path.posix.sep + 'pdf.pdf)')).toBe(true)
+  expect(systemUnderTest.isAttachmentLink('text ![linkText ](' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.posix.sep + 'noteKey' + path.posix.sep + 'pdf.pdf)')).toBe(true)
+  expect(systemUnderTest.isAttachmentLink('[linkText](' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.posix.sep + 'noteKey' + path.posix.sep + 'pdf.pdf) test')).toBe(true)
+  expect(systemUnderTest.isAttachmentLink('![linkText](' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.posix.sep + 'noteKey' + path.posix.sep + 'pdf.pdf) test')).toBe(true)
+  expect(systemUnderTest.isAttachmentLink('text [linkText](' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.posix.sep + 'noteKey' + path.posix.sep + 'pdf.pdf) test')).toBe(true)
+  expect(systemUnderTest.isAttachmentLink('text ![linkText](' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.posix.sep + 'noteKey' + path.posix.sep + 'pdf.pdf) test')).toBe(true)
 })
 
 it('should test that handleAttachmentLinkPaste copies the attachments to the new location', function () {
@@ -581,7 +579,7 @@ it('should test that handleAttachmentLinkPaste copies the attachments to the new
   findStorage.findStorage = jest.fn(() => dummyStorage)
   const pastedNoteKey = 'b1e06f81-8266-49b9-b438-084003c2e723'
   const newNoteKey = 'abc234-8266-49b9-b438-084003c2e723'
-  const pasteText = 'text ![alt](' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.sep + pastedNoteKey + path.sep + 'pdf.pdf)'
+  const pasteText = 'text ![alt](' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.posix.sep + pastedNoteKey + path.posix.sep + 'pdf.pdf)'
   const storageKey = 'storageKey'
   const expectedSourceFilePath = path.join(dummyStorage.path, systemUnderTest.DESTINATION_FOLDER, pastedNoteKey, 'pdf.pdf')
 
@@ -596,12 +594,53 @@ it('should test that handleAttachmentLinkPaste copies the attachments to the new
     })
 })
 
-it('should test that handleAttachmentLinkPaste don\'t try to copy the file if it does not exist', function () {
+it('should test that handleAttachmentLinkPaste copies the attachments to the new location - win32 path', function () {
   const dummyStorage = {path: 'dummyStoragePath'}
   findStorage.findStorage = jest.fn(() => dummyStorage)
   const pastedNoteKey = 'b1e06f81-8266-49b9-b438-084003c2e723'
   const newNoteKey = 'abc234-8266-49b9-b438-084003c2e723'
-  const pasteText = 'text ![alt](' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.sep + pastedNoteKey + path.sep + 'pdf.pdf)'
+  const pasteText = 'text ![alt](' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.win32.sep + pastedNoteKey + path.win32.sep + 'pdf.pdf)'
+  const storageKey = 'storageKey'
+  const expectedSourceFilePath = path.join(dummyStorage.path, systemUnderTest.DESTINATION_FOLDER, pastedNoteKey, 'pdf.pdf')
+
+  sander.exists = jest.fn(() => Promise.resolve(true))
+  systemUnderTest.copyAttachment = jest.fn(() => Promise.resolve('dummyNewFileName'))
+
+  return systemUnderTest.handleAttachmentLinkPaste(storageKey, newNoteKey, pasteText)
+    .then(() => {
+      expect(findStorage.findStorage).toHaveBeenCalledWith(storageKey)
+      expect(sander.exists).toHaveBeenCalledWith(expectedSourceFilePath)
+      expect(systemUnderTest.copyAttachment).toHaveBeenCalledWith(expectedSourceFilePath, storageKey, newNoteKey)
+    })
+})
+
+it('should test that handleAttachmentLinkPaste don\'t try to copy the file if it does not exist - win32 path', function () {
+  const dummyStorage = {path: 'dummyStoragePath'}
+  findStorage.findStorage = jest.fn(() => dummyStorage)
+  const pastedNoteKey = 'b1e06f81-8266-49b9-b438-084003c2e723'
+  const newNoteKey = 'abc234-8266-49b9-b438-084003c2e723'
+  const pasteText = 'text ![alt](' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.win32.sep + pastedNoteKey + path.win32.sep + 'pdf.pdf)'
+  const storageKey = 'storageKey'
+  const expectedSourceFilePath = path.join(dummyStorage.path, systemUnderTest.DESTINATION_FOLDER, pastedNoteKey, 'pdf.pdf')
+
+  sander.exists = jest.fn(() => Promise.resolve(false))
+  systemUnderTest.copyAttachment = jest.fn()
+  systemUnderTest.generateFileNotFoundMarkdown = jest.fn()
+
+  return systemUnderTest.handleAttachmentLinkPaste(storageKey, newNoteKey, pasteText)
+    .then(() => {
+      expect(findStorage.findStorage).toHaveBeenCalledWith(storageKey)
+      expect(sander.exists).toHaveBeenCalledWith(expectedSourceFilePath)
+      expect(systemUnderTest.copyAttachment).not.toHaveBeenCalled()
+    })
+})
+
+it('should test that handleAttachmentLinkPaste don\'t try to copy the file if it does not exist -- posix', function () {
+  const dummyStorage = {path: 'dummyStoragePath'}
+  findStorage.findStorage = jest.fn(() => dummyStorage)
+  const pastedNoteKey = 'b1e06f81-8266-49b9-b438-084003c2e723'
+  const newNoteKey = 'abc234-8266-49b9-b438-084003c2e723'
+  const pasteText = 'text ![alt](' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.posix.sep + pastedNoteKey + path.posix.sep + 'pdf.pdf)'
   const storageKey = 'storageKey'
   const expectedSourceFilePath = path.join(dummyStorage.path, systemUnderTest.DESTINATION_FOLDER, pastedNoteKey, 'pdf.pdf')
 
@@ -622,8 +661,8 @@ it('should test that handleAttachmentLinkPaste copies multiple attachments if mu
   findStorage.findStorage = jest.fn(() => dummyStorage)
   const pastedNoteKey = 'b1e06f81-8266-49b9-b438-084003c2e723'
   const newNoteKey = 'abc234-8266-49b9-b438-084003c2e723'
-  const pasteText = 'text ![alt](' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.sep + pastedNoteKey + path.sep + 'pdf.pdf) ..' +
-    '![secondAttachment](' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.sep + pastedNoteKey + path.sep + 'img.jpg)'
+  const pasteText = 'text ![alt](' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.posix.sep + pastedNoteKey + path.posix.sep + 'pdf.pdf) ..' +
+    '![secondAttachment](' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.win32.sep + pastedNoteKey + path.win32.sep + 'img.jpg)'
   const storageKey = 'storageKey'
   const expectedSourceFilePathOne = path.join(dummyStorage.path, systemUnderTest.DESTINATION_FOLDER, pastedNoteKey, 'pdf.pdf')
   const expectedSourceFilePathTwo = path.join(dummyStorage.path, systemUnderTest.DESTINATION_FOLDER, pastedNoteKey, 'img.jpg')
@@ -647,7 +686,7 @@ it('should test that handleAttachmentLinkPaste returns the correct modified past
   const pastedNoteKey = 'b1e06f81-8266-49b9-b438-084003c2e723'
   const newNoteKey = 'abc234-8266-49b9-b438-084003c2e723'
   const dummyNewFileName = 'dummyNewFileName'
-  const pasteText = 'text ![alt](' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.sep + pastedNoteKey + path.sep + 'pdf.pdf)'
+  const pasteText = 'text ![alt](' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.posix.sep + pastedNoteKey + path.win32.sep + 'pdf.pdf)'
   const expectedText = 'text ![alt](' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.sep + newNoteKey + path.sep + dummyNewFileName + ')'
   const storageKey = 'storageKey'
 
@@ -667,8 +706,8 @@ it('should test that handleAttachmentLinkPaste returns the correct modified past
   const newNoteKey = 'abc234-8266-49b9-b438-084003c2e723'
   const dummyNewFileNameOne = 'dummyNewFileName'
   const dummyNewFileNameTwo = 'dummyNewFileNameTwo'
-  const pasteText = 'text ![alt](' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.sep + pastedNoteKey + path.sep + 'pdf.pdf) ' +
-    '![secondImage](' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.sep + pastedNoteKey + path.sep + 'img.jpg)'
+  const pasteText = 'text ![alt](' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.win32.sep + pastedNoteKey + path.win32.sep + 'pdf.pdf) ' +
+    '![secondImage](' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.posix.sep + pastedNoteKey + path.posix.sep + 'img.jpg)'
   const expectedText = 'text ![alt](' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.sep + newNoteKey + path.sep + dummyNewFileNameOne + ') ' +
     '![secondImage](' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.sep + newNoteKey + path.sep + dummyNewFileNameTwo + ')'
   const storageKey = 'storageKey'
@@ -689,8 +728,8 @@ it('should test that handleAttachmentLinkPaste calls the copy method correct if
   findStorage.findStorage = jest.fn(() => dummyStorage)
   const pastedNoteKey = 'b1e06f81-8266-49b9-b438-084003c2e723'
   const newNoteKey = 'abc234-8266-49b9-b438-084003c2e723'
-  const pasteText = 'text ![alt](' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.sep + pastedNoteKey + path.sep + 'pdf.pdf) ..' +
-    '![secondAttachment](' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.sep + pastedNoteKey + path.sep + 'img.jpg)'
+  const pasteText = 'text ![alt](' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.posix.sep + pastedNoteKey + path.posix.sep + 'pdf.pdf) ..' +
+    '![secondAttachment](' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.win32.sep + pastedNoteKey + path.win32.sep + 'img.jpg)'
   const storageKey = 'storageKey'
   const expectedSourceFilePathOne = path.join(dummyStorage.path, systemUnderTest.DESTINATION_FOLDER, pastedNoteKey, 'pdf.pdf')
   const expectedSourceFilePathTwo = path.join(dummyStorage.path, systemUnderTest.DESTINATION_FOLDER, pastedNoteKey, 'img.jpg')
@@ -716,7 +755,7 @@ it('should test that handleAttachmentLinkPaste returns the correct modified past
   findStorage.findStorage = jest.fn(() => dummyStorage)
   const pastedNoteKey = 'b1e06f81-8266-49b9-b438-084003c2e723'
   const newNoteKey = 'abc234-8266-49b9-b438-084003c2e723'
-  const pasteText = 'text ![alt.png](' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.sep + pastedNoteKey + path.sep + 'pdf.pdf)'
+  const pasteText = 'text ![alt.png](' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.win32.sep + pastedNoteKey + path.posix.sep + 'pdf.pdf)'
   const storageKey = 'storageKey'
   const fileNotFoundMD = 'file not found'
   const expectedPastText = 'text ' + fileNotFoundMD
@@ -735,8 +774,8 @@ it('should test that handleAttachmentLinkPaste returns the correct modified past
   findStorage.findStorage = jest.fn(() => dummyStorage)
   const pastedNoteKey = 'b1e06f81-8266-49b9-b438-084003c2e723'
   const newNoteKey = 'abc234-8266-49b9-b438-084003c2e723'
-  const pasteText = 'text ![alt](' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.sep + pastedNoteKey + path.sep + 'pdf.pdf) ' +
-    '![secondImage](' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.sep + pastedNoteKey + path.sep + 'img.jpg)'
+  const pasteText = 'text ![alt](' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.win32.sep + pastedNoteKey + path.win32.sep + 'pdf.pdf) ' +
+    '![secondImage](' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.posix.sep + pastedNoteKey + path.posix.sep + 'img.jpg)'
   const storageKey = 'storageKey'
   const fileNotFoundMD = 'file not found'
   const expectedPastText = 'text ' + fileNotFoundMD + ' ' + fileNotFoundMD
@@ -757,8 +796,8 @@ it('should test that handleAttachmentLinkPaste returns the correct modified past
   const newNoteKey = 'abc234-8266-49b9-b438-084003c2e723'
   const dummyFoundFileName = 'dummyFileName'
   const fileNotFoundMD = 'file not found'
-  const pasteText = 'text ![alt](' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.sep + pastedNoteKey + path.sep + 'pdf.pdf) .. ' +
-    '![secondAttachment](' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.sep + pastedNoteKey + path.sep + 'img.jpg)'
+  const pasteText = 'text ![alt](' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.win32.sep + pastedNoteKey + path.win32.sep + 'pdf.pdf) .. ' +
+    '![secondAttachment](' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.posix.sep + pastedNoteKey + path.posix.sep + 'img.jpg)'
   const storageKey = 'storageKey'
   const expectedPastText = 'text ' + fileNotFoundMD + ' .. ![secondAttachment](' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.sep + newNoteKey + path.sep + dummyFoundFileName + ')'
 
@@ -781,8 +820,8 @@ it('should test that handleAttachmentLinkPaste returns the correct modified past
   const newNoteKey = 'abc234-8266-49b9-b438-084003c2e723'
   const dummyFoundFileName = 'dummyFileName'
   const fileNotFoundMD = 'file not found'
-  const pasteText = 'text ![alt](' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.sep + pastedNoteKey + path.sep + 'pdf.pdf) .. ' +
-    '![secondAttachment](' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.sep + pastedNoteKey + path.sep + 'img.jpg)'
+  const pasteText = 'text ![alt](' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.posix.sep + pastedNoteKey + path.posix.sep + 'pdf.pdf) .. ' +
+    '![secondAttachment](' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.win32.sep + pastedNoteKey + path.win32.sep + 'img.jpg)'
   const storageKey = 'storageKey'
   const expectedPastText = 'text ![alt](' + systemUnderTest.STORAGE_FOLDER_PLACEHOLDER + path.sep + newNoteKey + path.sep + dummyFoundFileName + ') .. ' + fileNotFoundMD
 

From 127da402567ec59177f230ccf73391e8ed2487c0 Mon Sep 17 00:00:00 2001
From: ehhc <ehhc@users.noreply.github.com>
Date: Sat, 26 Jan 2019 17:37:04 +0100
Subject: [PATCH 152/159] possibly fix for the broken test...

---
 browser/main/lib/dataApi/attachmentManagement.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/browser/main/lib/dataApi/attachmentManagement.js b/browser/main/lib/dataApi/attachmentManagement.js
index 1d1d36ac..0ee4c03b 100644
--- a/browser/main/lib/dataApi/attachmentManagement.js
+++ b/browser/main/lib/dataApi/attachmentManagement.js
@@ -423,8 +423,8 @@ function replaceNoteKeyWithNewNoteKey (noteContent, oldNoteKey, newNoteKey) {
 function removeStorageAndNoteReferences (input, noteKey) {
   return input.replace(new RegExp('/?' + STORAGE_FOLDER_PLACEHOLDER + '.*?("|])', '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 + '(' + escapeStringRegexp(path.sep) + noteKey + ')?', 'g'), DESTINATION_FOLDER)
+    return match.replace(encodedPathSeparators, path.sep).replace(new RegExp(STORAGE_FOLDER_PLACEHOLDER + '(' + escapeStringRegexp(path.sep) + noteKey + ')?', 'g'), DESTINATION_FOLDER)
+  })
 }
 
 /**

From 472496d59c3791c46d2be5aaa37d44416e7497ab Mon Sep 17 00:00:00 2001
From: ehhc <ehhc@users.noreply.github.com>
Date: Sat, 26 Jan 2019 17:53:31 +0100
Subject: [PATCH 153/159] possibly fix for the broken test...

---
 browser/main/lib/dataApi/attachmentManagement.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser/main/lib/dataApi/attachmentManagement.js b/browser/main/lib/dataApi/attachmentManagement.js
index 0ee4c03b..14f8468c 100644
--- a/browser/main/lib/dataApi/attachmentManagement.js
+++ b/browser/main/lib/dataApi/attachmentManagement.js
@@ -422,7 +422,7 @@ function replaceNoteKeyWithNewNoteKey (noteContent, oldNoteKey, newNoteKey) {
  */
 function removeStorageAndNoteReferences (input, noteKey) {
   return input.replace(new RegExp('/?' + STORAGE_FOLDER_PLACEHOLDER + '.*?("|])', 'g'), function (match) {
-    var encodedPathSeparators = new RegExp(mdurl.encode(path.win32.sep) + '|' + mdurl.encode(path.posix.sep), 'g')
+    var encodedPathSeparators = new RegExp(mdurl.encode(path.win32.sep) + '|' + mdurl.encode(path.posix.sep) + '|' + path.win32.sep + '|' + path.posix.sep, 'g')
     return match.replace(encodedPathSeparators, path.sep).replace(new RegExp(STORAGE_FOLDER_PLACEHOLDER + '(' + escapeStringRegexp(path.sep) + noteKey + ')?', 'g'), DESTINATION_FOLDER)
   })
 }

From 7165c4550b4f722363723fdaa3ae44f3af011163 Mon Sep 17 00:00:00 2001
From: ehhc <ehhc@users.noreply.github.com>
Date: Sat, 26 Jan 2019 18:16:39 +0100
Subject: [PATCH 154/159] possibly fix for the broken test...

---
 browser/main/lib/dataApi/attachmentManagement.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/browser/main/lib/dataApi/attachmentManagement.js b/browser/main/lib/dataApi/attachmentManagement.js
index 14f8468c..fb3beac1 100644
--- a/browser/main/lib/dataApi/attachmentManagement.js
+++ b/browser/main/lib/dataApi/attachmentManagement.js
@@ -422,8 +422,12 @@ function replaceNoteKeyWithNewNoteKey (noteContent, oldNoteKey, newNoteKey) {
  */
 function removeStorageAndNoteReferences (input, noteKey) {
   return input.replace(new RegExp('/?' + STORAGE_FOLDER_PLACEHOLDER + '.*?("|])', 'g'), function (match) {
-    var encodedPathSeparators = new RegExp(mdurl.encode(path.win32.sep) + '|' + mdurl.encode(path.posix.sep) + '|' + path.win32.sep + '|' + path.posix.sep, 'g')
-    return match.replace(encodedPathSeparators, path.sep).replace(new RegExp(STORAGE_FOLDER_PLACEHOLDER + '(' + escapeStringRegexp(path.sep) + noteKey + ')?', 'g'), DESTINATION_FOLDER)
+    const temp = match
+      .replace(new RegExp(mdurl.encode(path.win32.sep), 'g'), path.sep)
+      .replace(new RegExp(mdurl.encode(path.posix.sep), 'g'), path.sep)
+      .replace(new RegExp(escapeStringRegexp(path.win32.sep), 'g'), path.sep)
+      .replace(new RegExp(escapeStringRegexp(path.posix.sep), 'g'), path.sep)
+    return temp.replace(new RegExp(STORAGE_FOLDER_PLACEHOLDER + '(' + escapeStringRegexp(path.sep) + noteKey + ')?', 'g'), DESTINATION_FOLDER)
   })
 }
 

From 5e87ec262790c7fb3ef90915bfa0b00fe195ac93 Mon Sep 17 00:00:00 2001
From: roottool <smart.dog.lilienthal@gmail.com>
Date: Sun, 27 Jan 2019 22:26:31 +0900
Subject: [PATCH 155/159] Specified MarkdownPreview class

---
 browser/components/MarkdownPreview.js | 133 +++++++++++++-------------
 1 file changed, 66 insertions(+), 67 deletions(-)

diff --git a/browser/components/MarkdownPreview.js b/browser/components/MarkdownPreview.js
index e93312ef..a6819ce9 100755
--- a/browser/components/MarkdownPreview.js
+++ b/browser/components/MarkdownPreview.js
@@ -833,81 +833,80 @@ export default class MarkdownPreview extends React.Component {
       }
     )
 
-    document.querySelectorAll('iframe').forEach(item => {
-      const rect = item.getBoundingClientRect()
-      const imgList = item.contentWindow.document.body.querySelectorAll('img')
-      for (const img of imgList) {
-        img.onclick = () => {
-          const widthMagnification = document.body.clientWidth / img.width
-          const heightMagnification = document.body.clientHeight / img.height
-          const baseOnWidth = widthMagnification < heightMagnification
-          const magnification = baseOnWidth ? widthMagnification : heightMagnification
+    const markdownPreviewIframe = document.querySelector('.MarkdownPreview')
+    const rect = markdownPreviewIframe.getBoundingClientRect()
+    const imgList = markdownPreviewIframe.contentWindow.document.body.querySelectorAll('img')
+    for (const img of imgList) {
+      img.onclick = () => {
+        const widthMagnification = document.body.clientWidth / img.width
+        const heightMagnification = document.body.clientHeight / img.height
+        const baseOnWidth = widthMagnification < heightMagnification
+        const magnification = baseOnWidth ? widthMagnification : heightMagnification
 
-          const zoomImgWidth = img.width * magnification
-          const zoomImgHeight = img.height * magnification
-          const zoomImgTop = (document.body.clientHeight - zoomImgHeight) / 2
-          const zoomImgLeft = (document.body.clientWidth - zoomImgWidth) / 2
-          const originalImgTop = img.y + rect.top
-          const originalImgLeft = img.x + rect.left
-          const originalImgRect = {
-            top: `${originalImgTop}px`,
-            left: `${originalImgLeft}px`,
-            width: `${img.width}px`,
-            height: `${img.height}px`
-          }
-          const zoomInImgRect = {
-            top: `${baseOnWidth ? zoomImgTop : 0}px`,
-            left: `${baseOnWidth ? 0 : zoomImgLeft}px`,
-            width: `${zoomImgWidth}px`,
-            height: `${zoomImgHeight}px`
-          }
-          const animationSpeed = 300
+        const zoomImgWidth = img.width * magnification
+        const zoomImgHeight = img.height * magnification
+        const zoomImgTop = (document.body.clientHeight - zoomImgHeight) / 2
+        const zoomImgLeft = (document.body.clientWidth - zoomImgWidth) / 2
+        const originalImgTop = img.y + rect.top
+        const originalImgLeft = img.x + rect.left
+        const originalImgRect = {
+          top: `${originalImgTop}px`,
+          left: `${originalImgLeft}px`,
+          width: `${img.width}px`,
+          height: `${img.height}px`
+        }
+        const zoomInImgRect = {
+          top: `${baseOnWidth ? zoomImgTop : 0}px`,
+          left: `${baseOnWidth ? 0 : zoomImgLeft}px`,
+          width: `${zoomImgWidth}px`,
+          height: `${zoomImgHeight}px`
+        }
+        const animationSpeed = 300
 
-          const zoomImg = document.createElement('img')
-          zoomImg.src = img.src
+        const zoomImg = document.createElement('img')
+        zoomImg.src = img.src
+        zoomImg.style = `
+          position: absolute;
+          top: ${baseOnWidth ? zoomImgTop : 0}px;
+          left: ${baseOnWidth ? 0 : zoomImgLeft}px;
+          width: ${zoomImgWidth};
+          height: ${zoomImgHeight}px;
+          `
+        zoomImg.animate([
+          originalImgRect,
+          zoomInImgRect
+        ], animationSpeed)
+
+        const overlay = document.createElement('div')
+        overlay.style = `
+          background-color: rgba(0,0,0,0.5);
+          cursor: zoom-out;
+          position: absolute;
+          top: 0;
+          left: 0;
+          width: 100%;
+          height: ${document.body.clientHeight}px;
+          z-index: 100;
+        `
+        overlay.onclick = () => {
           zoomImg.style = `
             position: absolute;
-            top: ${baseOnWidth ? zoomImgTop : 0}px;
-            left: ${baseOnWidth ? 0 : zoomImgLeft}px;
-            width: ${zoomImgWidth};
-            height: ${zoomImgHeight}px;
+            top: ${originalImgTop}px;
+            left: ${originalImgLeft}px;
+            width: ${img.width}px;
+            height: ${img.height}px;
             `
-          zoomImg.animate([
-            originalImgRect,
-            zoomInImgRect
+          const zoomOutImgAnimation = zoomImg.animate([
+            zoomInImgRect,
+            originalImgRect
           ], animationSpeed)
-
-          const overlay = document.createElement('div')
-          overlay.style = `
-            background-color: rgba(0,0,0,0.5);
-            cursor: zoom-out;
-            position: absolute;
-            top: 0;
-            left: 0;
-            width: 100%;
-            height: ${document.body.clientHeight}px;
-            z-index: 100;
-          `
-          overlay.onclick = () => {
-            zoomImg.style = `
-              position: absolute;
-              top: ${originalImgTop}px;
-              left: ${originalImgLeft}px;
-              width: ${img.width}px;
-              height: ${img.height}px;
-              `
-            const zoomOutImgAnimation = zoomImg.animate([
-              zoomInImgRect,
-              originalImgRect
-            ], animationSpeed)
-            zoomOutImgAnimation.onfinish = () => overlay.remove()
-          }
-
-          overlay.appendChild(zoomImg)
-          document.body.appendChild(overlay)
+          zoomOutImgAnimation.onfinish = () => overlay.remove()
         }
+
+        overlay.appendChild(zoomImg)
+        document.body.appendChild(overlay)
       }
-    })
+    }
   }
 
   focus () {

From a85a27f2252fd4acb6e3b24b01d08f62718864cf Mon Sep 17 00:00:00 2001
From: Baptiste Augrain <daiyam@zokugun.org>
Date: Tue, 29 Jan 2019 16:05:30 +0100
Subject: [PATCH 156/159] - fix bad regex - improve test - fix missing 'e' in
 some functions name

---
 browser/components/CodeEditor.js              |  2 +-
 .../main/lib/dataApi/attachmentManagement.js  | 18 +++++++++++-----
 tests/dataApi/attachmentManagement.test.js    | 21 +++++++++++++------
 3 files changed, 29 insertions(+), 12 deletions(-)

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 =
     '<html>\n' +
     '    <head>\n' +
@@ -136,14 +137,18 @@ it('should replace the all ":storage" path with the actual storage path', functi
     '    <body data-theme="default">\n' +
     '        <h2 data-line="0" id="Headline">Headline</h2>\n' +
     '        <p data-line="2">\n' +
-    '            <img src=":storage' + mdurl.encode(path.sep) + '0.6r4zdgc22xp.png" alt="dummyImage.png" >\n' +
+    '            <img src=":storage' + mdurl.encode(path.sep) + noteKey + mdurl.encode(path.sep) + '0.6r4zdgc22xp.png" alt="dummyImage.png" >\n' +
     '        </p>\n' +
     '        <p data-line="4">\n' +
-    '            <a href=":storage' + mdurl.encode(path.sep) + '0.q2i4iw0fyx.pdf">dummyPDF.pdf</a>\n' +
+    '            <a href=":storage' + mdurl.encode(path.sep) + noteKey + mdurl.encode(path.sep) + '0.q2i4iw0fyx.pdf">dummyPDF.pdf</a>\n' +
     '        </p>\n' +
     '        <p data-line="6">\n' +
-    '            <img src=":storage' + mdurl.encode(path.sep) + 'd6c5ee92.jpg" alt="dummyImage2.jpg">\n' +
+    '            <img src=":storage' + mdurl.encode(path.sep) + noteKey + mdurl.encode(path.sep) + 'd6c5ee92.jpg" alt="dummyImage2.jpg">\n' +
     '        </p>\n' +
+    '        <pre class="fence" data-line="8">\n' +
+    '            <span class="filename"></span>\n' +
+    '            <div class="gallery" data-autoplay="undefined" data-height="undefined">:storage' + mdurl.encode(path.sep) + noteKey + mdurl.encode(path.sep) + 'f939b2c3.jpg</div>\n' +
+    '        </pre>\n' +
     '    </body>\n' +
     '</html>'
   const storagePath = '<<dummyStoragePath>>'
@@ -155,14 +160,18 @@ it('should replace the all ":storage" path with the actual storage path', functi
     '    <body data-theme="default">\n' +
     '        <h2 data-line="0" id="Headline">Headline</h2>\n' +
     '        <p data-line="2">\n' +
-    '            <img src="file:///' + storagePath + path.sep + storageFolder + path.sep + '0.6r4zdgc22xp.png" alt="dummyImage.png" >\n' +
+    '            <img src="file:///' + storagePath + path.sep + storageFolder + path.sep + noteKey + path.sep + '0.6r4zdgc22xp.png" alt="dummyImage.png" >\n' +
     '        </p>\n' +
     '        <p data-line="4">\n' +
-    '            <a href="file:///' + storagePath + path.sep + storageFolder + path.sep + '0.q2i4iw0fyx.pdf">dummyPDF.pdf</a>\n' +
+    '            <a href="file:///' + storagePath + path.sep + storageFolder + path.sep + noteKey + path.sep + '0.q2i4iw0fyx.pdf">dummyPDF.pdf</a>\n' +
     '        </p>\n' +
     '        <p data-line="6">\n' +
-    '            <img src="file:///' + storagePath + path.sep + storageFolder + path.sep + 'd6c5ee92.jpg" alt="dummyImage2.jpg">\n' +
+    '            <img src="file:///' + storagePath + path.sep + storageFolder + path.sep + noteKey + path.sep + 'd6c5ee92.jpg" alt="dummyImage2.jpg">\n' +
     '        </p>\n' +
+    '        <pre class="fence" data-line="8">\n' +
+    '            <span class="filename"></span>\n' +
+    '            <div class="gallery" data-autoplay="undefined" data-height="undefined">file:///' + storagePath + path.sep + storageFolder + path.sep + noteKey + path.sep + 'f939b2c3.jpg</div>\n' +
+    '        </pre>\n' +
     '    </body>\n' +
     '</html>'
   const actual = systemUnderTest.fixLocalURLS(testInput, storagePath)

From b1c6c0442ffeecd9153c030eea669f19d73accce Mon Sep 17 00:00:00 2001
From: Baptiste Augrain <daiyam@zokugun.org>
Date: Tue, 29 Jan 2019 16:49:51 +0100
Subject: [PATCH 157/159] fix guardrails errors

---
 browser/components/CodeEditor.js | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/browser/components/CodeEditor.js b/browser/components/CodeEditor.js
index 01a54aac..6ad294ed 100644
--- a/browser/components/CodeEditor.js
+++ b/browser/components/CodeEditor.js
@@ -888,10 +888,7 @@ export default class CodeEditor extends React.Component {
   handlePaste (editor, forceSmartPaste) {
     const { storageKey, noteKey, fetchUrlTitle, enableSmartPaste } = this.props
 
-    const isURL = str => {
-      const matcher = /^(?:\w+:)?\/\/([^\s\.]+\.\S{2}|localhost[\:?\d]*)\S*$/
-      return matcher.test(str)
-    }
+    const isURL = str => /(?:^\w+:|^)\/\/(?:[^\s\.]+\.\S{2}|localhost[\:?\d]*)/.test(str)
 
     const isInLinkTag = editor => {
       const startCursor = editor.getCursor('start')
@@ -1109,7 +1106,7 @@ export default class CodeEditor extends React.Component {
             iconv.encodingExists(_charset)
             ? _charset
             : 'utf-8'
-          resolve(iconv.decode(new Buffer(buff), charset).toString())
+          resolve(iconv.decode(Buffer.from(buff), charset).toString())
         } catch (e) {
           reject(e)
         }

From 806139091c78129480a2c5ecfed29e14158da2b3 Mon Sep 17 00:00:00 2001
From: Aaron-Bird <25508292+Aaron-Bird@users.noreply.github.com>
Date: Thu, 31 Jan 2019 01:08:07 +0800
Subject: [PATCH 158/159] fix: GIFs don't animate

---
 browser/main/lib/dataApi/attachmentManagement.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/browser/main/lib/dataApi/attachmentManagement.js b/browser/main/lib/dataApi/attachmentManagement.js
index fb3beac1..aed4a58d 100644
--- a/browser/main/lib/dataApi/attachmentManagement.js
+++ b/browser/main/lib/dataApi/attachmentManagement.js
@@ -258,8 +258,9 @@ function handleAttachmentDrop (codeEditor, storageKey, noteKey, dropEvent) {
   const originalFileName = path.basename(filePath)
   const fileType = file['type']
   const isImage = fileType.startsWith('image')
+  const isGif = fileType.endsWith('gif')
   let promise
-  if (isImage) {
+  if (isImage && !isGif) {
     promise = fixRotate(file).then(base64data => {
       return copyAttachment({type: 'base64', data: base64data, sourceFilePath: filePath}, storageKey, noteKey)
     })

From 62ab444b29f6d43de24abdedfb25dfc7f920aa10 Mon Sep 17 00:00:00 2001
From: Katsuki <Katsuki_Sato0130@icloud.com>
Date: Thu, 31 Jan 2019 19:33:43 +0900
Subject: [PATCH 159/159] Fix grammer error

---
 browser/main/modals/PreferencesModal/Crowdfunding.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser/main/modals/PreferencesModal/Crowdfunding.js b/browser/main/modals/PreferencesModal/Crowdfunding.js
index f6389cd8..f94ee5ca 100644
--- a/browser/main/modals/PreferencesModal/Crowdfunding.js
+++ b/browser/main/modals/PreferencesModal/Crowdfunding.js
@@ -34,7 +34,7 @@ class Crowdfunding extends React.Component {
         <p>{i18n.__('We thought that it will be nice if we can pay reward for our contributors.')}</p>
         <br />
         <p>{i18n.__('### We believe Meritocracy')}</p>
-        <p>{i18n.__('We think developers who has skill and did great things must be rewarded properly.')}</p>
+        <p>{i18n.__('We think developers who have skills and do great things must be rewarded properly.')}</p>
         <p>{i18n.__('OSS projects are used in everywhere on the internet, but no matter how they great, most of owners of those projects need to have another job to sustain their living.')}</p>
         <p>{i18n.__('It sometimes looks like exploitation.')}</p>
         <p>{i18n.__('We’ve realized IssueHunt could enhance sustainability of open-source ecosystem.')}</p>