for v0.9

.babelrc

@@ -5,7 +5,7 @@
       "presets": ["react-hmre"]
     },
     "test": {
-      "presets": ["env" ,"react", "es2015"],
+      "presets": ["react", "es2015"],
       "plugins": [
         [ "babel-plugin-webpack-alias", { "config": "${PWD}/webpack.config.js" } ]
       ]

.boostnoterc.sample

@@ -22,10 +22,7 @@
         "fontSize": "14",
         "lineNumber": true
     },
-    "sortBy": {
-        "default": "UPDATED_AT"
-    },
-    "sortTagsBy": "ALPHABETICAL",
+    "sortBy": "UPDATED_AT",
     "ui": {
         "defaultNote": "ALWAYS_ASK",
         "disableDirectWrite": false,

.editorconfig

@@ -1,16 +0,0 @@
-# EditorConfig is awesome: http://EditorConfig.org
-
-# top-most EditorConfig file
-root = true
-
-# Space indentation
-[*]
-indent_style = space
-indent_size = 2
-trim_trailing_whitespace = true
-
-# The indent size used in the `package.json` file cannot be changed
-# https://github.com/npm/npm/pull/3180#issuecomment-16336516
-[{*.yml,*.yaml,package.json}]
-indent_style = space
-indent_size = 2

.eslintignore

@@ -1,4 +1,3 @@
 node_modules/
 compiled/
 dist/
-extra_scripts/

.eslintrc

@@ -3,9 +3,7 @@
   "plugins": ["react"],
   "rules": {
     "no-useless-escape": 0,
-    "prefer-const": ["warn", {
-      "destructuring": "all"
-    }],
+    "prefer-const": "warn",
     "no-unused-vars": "warn",
     "no-undef": "warn",
     "no-lone-blocks": "warn",
@@ -19,8 +17,5 @@
     "FileReader": true,
     "localStorage": true,
     "fetch": true
-  },
-  "env": {
-    "jest": true
   }
 }

.travis.yml

@@ -1,9 +1,8 @@
 language: node_js
 node_js:
-  - 7
+  - 6
 script:
   - npm run lint && npm run test
-  - yarn jest
   - 'if [[ ${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH} = "master" ]]; then npm install -g grunt npm@5.2 && grunt pre-build; fi'
 after_success:
   - openssl aes-256-cbc -K $encrypted_440d7f9a3c38_key -iv $encrypted_440d7f9a3c38_iv
@@ -18,3 +17,4 @@ deploy:
   script: if [ ${TRAVIS_NODE_VERSION} = "stable" ];then docker run -v $(pwd):$(pwd) -t snapcore/snapcraft sh -c "apt update -qq
     && cd $(pwd) && snapcraft && snapcraft push *.snap --release edge"; fi
   skip_cleanup: true
+

.vscode/launch.json

@@ -1,41 +0,0 @@
-{
-  // Use IntelliSense to learn about possible attributes.
-  // Hover to view descriptions of existing attributes.
-  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-  "version": "0.2.0",
-  "configurations": [
-
-    {
-      "type": "node",
-      "request": "launch",
-      "name": "BoostNote Main",
-      "protocol": "inspector",
-      "runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron",
-      "runtimeArgs": [
-        "--remote-debugging-port=9223",
-        "--hot",
-        "${workspaceFolder}/index.js"
-      ],
-      "windows": {
-        "runtimeExecutable": "${workspaceFolder}/node_modeules/.bin/electron.cmd"
-      }
-    },
-    {
-      "type": "chrome",
-      "request": "attach",
-      "name": "BoostNote Renderer",
-      "port": 9223,
-      "webRoot": "${workspaceFolder}",
-      "sourceMapPathOverrides": {
-        "webpack:///./~/*": "${webRoot}/node_modules/*",
-        "webpack:///*": "${webRoot}/*"
-      }
-    }
-  ],
-  "compounds": [
-    {
-      "name": "BostNote All",
-      "configurations": ["BoostNote Main", "BoostNote Renderer"]
-    }
-  ]
-}

.vscode/tasks.json

@@ -1,27 +0,0 @@
-{
-  // See https://go.microsoft.com/fwlink/?LinkId=733558
-  // for the documentation about the tasks.json format
-  "version": "2.0.0",
-  "tasks": [
-    {
-      "label": "Build Boostnote",
-      "group": "build",
-      "type": "npm",
-      "script": "watch",
-      "isBackground": true,
-      "presentation": {
-        "reveal": "always",
-      },
-      "problemMatcher": {
-        "pattern":[
-          {
-            "regexp": "^([^\\\\s].*)\\\\((\\\\d+,\\\\d+)\\\\):\\\\s*(.*)$",
-            "file": 1,
-            "location": 2,
-            "message": 3
-          }
-        ]
-      }
-    }
-  ]
-}

ISSUE_TEMPLATE.md

@@ -1,35 +1,10 @@
-# Current behavior
+<!--
+Please paste some **screenshots** with the **developer tool** open (console tab) when you report a bug.
+
+If your issue is regarding boostnote mobile, move to https://github.com/BoostIO/boostnote-mobile.
+-->
 
 <!--
-Let us know what is currently happening.
-
-Please include some **screenshots** with the **developer tools** open (console tab) when you report a bug.
-
-If your issue is regarding Boostnote mobile, please open an issue in the Boostnote Mobile repo 👉 https://github.com/BoostIO/boostnote-mobile.
--->
-
-# Expected behavior
-
-<!--
-Let us know what you think should happen!
--->
-
-# Steps to reproduce
-
-<!-- 
-Please be thorough, issues we can reproduce are easier to fix!
--->
-
-1. 
-2. 
-3. 
-
-# Environment
-
-- Version :
-- OS Version and name :
-
-<!--
-Love Boostnote? Please consider supporting us on IssueHunt:
-👉  https://issuehunt.io/repos/53266139
+Love Boostnote? Please consider supporting us via OpenCollective:
+👉  https://opencollective.com/boostnoteio
 -->

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 Maisin&Co., Inc.
 
 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

PULL_REQUEST_TEMPLATE.md

@@ -1,36 +0,0 @@
-<!--
-Before submitting this PR, please make sure that:
-- You have read and understand the contributing.md
-- You have checked docs/code_style.md for information on code style
--->
-## Description
-<!--
-Tell us what your PR does.
-Please attach a screenshot/ video/gif image describing your PR if possible.
--->
-
-## Issue fixed
-<!--
-Please list out all issue fixed with this PR here.
--->
-
-<!--
-Please make sure you fill in these checkboxes,
-your PR will be reviewed faster if we know exactly what it does.
-
-Change :white_circle: to :radio_button: in all the options that apply
--->
-## 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

__mocks__/electron.js

@@ -1,7 +0,0 @@
-module.exports = {
-  require: jest.genMockFunction(),
-  match: jest.genMockFunction(),
-  app: jest.genMockFunction(),
-  remote: jest.genMockFunction(),
-  dialog: jest.genMockFunction()
-}

browser/components/CodeEditor.js

@@ -3,46 +3,36 @@ 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 styles from '../components/CodeEditor.styl'
+import path from 'path'
+import copyImage from 'browser/main/lib/dataApi/copyImage'
+import { findStorage } from 'browser/lib/findStorage'
 import fs from 'fs'
-const { ipcRenderer, remote, clipboard } = require('electron')
-import normalizeEditorFontFamily from 'browser/lib/normalizeEditorFontFamily'
-const spellcheck = require('browser/lib/spellcheck')
-const buildEditorContextMenu = require('browser/lib/contextMenuBuilder')
-import TurndownService from 'turndown'
-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 })) : [])
+const defaultEditorFontFamily = ['Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'source-code-pro', 'monospace']
 
-function translateHotkey (hotkey) {
-  return hotkey.replace(/\s*\+\s*/g, '-').replace(/Command/g, 'Cmd').replace(/Control/g, 'Ctrl')
+function pass (name) {
+  switch (name) {
+    case 'ejs':
+      return 'Embedded Javascript'
+    case 'html_ruby':
+      return 'Embedded Ruby'
+    case 'objectivec':
+      return 'Objective C'
+    case 'text':
+      return 'Plain Text'
+    default:
+      return name
+  }
 }
 
 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 = (editor, changeObject) => this.handleChange(editor, changeObject)
-    this.focusHandler = () => {
-      ipcRenderer.send('editor:focused', true)
-    }
+    this.changeHandler = (e) => this.handleChange(e)
     this.blurHandler = (editor, e) => {
-      ipcRenderer.send('editor:focused', false)
       if (e == null) return null
       let el = e.relatedTarget
       while (el != null) {
@@ -52,188 +42,17 @@ export default class CodeEditor extends React.Component {
         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) => {
-      e.preventDefault()
-
-      this.handlePaste(editor, false)
-    }
-    this.loadStyleHandler = e => {
+    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()
-
-    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()
-  }
-
-  handleSearch (msg) {
-    const cm = this.editor
-    const component = this
-
-    if (component.searchState) cm.removeOverlay(component.searchState)
-    if (msg.length < 3) return
-
-    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()
-            }
-          }
-        }
-      }
-    })
-  }
-
-  handleFormatTable () {
-    this.tableEditor.formatAll(options({textWidthOptions: {}}))
-  }
-
-  handleEditorActivity () {
-    if (!this.textEditorInterface.transaction) {
-      this.updateTableEditorState()
-    }
-  }
-
-  updateDefaultKeyMap () {
-    const { hotkey } = this.props
-    const expandSnippet = this.expandSnippet.bind(this)
-
-    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
-      },
-      [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
-    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, {
-      rulers: buildCMRulers(rulers, enableRulers),
       value: this.props.value,
       lineNumbers: this.props.displayLineNumbers,
       lineWrapping: true,
@@ -245,30 +64,49 @@ export default class CodeEditor extends React.Component {
       scrollPastEnd: this.props.scrollPastEnd,
       inputStyle: 'textarea',
       dragDrop: false,
-      foldGutter: true,
-      gutters: ['CodeMirror-linenumbers', 'CodeMirror-foldgutter'],
-      autoCloseBrackets: {
-        pairs: '()[]{}\'\'""$$**``',
-        triples: '```"""\'\'\'',
-        explode: '[]{}``$$',
-        override: true
-      },
-      extraKeys: this.defaultKeyMap
+      autoCloseBrackets: true,
+      extraKeys: {
+        Tab: function (cm) {
+          const cursor = cm.getCursor()
+          const line = cm.getLine(cursor.line)
+          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 (tabs) {
+                cm.execCommand('insertTab')
+              } else {
+                cm.execCommand('insertSoftTab')
+              }
+            }
+          }
+        },
+        'Cmd-T': function (cm) {
+          // Do nothing
+        },
+        Enter: 'newlineAndIndentContinueMarkdownList',
+        'Ctrl-C': (cm) => {
+          if (cm.getOption('keyMap').substr(0, 3) === 'vim') {
+            document.execCommand('copy')
+          }
+          return CodeMirror.Pass
+        }
+      }
     })
 
     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)
-    if (this.props.switchPreview !== 'RIGHTCLICK') {
-      this.editor.on('contextmenu', this.contextMenuHandler)
-    }
-    eventEmitter.on('top:search', this.searchHandler)
-
-    eventEmitter.emit('code:init')
-    this.editor.on('scroll', this.scrollHandler)
 
     const editorTheme = document.getElementById('editorTheme')
     editorTheme.addEventListener('load', this.loadStyleHandler)
@@ -278,147 +116,6 @@ export default class CodeEditor extends React.Component {
     CodeMirror.Vim.defineEx('wq', 'wq', this.quitEditor)
     CodeMirror.Vim.defineEx('qw', 'qw', this.quitEditor)
     CodeMirror.Vim.map('ZZ', ':q', 'normal')
-
-    this.textEditorInterface = new TextEditorInterface(this.editor)
-    this.tableEditor = new TableEditor(this.textEditorInterface)
-    if (this.props.spellCheck) {
-      this.editor.addPanel(this.createSpellCheckPanel(), {position: 'bottom'})
-    }
-
-    eventEmitter.on('code:format-table', this.formatTable)
-
-    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) }
-    })
-
-    if (this.props.enableTableEditor) {
-      this.editor.on('cursorActivity', this.editorActivityHandler)
-      this.editor.on('changes', this.editorActivityHandler)
-    }
-
-    this.setState({
-      clientWidth: this.refs.root.clientWidth
-    })
-  }
-
-  expandSnippet (line, cursor, cm, snippets) {
-    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) {
-        if (snippets[i].content.indexOf(templateCursorString) !== -1) {
-          const snippetLines = snippets[i].content.split('\n')
-          let cursorLineNumber = 0
-          let cursorLinePosition = 0
-
-          let cursorIndex
-          for (let j = 0; j < snippetLines.length; j++) {
-            cursorIndex = snippetLines[j].indexOf(templateCursorString)
-
-            if (cursorIndex !== -1) {
-              cursorLineNumber = j
-              cursorLinePosition = cursorIndex
-
-              break
-            }
-          }
-
-          cm.replaceRange(
-            snippets[i].content.replace(templateCursorString, ''),
-            wordBeforeCursor.range.from,
-            wordBeforeCursor.range.to
-          )
-          cm.setCursor({
-            line: cursor.line + cursorLineNumber,
-            ch: cursorLinePosition + cursor.ch - wordBeforeCursor.text.length
-          })
-        } else {
-          cm.replaceRange(
-            snippets[i].content,
-            wordBeforeCursor.range.from,
-            wordBeforeCursor.range.to
-          )
-        }
-        return true
-      }
-    }
-
-    return false
-  }
-
-  getWordBeforeCursor (line, lineNumber, cursorPosition) {
-    let wordBeforeCursor = ''
-    const originCursorPosition = cursorPosition
-    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
-    const safeStop = 20
-
-    while (cursorPosition > 0) {
-      const currentChar = line.substr(cursorPosition - 1, 1)
-      // 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--
-    }
-
-    return {
-      text: wordBeforeCursor,
-      range: {
-        from: { line: lineNumber, ch: originCursorPosition },
-        to: { line: lineNumber, ch: cursorPosition }
-      }
-    }
   }
 
   quitEditor () {
@@ -426,23 +123,15 @@ 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('contextmenu', this.contextMenuHandler)
     const editorTheme = document.getElementById('editorTheme')
     editorTheme.removeEventListener('load', this.loadStyleHandler)
-
-    spellcheck.setLanguage(null, spellcheck.SPELLCHECK_DISABLED)
-    eventEmitter.off('code:format-table', this.formatTable)
   }
 
   componentDidUpdate (prevProps, prevState) {
     let needRefresh = false
-    const { rulers, enableRulers } = this.props
     if (prevProps.mode !== this.props.mode) {
       this.setMode(this.props.mode)
     }
@@ -460,13 +149,6 @@ export default class CodeEditor extends React.Component {
       needRefresh = true
     }
 
-    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)
@@ -483,74 +165,30 @@ export default class CodeEditor extends React.Component {
       this.editor.setOption('scrollPastEnd', this.props.scrollPastEnd)
     }
 
-    if (prevProps.enableTableEditor !== this.props.enableTableEditor) {
-      if (this.props.enableTableEditor) {
-        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.extraKeysMode = 'default'
-      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
-      })
-
-      needRefresh = true
-    }
-
-    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')
-        elem.parentNode.removeChild(elem)
-      } else {
-        this.editor.addPanel(this.createSpellCheckPanel(), {position: 'bottom'})
-      }
-    }
-
     if (needRefresh) {
       this.editor.refresh()
     }
   }
 
   setMode (mode) {
-    let syntax = CodeMirror.findModeByName(convertModeName(mode))
+    let syntax = CodeMirror.findModeByName(pass(mode))
     if (syntax == null) syntax = CodeMirror.findModeByName('Plain Text')
 
     this.editor.setOption('mode', syntax.mime)
     CodeMirror.autoLoadMode(this.editor, syntax.mode)
   }
 
-  handleChange (editor, changeObject) {
-    spellcheck.handleChange(editor, changeObject)
-    this.value = editor.getValue()
+  handleChange (e) {
+    this.value = this.editor.getValue()
     if (this.props.onChange) {
-      this.props.onChange(editor)
+      this.props.onChange(e)
     }
   }
 
-  moveCursorTo (row, col) {}
+  moveCursorTo (row, col) {
+  }
 
-  scrollToLine (event, num) {
-    const cursor = {
-      line: num,
-      ch: 1
-    }
-    this.editor.setCursor(cursor)
+  scrollToLine (num) {
   }
 
   focus () {
@@ -577,280 +215,76 @@ export default class CodeEditor extends React.Component {
     this.editor.setCursor(cursor)
   }
 
-  handleDropImage (dropEvent) {
-    dropEvent.preventDefault()
-    const { storageKey, noteKey } = this.props
-    attachmentManagement.handleAttachmentDrop(
-      this,
-      storageKey,
-      noteKey,
-      dropEvent
-    )
+  handleDropImage (e) {
+    e.preventDefault()
+    const imagePath = e.dataTransfer.files[0].path
+    const filename = path.basename(imagePath)
+
+    copyImage(imagePath, this.props.storageKey).then((imagePath) => {
+      const imageMd = `![${filename}](${path.join('/:storage', imagePath)})`
+      this.insertImageMd(imageMd)
+    })
   }
 
-  insertAttachmentMd (imageMd) {
+  insertImageMd (imageMd) {
     this.editor.replaceSelection(imageMd)
   }
 
-  handlePaste (editor, forceSmartPaste) {
-    const { storageKey, noteKey, fetchUrlTitle, enableSmartPaste } = this.props
+  handlePaste (editor, e) {
+    const dataTransferItem = e.clipboardData.items[0]
+    if (!dataTransferItem.type.match('image')) return
 
-    const isURL = str => {
-      const matcher = /^(?:\w+:)?\/\/([^\s\.]+\.\S{2}|localhost[\:?\d]*)\S*$/
-      return matcher.test(str)
+    const blob = dataTransferItem.getAsFile()
+    const reader = new window.FileReader()
+    let base64data
+
+    reader.readAsDataURL(blob)
+    reader.onloadend = () => {
+      base64data = reader.result.replace(/^data:image\/png;base64,/, '')
+      base64data += base64data.replace('+', ' ')
+      const binaryData = new Buffer(base64data, 'base64').toString('binary')
+      const imageName = Math.random().toString(36).slice(-16)
+      const storagePath = findStorage(this.props.storageKey).path
+      const imageDir = path.join(storagePath, 'images')
+      if (!fs.existsSync(imageDir)) fs.mkdirSync(imageDir)
+      const imagePath = path.join(imageDir, `${imageName}.png`)
+      fs.writeFile(imagePath, binaryData, 'binary')
+      const imageMd = `![${imageName}](${path.join('/:storage', `${imageName}.png`)})`
+      this.insertImageMd(imageMd)
     }
-
-    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 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
-          }
-        } else {
-          return false
-        }
-      }
-
-      return false
-    }
-
-    const pastedTxt = clipboard.readText()
-
-    if (isInFencedCodeBlock(editor)) {
-      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,
-          image
-        )
-      } else {
-        const pastedHtml = clipboard.readHTML()
-        if (pastedHtml.length > 0) {
-          this.handlePasteHtml(editor, pastedHtml)
-        } 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)
-    }
-  }
-
-  handleScroll (e) {
-    if (this.props.onScroll) {
-      this.props.onScroll(e)
-    }
-  }
-
-  handlePasteUrl (editor, pastedTxt) {
-    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)
-    }
-
-    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 (editor, pastedHtml) {
-    const markdown = this.turndownService.turndown(pastedHtml)
-    editor.replaceSelection(markdown)
-  }
-
-  handlePasteText (editor, pastedTxt) {
-    editor.replaceSelection(pastedTxt)
-  }
-
-  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)
-        }
-      })
-    })
-  }
-
-  mapImageResponse (response, pastedTxt) {
-    return new Promise((resolve, reject) => {
-      try {
-        const url = response.url
-        const name = url.substring(url.lastIndexOf('/') + 1)
-        const imageLinkWithName = `![${name}](${pastedTxt})`
-        resolve(imageLinkWithName)
-      } catch (e) {
-        reject(e)
-      }
-    })
-  }
-
-  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)
-        }
-      })
-    })
-  }
-
-  extractContentTypeCharset (contentType) {
-    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 fontFamily = normalizeEditorFontFamily(this.props.fontFamily)
-    const width = this.props.width
+    const { className, fontSize } = this.props
+    let fontFamily = this.props.fontFamily
+    fontFamily = _.isString(fontFamily) && fontFamily.length > 0
+      ? [fontFamily].concat(defaultEditorFontFamily)
+      : defaultEditorFontFamily
     return (
       <div
-        className={className == null ? 'CodeEditor' : `CodeEditor ${className}`}
+        className={className == null
+          ? 'CodeEditor'
+          : `CodeEditor ${className}`
+        }
         ref='root'
         tabIndex='-1'
         style={{
-          fontFamily,
-          fontSize: fontSize,
-          width: width
+          fontFamily: fontFamily.join(', '),
+          fontSize: fontSize
         }}
-        onDrop={e => this.handleDropImage(e)}
+        onDrop={(e) => this.handleDropImage(e)}
       />
     )
   }
-
-  createSpellCheckPanel () {
-    const panel = document.createElement('div')
-    panel.className = 'panel bottom'
-    panel.id = 'editor-bottom-panel'
-    const dropdown = document.createElement('select')
-    dropdown.title = 'Spellcheck'
-    dropdown.className = styles['spellcheck-select']
-    dropdown.addEventListener('change', (e) => spellcheck.setLanguage(this.editor, dropdown.value))
-    const options = spellcheck.getAvailableDictionaries()
-    for (const op of options) {
-      const option = document.createElement('option')
-      option.value = op.value
-      option.innerHTML = op.label
-      dropdown.appendChild(option)
-    }
-    panel.appendChild(dropdown)
-    return panel
-  }
 }
 
 CodeEditor.propTypes = {
   value: PropTypes.string,
-  enableRulers: PropTypes.bool,
-  rulers: PropTypes.arrayOf(Number),
   mode: PropTypes.string,
   className: PropTypes.string,
   onBlur: PropTypes.func,
   onChange: PropTypes.func,
-  readOnly: PropTypes.bool,
-  spellCheck: PropTypes.bool
+  readOnly: PropTypes.bool
 }
 
 CodeEditor.defaultProps = {
@@ -860,6 +294,5 @@ CodeEditor.defaultProps = {
   fontSize: 14,
   fontFamily: 'Monaco, Consolas',
   indentSize: 4,
-  indentType: 'space',
-  spellCheck: false
+  indentType: 'space'
 }

browser/components/CodeEditor.styl

@@ -1,6 +0,0 @@
-.codeEditor-typo
-  text-decoration underline wavy red
-
-.spellcheck-select
-  border: none
-  text-decoration underline wavy red

browser/components/MarkdownEditor.js

@@ -6,7 +6,6 @@ import CodeEditor from 'browser/components/CodeEditor'
 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'
 
 class MarkdownEditor extends React.Component {
   constructor (props) {
@@ -19,7 +18,7 @@ class MarkdownEditor extends React.Component {
     this.supportMdSelectionBold = [16, 17, 186]
 
     this.state = {
-      status: props.config.editor.switchPreview === 'RIGHTCLICK' ? props.config.editor.delfaultStatus : 'PREVIEW',
+      status: 'PREVIEW',
       renderValue: props.value,
       keyPressed: new Set(),
       isLocked: false
@@ -65,10 +64,6 @@ class MarkdownEditor extends React.Component {
     })
   }
 
-  setValue (value) {
-    this.refs.code.setValue(value)
-  }
-
   handleChange (e) {
     this.value = this.refs.code.value
     this.props.onChange(e)
@@ -77,7 +72,9 @@ class MarkdownEditor extends React.Component {
   handleContextMenu (e) {
     const { config } = this.props
     if (config.editor.switchPreview === 'RIGHTCLICK') {
-      const newStatus = this.state.status === 'PREVIEW' ? 'CODE' : 'PREVIEW'
+      const newStatus = this.state.status === 'PREVIEW'
+        ? 'CODE'
+        : 'PREVIEW'
       this.setState({
         status: newStatus
       }, () => {
@@ -87,10 +84,6 @@ class MarkdownEditor extends React.Component {
           this.refs.preview.focus()
         }
         eventEmitter.emit('topbar:togglelockbutton', this.state.status)
-
-        const newConfig = Object.assign({}, config)
-        newConfig.editor.delfaultStatus = newStatus
-        ConfigManager.set(newConfig)
       })
     }
   }
@@ -99,9 +92,7 @@ class MarkdownEditor extends React.Component {
     if (this.state.isLocked) return
     this.setState({ keyPressed: new Set() })
     const { config } = this.props
-    if (config.editor.switchPreview === 'BLUR' ||
-        (config.editor.switchPreview === 'DBL_CLICK' && this.state.status === 'CODE')
-    ) {
+    if (config.editor.switchPreview === 'BLUR') {
       const cursorPosition = this.refs.code.editor.getCursor()
       this.setState({
         status: 'PREVIEW'
@@ -113,20 +104,6 @@ class MarkdownEditor extends React.Component {
     }
   }
 
-  handleDoubleClick (e) {
-    if (this.state.isLocked) return
-    this.setState({keyPressed: new Set()})
-    const { config } = this.props
-    if (config.editor.switchPreview === 'DBL_CLICK') {
-      this.setState({
-        status: 'CODE'
-      }, () => {
-        this.refs.code.focus()
-        eventEmitter.emit('topbar:togglelockbutton', this.state.status)
-      })
-    }
-  }
-
   handlePreviewMouseDown (e) {
     this.previewMouseDownedAt = new Date()
   }
@@ -147,10 +124,8 @@ class MarkdownEditor extends React.Component {
     e.preventDefault()
     e.stopPropagation()
     const idMatch = /checkbox-([0-9]+)/
-    const checkedMatch = /^\s*[\+\-\*] \[x\]/i
-    const uncheckedMatch = /^\s*[\+\-\*] \[ \]/
-    const checkReplace = /\[x\]/i
-    const uncheckReplace = /\[ \]/
+    const checkedMatch = /\[x\]/i
+    const uncheckedMatch = /\[ \]/
     if (idMatch.test(e.target.getAttribute('id'))) {
       const lineIndex = parseInt(e.target.getAttribute('id').match(idMatch)[1], 10) - 1
       const lines = this.refs.code.value
@@ -159,10 +134,10 @@ class MarkdownEditor extends React.Component {
       const targetLine = lines[lineIndex]
 
       if (targetLine.match(checkedMatch)) {
-        lines[lineIndex] = targetLine.replace(checkReplace, '[ ]')
+        lines[lineIndex] = targetLine.replace(checkedMatch, '[ ]')
       }
       if (targetLine.match(uncheckedMatch)) {
-        lines[lineIndex] = targetLine.replace(uncheckReplace, '[x]')
+        lines[lineIndex] = targetLine.replace(uncheckedMatch, '[x]')
       }
       this.refs.code.setValue(lines.join('\n'))
     }
@@ -232,7 +207,7 @@ class MarkdownEditor extends React.Component {
   }
 
   render () {
-    const {className, value, config, storageKey, noteKey} = this.props
+    const { className, value, config, storageKey } = this.props
 
     let editorFontSize = parseInt(config.editor.fontSize, 10)
     if (!(editorFontSize > 0 && editorFontSize < 101)) editorFontSize = 14
@@ -259,7 +234,7 @@ class MarkdownEditor extends React.Component {
             : 'codeEditor--hide'
           }
           ref='code'
-          mode='Boost Flavored Markdown'
+          mode='GitHub Flavored Markdown'
           value={value}
           theme={config.editor.theme}
           keyMap={config.editor.keyMap}
@@ -267,20 +242,11 @@ class MarkdownEditor extends React.Component {
           fontSize={editorFontSize}
           indentType={config.editor.indentType}
           indentSize={editorIndentSize}
-          enableRulers={config.editor.enableRulers}
-          rulers={config.editor.rulers}
           displayLineNumbers={config.editor.displayLineNumbers}
           scrollPastEnd={config.editor.scrollPastEnd}
           storageKey={storageKey}
-          noteKey={noteKey}
-          fetchUrlTitle={config.editor.fetchUrlTitle}
-          enableTableEditor={config.editor.enableTableEditor}
           onChange={(e) => this.handleChange(e)}
           onBlur={(e) => this.handleBlur(e)}
-          spellCheck={config.editor.spellcheck}
-          enableSmartPaste={config.editor.enableSmartPaste}
-          hotkey={config.hotkey}
-          switchPreview={config.editor.switchPreview}
         />
         <MarkdownPreview styleName={this.state.status === 'PREVIEW'
             ? 'preview'
@@ -296,13 +262,8 @@ class MarkdownEditor extends React.Component {
           lineNumber={config.preview.lineNumber}
           indentSize={editorIndentSize}
           scrollPastEnd={config.preview.scrollPastEnd}
-          smartQuotes={config.preview.smartQuotes}
-          smartArrows={config.preview.smartArrows}
-          breaks={config.preview.breaks}
-          sanitize={config.preview.sanitize}
           ref='preview'
           onContextMenu={(e) => this.handleContextMenu(e)}
-          onDoubleClick={(e) => this.handleDoubleClick(e)}
           tabIndex='0'
           value={this.state.renderValue}
           onMouseUp={(e) => this.handlePreviewMouseUp(e)}
@@ -310,10 +271,6 @@ class MarkdownEditor extends React.Component {
           onCheckboxClick={(e) => this.handleCheckboxClick(e)}
           showCopyNotification={config.ui.showCopyNotification}
           storagePath={storage.path}
-          noteKey={noteKey}
-          customCSS={config.preview.customCSS}
-          allowCustomCSS={config.preview.allowCustomCSS}
-          lineThroughCheckbox={config.preview.lineThroughCheckbox}
         />
       </div>
     )

browser/components/MarkdownEditor.styl

@@ -16,6 +16,7 @@
 .preview
   display block
   absolute top bottom left right
+  z-index 100
   background-color white
   height 100%
   width 100%

browser/components/MarkdownPreview.js

@@ -1,58 +1,30 @@
 import PropTypes from 'prop-types'
 import React from 'react'
-import Markdown from 'browser/lib/markdown'
+import markdown from 'browser/lib/markdown'
 import _ from 'lodash'
 import CodeMirror from 'codemirror'
 import 'codemirror-mode-elixir'
 import consts from 'browser/lib/consts'
 import Raphael from 'raphael'
 import flowchart from 'flowchart'
-import mermaidRender from './render/MermaidRender'
 import SequenceDiagram from 'js-sequence-diagrams'
-import Chart from 'chart.js'
 import eventEmitter from 'browser/main/lib/eventEmitter'
+import fs from 'fs'
 import htmlTextHelper from 'browser/lib/htmlTextHelper'
-import convertModeName from 'browser/lib/convertModeName'
 import copy from 'copy-to-clipboard'
 import mdurl from 'mdurl'
-import exportNote from 'browser/main/lib/dataApi/exportNote'
-import { escapeHtmlCharacters } from 'browser/lib/utils'
-import yaml from 'js-yaml'
-import context from 'browser/lib/context'
-import i18n from 'browser/lib/i18n'
-import fs from 'fs'
-import ConfigManager from '../main/lib/ConfigManager'
-
-const { remote, shell } = require('electron')
-const attachmentManagement = require('../main/lib/dataApi/attachmentManagement')
 
+const { remote } = require('electron')
 const { app } = remote
 const path = require('path')
-const fileUrl = require('file-url')
-
 const dialog = remote.dialog
 
-const uri2path = require('file-uri-to-path')
-
 const markdownStyle = require('!!css!stylus?sourceMap!./markdown.styl')[0][1]
-const appPath = fileUrl(
-  process.env.NODE_ENV === 'production' ? app.getAppPath() : path.resolve()
-)
-const CSS_FILES = [
-  `${appPath}/node_modules/katex/dist/katex.min.css`,
-  `${appPath}/node_modules/codemirror/lib/codemirror.css`
-]
+const appPath = 'file://' + (process.env.NODE_ENV === 'production'
+  ? app.getAppPath()
+  : path.resolve())
 
-function buildStyle (
-  fontFamily,
-  fontSize,
-  codeBlockFontFamily,
-  lineNumber,
-  scrollPastEnd,
-  theme,
-  allowCustomCSS,
-  customCSS
-) {
+function buildStyle (fontFamily, fontSize, codeBlockFontFamily, lineNumber, scrollPastEnd) {
   return `
 @font-face {
   font-family: 'Lato';
@@ -72,28 +44,12 @@ function buildStyle (
   font-weight: 700;
   text-rendering: optimizeLegibility;
 }
-@font-face {
-  font-family: 'Material Icons';
-  font-style: normal;
-  font-weight: 400;
-  src: local('Material Icons'),
-       local('MaterialIcons-Regular'),
-       url('${appPath}/resources/fonts/MaterialIcons-Regular.woff2') format('woff2'),
-       url('${appPath}/resources/fonts/MaterialIcons-Regular.woff') format('woff'),
-       url('${appPath}/resources/fonts/MaterialIcons-Regular.ttf') format('truetype');
-}
 ${markdownStyle}
-
 body {
   font-family: '${fontFamily.join("','")}';
   font-size: ${fontSize}px;
   ${scrollPastEnd && 'padding-bottom: 90vh;'}
 }
-@media print {
-  body {
-    padding-bottom: initial;
-  }
-}
 code {
   font-family: '${codeBlockFontFamily.join("','")}';
   background-color: rgba(0,0,0,0.04);
@@ -140,40 +96,10 @@ h2 {
 body p {
   white-space: normal;
 }
-
-@media print {
-  body[data-theme="${theme}"] {
-    color: #000;
-    background-color: #fff;
-  }
-  .clipboardButton {
-    display: none
-  }
-}
-
-${allowCustomCSS ? customCSS : ''}
 `
 }
 
-const scrollBarStyle = `
-::-webkit-scrollbar {
-  width: 12px;
-}
-
-::-webkit-scrollbar-thumb {
-  background-color: rgba(0, 0, 0, 0.15);
-}
-`
-const scrollBarDarkStyle = `
-::-webkit-scrollbar {
-  width: 12px;
-}
-
-::-webkit-scrollbar-thumb {
-  background-color: rgba(0, 0, 0, 0.3);
-}
-`
-
+const { shell } = require('electron')
 const OSX = global.process.platform === 'darwin'
 
 const defaultFontFamily = ['helvetica', 'arial', 'sans-serif']
@@ -181,93 +107,52 @@ if (!OSX) {
   defaultFontFamily.unshift('Microsoft YaHei')
   defaultFontFamily.unshift('meiryo')
 }
-const defaultCodeBlockFontFamily = [
-  'Monaco',
-  'Menlo',
-  'Ubuntu Mono',
-  'Consolas',
-  'source-code-pro',
-  'monospace'
-]
+const defaultCodeBlockFontFamily = ['Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'source-code-pro', 'monospace']
+
 export default class MarkdownPreview extends React.Component {
   constructor (props) {
     super(props)
 
-    this.contextMenuHandler = e => this.handleContextMenu(e)
-    this.mouseDownHandler = e => this.handleMouseDown(e)
-    this.mouseUpHandler = e => this.handleMouseUp(e)
-    this.DoubleClickHandler = e => this.handleDoubleClick(e)
-    this.scrollHandler = _.debounce(this.handleScroll.bind(this), 100, {
-      leading: false,
-      trailing: true
-    })
-    this.checkboxClickHandler = e => this.handleCheckboxClick(e)
+    this.contextMenuHandler = (e) => this.handleContextMenu(e)
+    this.mouseDownHandler = (e) => this.handleMouseDown(e)
+    this.mouseUpHandler = (e) => this.handleMouseUp(e)
+    this.anchorClickHandler = (e) => this.handlePreviewAnchorClick(e)
+    this.checkboxClickHandler = (e) => this.handleCheckboxClick(e)
     this.saveAsTextHandler = () => this.handleSaveAsText()
     this.saveAsMdHandler = () => this.handleSaveAsMd()
     this.saveAsHtmlHandler = () => this.handleSaveAsHtml()
     this.printHandler = () => this.handlePrint()
 
     this.linkClickHandler = this.handlelinkClick.bind(this)
-    this.initMarkdown = this.initMarkdown.bind(this)
-    this.initMarkdown()
   }
 
-  initMarkdown () {
-    const { smartQuotes, sanitize, breaks } = this.props
-    this.markdown = new Markdown({
-      typographer: smartQuotes,
-      sanitize,
-      breaks
-    })
+  handlePreviewAnchorClick (e) {
+    e.preventDefault()
+    e.stopPropagation()
+
+    const anchor = e.target.closest('a')
+    const href = anchor.getAttribute('href')
+    if (_.isString(href) && href.match(/^#/)) {
+      const targetElement = this.refs.root.contentWindow.document.getElementById(href.substring(1, href.length))
+      if (targetElement != null) {
+        this.getWindow().scrollTo(0, targetElement.offsetTop)
+      }
+    } else {
+      shell.openExternal(href)
+    }
   }
 
   handleCheckboxClick (e) {
     this.props.onCheckboxClick(e)
   }
 
-  handleScroll (e) {
-    if (this.props.onScroll) {
-      this.props.onScroll(e)
-    }
-  }
-
-  handleContextMenu (event) {
-    // If a contextMenu handler was passed to us, use it instead of the self-defined one -> return
-    if (_.isFunction(this.props.onContextMenu)) {
-      this.props.onContextMenu(event)
-      return
-    }
-    // No contextMenu was passed to us -> execute our own link-opener
-    if (event.target.tagName.toLowerCase() === 'a') {
-      const href = event.target.href
-      const isLocalFile = href.startsWith('file:')
-      if (isLocalFile) {
-        const absPath = uri2path(href)
-        try {
-          if (fs.lstatSync(absPath).isFile()) {
-            context.popup([
-              {
-                label: i18n.__('Show in explorer'),
-                click: (e) => shell.showItemInFolder(absPath)
-              }
-            ])
-          }
-        } catch (e) {
-          console.log('Error while evaluating if the file is locally available', e)
-        }
-      }
-    }
-  }
-
-  handleDoubleClick (e) {
-    if (this.props.onDoubleClick != null) this.props.onDoubleClick(e)
+  handleContextMenu (e) {
+    if (!this.props.onContextMenu) return
+    this.props.onContextMenu(e)
   }
 
   handleMouseDown (e) {
-    const config = ConfigManager.get()
-    if (config.editor.switchPreview === 'RIGHTCLICK' && e.buttons === 2 && config.editor.type === 'SPLIT') {
-      eventEmitter.emit('topbar:togglemodebutton', 'CODE')
-    }
+    if (!this.props.onMouseDown) return
     if (e.target != null) {
       switch (e.target.tagName) {
         case 'A':
@@ -295,57 +180,8 @@ export default class MarkdownPreview extends React.Component {
   }
 
   handleSaveAsHtml () {
-    this.exportAsDocument('html', (noteContent, exportTasks) => {
-      const {
-        fontFamily,
-        fontSize,
-        codeBlockFontFamily,
-        lineNumber,
-        codeBlockTheme,
-        scrollPastEnd,
-        theme,
-        allowCustomCSS,
-        customCSS
-      } = this.getStyleParams()
-
-      const inlineStyles = buildStyle(
-        fontFamily,
-        fontSize,
-        codeBlockFontFamily,
-        lineNumber,
-        scrollPastEnd,
-        theme,
-        allowCustomCSS,
-        customCSS
-      )
-      let body = this.markdown.render(noteContent)
-      const files = [this.GetCodeThemeLink(codeBlockTheme), ...CSS_FILES]
-      files.forEach(file => {
-        if (global.process.platform === 'win32') {
-          file = file.replace('file:///', '')
-        } else {
-          file = file.replace('file://', '')
-        }
-        exportTasks.push({
-          src: file,
-          dst: 'css'
-        })
-      })
-
-      let styles = ''
-      files.forEach(file => {
-        styles += `<link rel="stylesheet" href="css/${path.basename(file)}">`
-      })
-
-      return `<html>
-                 <head>
-                   <meta charset="UTF-8">
-                   <meta name = "viewport" content = "width = device-width, initial-scale = 1, maximum-scale = 1">
-                   <style id="style">${inlineStyles}</style>
-                   ${styles}
-                 </head>
-                 <body>${body}</body>
-              </html>`
+    this.exportAsDocument('html', (value) => {
+      return this.refs.root.contentWindow.document.documentElement.outerHTML
     })
   }
 
@@ -353,110 +189,53 @@ export default class MarkdownPreview extends React.Component {
     this.refs.root.contentWindow.print()
   }
 
-  exportAsDocument (fileType, contentFormatter) {
+  exportAsDocument (fileType, formatter) {
     const options = {
-      filters: [{ name: 'Documents', extensions: [fileType] }],
+      filters: [
+        { name: 'Documents', extensions: [fileType] }
+      ],
       properties: ['openFile', 'createDirectory']
     }
+    const value = formatter ? formatter.call(this, this.props.value) : this.props.value
 
-    dialog.showSaveDialog(remote.getCurrentWindow(), options, filename => {
+    dialog.showSaveDialog(remote.getCurrentWindow(), options,
+    (filename) => {
       if (filename) {
-        const content = this.props.value
-        const storage = this.props.storagePath
-        const nodeKey = this.props.noteKey
-
-        exportNote(nodeKey, storage, content, filename, contentFormatter)
-          .then(res => {
-            dialog.showMessageBox(remote.getCurrentWindow(), {
-              type: 'info',
-              message: `Exported to ${filename}`
-            })
-          })
-          .catch(err => {
-            dialog.showErrorBox(
-              'Export error',
-              err ? err.message || err : 'Unexpected error during export'
-            )
-            throw err
-          })
+        fs.writeFile(filename, value, (err) => {
+          if (err) throw err
+        })
       }
     })
   }
 
   fixDecodedURI (node) {
-    if (
-      node &&
-      node.children.length === 1 &&
-      typeof node.children[0] === 'string'
-    ) {
+    if (node && node.children.length === 1 && typeof node.children[0] === 'string') {
       const { innerText, href } = node
 
-      node.innerText = mdurl.decode(href) === innerText ? href : innerText
-    }
-  }
-
-  getScrollBarStyle () {
-    const { theme } = this.props
-
-    switch (theme) {
-      case 'dark':
-      case 'solarized-dark':
-      case 'monokai':
-      case 'dracula':
-        return scrollBarDarkStyle
-      default:
-        return scrollBarStyle
+      node.innerText = mdurl.decode(href) === innerText
+        ? href
+        : innerText
     }
   }
 
   componentDidMount () {
     this.refs.root.setAttribute('sandbox', 'allow-scripts')
-    this.refs.root.contentWindow.document.body.addEventListener(
-      'contextmenu',
-      this.contextMenuHandler
-    )
+    this.refs.root.contentWindow.document.body.addEventListener('contextmenu', this.contextMenuHandler)
 
-    let styles = `
+    this.refs.root.contentWindow.document.head.innerHTML = `
       <style id='style'></style>
+      <link rel="stylesheet" href="${appPath}/node_modules/katex/dist/katex.min.css">
+      <link rel="stylesheet" href="${appPath}/node_modules/codemirror/lib/codemirror.css">
       <link rel="stylesheet" id="codeTheme">
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-      <style>
-        ${this.getScrollBarStyle()}
-      </style>
     `
-
-    CSS_FILES.forEach(file => {
-      styles += `<link rel="stylesheet" href="${file}">`
-    })
-
-    this.refs.root.contentWindow.document.head.innerHTML = styles
     this.rewriteIframe()
     this.applyStyle()
 
-    this.refs.root.contentWindow.document.addEventListener(
-      'mousedown',
-      this.mouseDownHandler
-    )
-    this.refs.root.contentWindow.document.addEventListener(
-      'mouseup',
-      this.mouseUpHandler
-    )
-    this.refs.root.contentWindow.document.addEventListener(
-      'dblclick',
-      this.DoubleClickHandler
-    )
-    this.refs.root.contentWindow.document.addEventListener(
-      'drop',
-      this.preventImageDroppedHandler
-    )
-    this.refs.root.contentWindow.document.addEventListener(
-      'dragover',
-      this.preventImageDroppedHandler
-    )
-    this.refs.root.contentWindow.document.addEventListener(
-      'scroll',
-      this.scrollHandler
-    )
+    this.refs.root.contentWindow.document.addEventListener('mousedown', this.mouseDownHandler)
+    this.refs.root.contentWindow.document.addEventListener('mouseup', this.mouseUpHandler)
+    this.refs.root.contentWindow.document.addEventListener('drop', this.preventImageDroppedHandler)
+    this.refs.root.contentWindow.document.addEventListener('dragover', this.preventImageDroppedHandler)
     eventEmitter.on('export:save-text', this.saveAsTextHandler)
     eventEmitter.on('export:save-md', this.saveAsMdHandler)
     eventEmitter.on('export:save-html', this.saveAsHtmlHandler)
@@ -464,34 +243,11 @@ export default class MarkdownPreview extends React.Component {
   }
 
   componentWillUnmount () {
-    this.refs.root.contentWindow.document.body.removeEventListener(
-      'contextmenu',
-      this.contextMenuHandler
-    )
-    this.refs.root.contentWindow.document.removeEventListener(
-      'mousedown',
-      this.mouseDownHandler
-    )
-    this.refs.root.contentWindow.document.removeEventListener(
-      'mouseup',
-      this.mouseUpHandler
-    )
-    this.refs.root.contentWindow.document.removeEventListener(
-      'dblclick',
-      this.DoubleClickHandler
-    )
-    this.refs.root.contentWindow.document.removeEventListener(
-      'drop',
-      this.preventImageDroppedHandler
-    )
-    this.refs.root.contentWindow.document.removeEventListener(
-      'dragover',
-      this.preventImageDroppedHandler
-    )
-    this.refs.root.contentWindow.document.removeEventListener(
-      'scroll',
-      this.scrollHandler
-    )
+    this.refs.root.contentWindow.document.body.removeEventListener('contextmenu', this.contextMenuHandler)
+    this.refs.root.contentWindow.document.removeEventListener('mousedown', this.mouseDownHandler)
+    this.refs.root.contentWindow.document.removeEventListener('mouseup', this.mouseUpHandler)
+    this.refs.root.contentWindow.document.removeEventListener('drop', this.preventImageDroppedHandler)
+    this.refs.root.contentWindow.document.removeEventListener('dragover', this.preventImageDroppedHandler)
     eventEmitter.off('export:save-text', this.saveAsTextHandler)
     eventEmitter.off('export:save-md', this.saveAsMdHandler)
     eventEmitter.off('export:save-html', this.saveAsHtmlHandler)
@@ -500,196 +256,123 @@ export default class MarkdownPreview extends React.Component {
 
   componentDidUpdate (prevProps) {
     if (prevProps.value !== this.props.value) this.rewriteIframe()
-    if (
-      prevProps.smartQuotes !== this.props.smartQuotes ||
-      prevProps.sanitize !== this.props.sanitize ||
-      prevProps.smartArrows !== this.props.smartArrows ||
-      prevProps.breaks !== this.props.breaks ||
-      prevProps.lineThroughCheckbox !== this.props.lineThroughCheckbox
-    ) {
-      this.initMarkdown()
-      this.rewriteIframe()
-    }
-    if (
-      prevProps.fontFamily !== this.props.fontFamily ||
+    if (prevProps.fontFamily !== this.props.fontFamily ||
       prevProps.fontSize !== this.props.fontSize ||
       prevProps.codeBlockFontFamily !== this.props.codeBlockFontFamily ||
       prevProps.codeBlockTheme !== this.props.codeBlockTheme ||
       prevProps.lineNumber !== this.props.lineNumber ||
       prevProps.showCopyNotification !== this.props.showCopyNotification ||
       prevProps.theme !== this.props.theme ||
-      prevProps.scrollPastEnd !== this.props.scrollPastEnd ||
-      prevProps.allowCustomCSS !== this.props.allowCustomCSS ||
-      prevProps.customCSS !== this.props.customCSS
-    ) {
+      prevProps.scrollPastEnd !== this.props.scrollPastEnd) {
       this.applyStyle()
       this.rewriteIframe()
     }
   }
 
-  getStyleParams () {
-    const {
-      fontSize,
-      lineNumber,
-      codeBlockTheme,
-      scrollPastEnd,
-      theme,
-      allowCustomCSS,
-      customCSS
-    } = this.props
+  applyStyle () {
+    const { fontSize, lineNumber, codeBlockTheme, scrollPastEnd } = this.props
     let { fontFamily, codeBlockFontFamily } = this.props
     fontFamily = _.isString(fontFamily) && fontFamily.trim().length > 0
-      ? fontFamily
-          .split(',')
-          .map(fontName => fontName.trim())
-          .concat(defaultFontFamily)
+      ? fontFamily.split(',').map(fontName => fontName.trim()).concat(defaultFontFamily)
       : defaultFontFamily
-    codeBlockFontFamily = _.isString(codeBlockFontFamily) &&
-      codeBlockFontFamily.trim().length > 0
-      ? codeBlockFontFamily
-          .split(',')
-          .map(fontName => fontName.trim())
-          .concat(defaultCodeBlockFontFamily)
+    codeBlockFontFamily = _.isString(codeBlockFontFamily) && codeBlockFontFamily.trim().length > 0
+      ? codeBlockFontFamily.split(',').map(fontName => fontName.trim()).concat(defaultCodeBlockFontFamily)
       : defaultCodeBlockFontFamily
 
-    return {
-      fontFamily,
-      fontSize,
-      codeBlockFontFamily,
-      lineNumber,
-      codeBlockTheme,
-      scrollPastEnd,
-      theme,
-      allowCustomCSS,
-      customCSS
-    }
+    this.setCodeTheme(codeBlockTheme)
+    this.getWindow().document.getElementById('style').innerHTML = buildStyle(fontFamily, fontSize, codeBlockFontFamily, lineNumber, scrollPastEnd)
   }
 
-  applyStyle () {
-    const {
-      fontFamily,
-      fontSize,
-      codeBlockFontFamily,
-      lineNumber,
-      codeBlockTheme,
-      scrollPastEnd,
-      theme,
-      allowCustomCSS,
-      customCSS
-    } = this.getStyleParams()
-
-    this.getWindow().document.getElementById(
-      'codeTheme'
-    ).href = this.GetCodeThemeLink(codeBlockTheme)
-    this.getWindow().document.getElementById('style').innerHTML = buildStyle(
-      fontFamily,
-      fontSize,
-      codeBlockFontFamily,
-      lineNumber,
-      scrollPastEnd,
-      theme,
-      allowCustomCSS,
-      customCSS
-    )
-  }
-
-  GetCodeThemeLink (theme) {
-    theme = consts.THEMES.some(_theme => _theme === theme) &&
-      theme !== 'default'
+  setCodeTheme (theme) {
+    theme = consts.THEMES.some((_theme) => _theme === theme) && theme !== 'default'
       ? theme
       : 'elegant'
-    return theme.startsWith('solarized')
+    this.getWindow().document.getElementById('codeTheme').href = theme.startsWith('solarized')
       ? `${appPath}/node_modules/codemirror/theme/solarized.css`
       : `${appPath}/node_modules/codemirror/theme/${theme}.css`
   }
 
   rewriteIframe () {
-    _.forEach(
-      this.refs.root.contentWindow.document.querySelectorAll(
-        'input[type="checkbox"]'
-      ),
-      el => {
-        el.removeEventListener('click', this.checkboxClickHandler)
-      }
-    )
+    _.forEach(this.refs.root.contentWindow.document.querySelectorAll('a'), (el) => {
+      el.removeEventListener('click', this.anchorClickHandler)
+    })
+    _.forEach(this.refs.root.contentWindow.document.querySelectorAll('input[type="checkbox"]'), (el) => {
+      el.removeEventListener('click', this.checkboxClickHandler)
+    })
 
-    _.forEach(
-      this.refs.root.contentWindow.document.querySelectorAll('a'),
-      el => {
-        el.removeEventListener('click', this.linkClickHandler)
-      }
-    )
+    _.forEach(this.refs.root.contentWindow.document.querySelectorAll('a'), (el) => {
+      el.removeEventListener('click', this.linkClickHandler)
+    })
 
-    const {
-      theme,
-      indentSize,
-      showCopyNotification,
-      storagePath,
-      noteKey
-    } = this.props
+    const { theme, indentSize, showCopyNotification, storagePath } = this.props
     let { value, codeBlockTheme } = this.props
 
     this.refs.root.contentWindow.document.body.setAttribute('data-theme', theme)
-    const renderedHTML = this.markdown.render(value)
-    attachmentManagement.migrateAttachments(value, storagePath, noteKey)
-    this.refs.root.contentWindow.document.body.innerHTML = attachmentManagement.fixLocalURLS(
-      renderedHTML,
-      storagePath
-    )
-    _.forEach(
-      this.refs.root.contentWindow.document.querySelectorAll(
-        'input[type="checkbox"]'
-      ),
-      el => {
-        el.addEventListener('click', this.checkboxClickHandler)
-      }
-    )
 
-    _.forEach(
-      this.refs.root.contentWindow.document.querySelectorAll('a'),
-      el => {
-        this.fixDecodedURI(el)
-        el.addEventListener('click', this.linkClickHandler)
-      }
-    )
+    const codeBlocks = value.match(/(```)(.|[\n])*?(```)/g)
+    if (codeBlocks !== null) {
+      codeBlocks.forEach((codeBlock) => {
+        value = value.replace(codeBlock, htmlTextHelper.encodeEntities(codeBlock))
+      })
+    }
+    this.refs.root.contentWindow.document.body.innerHTML = markdown.render(value)
 
-    codeBlockTheme = consts.THEMES.some(_theme => _theme === codeBlockTheme)
+    _.forEach(this.refs.root.contentWindow.document.querySelectorAll('.taskListItem'), (el) => {
+      el.parentNode.parentNode.style.listStyleType = 'none'
+    })
+
+    _.forEach(this.refs.root.contentWindow.document.querySelectorAll('a'), (el) => {
+      this.fixDecodedURI(el)
+      el.addEventListener('click', this.anchorClickHandler)
+    })
+
+    _.forEach(this.refs.root.contentWindow.document.querySelectorAll('input[type="checkbox"]'), (el) => {
+      el.addEventListener('click', this.checkboxClickHandler)
+    })
+
+    _.forEach(this.refs.root.contentWindow.document.querySelectorAll('a'), (el) => {
+      el.addEventListener('click', this.linkClickHandler)
+    })
+
+    _.forEach(this.refs.root.contentWindow.document.querySelectorAll('img'), (el) => {
+      el.src = markdown.normalizeLinkText(el.src)
+      if (!/\/:storage/.test(el.src)) return
+      el.src = `file:///${markdown.normalizeLinkText(path.join(storagePath, 'images', path.basename(el.src)))}`
+    })
+
+    codeBlockTheme = consts.THEMES.some((_theme) => _theme === codeBlockTheme)
       ? codeBlockTheme
       : 'default'
 
-    _.forEach(
-      this.refs.root.contentWindow.document.querySelectorAll('.code code'),
-      el => {
-        let syntax = CodeMirror.findModeByName(convertModeName(el.className))
-        if (syntax == null) syntax = CodeMirror.findModeByName('Plain Text')
-        CodeMirror.requireMode(syntax.mode, () => {
-          const content = htmlTextHelper.decodeEntities(el.innerHTML)
-          const copyIcon = document.createElement('i')
-          copyIcon.innerHTML =
-            '<button class="clipboardButton"><svg width="13" height="13" viewBox="0 0 1792 1792" ><path d="M768 1664h896v-640h-416q-40 0-68-28t-28-68v-416h-384v1152zm256-1440v-64q0-13-9.5-22.5t-22.5-9.5h-704q-13 0-22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h704q13 0 22.5-9.5t9.5-22.5zm256 672h299l-299-299v299zm512 128v672q0 40-28 68t-68 28h-960q-40 0-68-28t-28-68v-160h-544q-40 0-68-28t-28-68v-1344q0-40 28-68t68-28h1088q40 0 68 28t28 68v328q21 13 36 28l408 408q28 28 48 76t20 88z"/></svg></button>'
-          copyIcon.onclick = e => {
-            copy(content)
-            if (showCopyNotification) {
-              this.notify('Saved to Clipboard!', {
-                body: 'Paste it wherever you want!',
-                silent: true
-              })
-            }
+    _.forEach(this.refs.root.contentWindow.document.querySelectorAll('.code code'), (el) => {
+      let syntax = CodeMirror.findModeByName(el.className)
+      if (syntax == null) syntax = CodeMirror.findModeByName('Plain Text')
+      CodeMirror.requireMode(syntax.mode, () => {
+        const content = htmlTextHelper.decodeEntities(el.innerHTML)
+        const copyIcon = document.createElement('i')
+        copyIcon.innerHTML = '<button class="clipboardButton"><svg width="13" height="13" viewBox="0 0 1792 1792" ><path d="M768 1664h896v-640h-416q-40 0-68-28t-28-68v-416h-384v1152zm256-1440v-64q0-13-9.5-22.5t-22.5-9.5h-704q-13 0-22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h704q13 0 22.5-9.5t9.5-22.5zm256 672h299l-299-299v299zm512 128v672q0 40-28 68t-68 28h-960q-40 0-68-28t-28-68v-160h-544q-40 0-68-28t-28-68v-1344q0-40 28-68t68-28h1088q40 0 68 28t28 68v328q21 13 36 28l408 408q28 28 48 76t20 88z"/></svg></button>'
+        copyIcon.onclick = (e) => {
+          copy(content)
+          if (showCopyNotification) {
+            this.notify('Saved to Clipboard!', {
+              body: 'Paste it wherever you want!',
+              silent: true
+            })
           }
-          el.parentNode.appendChild(copyIcon)
-          el.innerHTML = ''
-          if (codeBlockTheme.indexOf('solarized') === 0) {
-            const [refThema, color] = codeBlockTheme.split(' ')
-            el.parentNode.className += ` cm-s-${refThema} cm-s-${color}`
-          } else {
-            el.parentNode.className += ` cm-s-${codeBlockTheme}`
-          }
-          CodeMirror.runMode(content, syntax.mime, el, {
-            tabSize: indentSize
-          })
+        }
+        el.parentNode.appendChild(copyIcon)
+        el.innerHTML = ''
+        if (codeBlockTheme.indexOf('solarized') === 0) {
+          const [refThema, color] = codeBlockTheme.split(' ')
+          el.parentNode.className += ` cm-s-${refThema} cm-s-${color} CodeMirror`
+        } else {
+          el.parentNode.className += ` cm-s-${codeBlockTheme} CodeMirror`
+        }
+        CodeMirror.runMode(content, syntax.mime, el, {
+          tabSize: indentSize
         })
-      }
-    )
+      })
+    })
     const opts = {}
     // if (this.props.theme === 'dark') {
     //   opts['font-color'] = '#DDD'
@@ -697,76 +380,37 @@ export default class MarkdownPreview extends React.Component {
     //   opts['element-color'] = '#DDD'
     //   opts['fill'] = '#3A404C'
     // }
-    _.forEach(
-      this.refs.root.contentWindow.document.querySelectorAll('.flowchart'),
-      el => {
-        Raphael.setWindow(this.getWindow())
-        try {
-          const diagram = flowchart.parse(
-            htmlTextHelper.decodeEntities(el.innerHTML)
-          )
-          el.innerHTML = ''
-          diagram.drawSVG(el, opts)
-          _.forEach(el.querySelectorAll('a'), el => {
-            el.addEventListener('click', this.linkClickHandler)
-          })
-        } catch (e) {
-          el.className = 'flowchart-error'
-          el.innerHTML = 'Flowchart parse error: ' + e.message
-        }
+    _.forEach(this.refs.root.contentWindow.document.querySelectorAll('.flowchart'), (el) => {
+      Raphael.setWindow(this.getWindow())
+      try {
+        const diagram = flowchart.parse(htmlTextHelper.decodeEntities(el.innerHTML))
+        el.innerHTML = ''
+        diagram.drawSVG(el, opts)
+        _.forEach(el.querySelectorAll('a'), (el) => {
+          el.addEventListener('click', this.anchorClickHandler)
+        })
+      } catch (e) {
+        console.error(e)
+        el.className = 'flowchart-error'
+        el.innerHTML = 'Flowchart parse error: ' + e.message
       }
-    )
+    })
 
-    _.forEach(
-      this.refs.root.contentWindow.document.querySelectorAll('.sequence'),
-      el => {
-        Raphael.setWindow(this.getWindow())
-        try {
-          const diagram = SequenceDiagram.parse(
-            htmlTextHelper.decodeEntities(el.innerHTML)
-          )
-          el.innerHTML = ''
-          diagram.drawSVG(el, { theme: 'simple' })
-          _.forEach(el.querySelectorAll('a'), el => {
-            el.addEventListener('click', this.linkClickHandler)
-          })
-        } catch (e) {
-          el.className = 'sequence-error'
-          el.innerHTML = 'Sequence diagram parse error: ' + e.message
-        }
+    _.forEach(this.refs.root.contentWindow.document.querySelectorAll('.sequence'), (el) => {
+      Raphael.setWindow(this.getWindow())
+      try {
+        const diagram = SequenceDiagram.parse(htmlTextHelper.decodeEntities(el.innerHTML))
+        el.innerHTML = ''
+        diagram.drawSVG(el, {theme: 'simple'})
+        _.forEach(el.querySelectorAll('a'), (el) => {
+          el.addEventListener('click', this.anchorClickHandler)
+        })
+      } catch (e) {
+        console.error(e)
+        el.className = 'sequence-error'
+        el.innerHTML = 'Sequence diagram parse error: ' + e.message
       }
-    )
-
-    _.forEach(
-      this.refs.root.contentWindow.document.querySelectorAll('.chart'),
-      el => {
-        try {
-          const format = el.attributes.getNamedItem('data-format').value
-          const chartConfig = format === 'yaml' ? yaml.load(el.innerHTML) : JSON.parse(el.innerHTML)
-          el.innerHTML = ''
-
-          const canvas = document.createElement('canvas')
-          el.appendChild(canvas)
-
-          const height = el.attributes.getNamedItem('data-height')
-          if (height && height.value !== 'undefined') {
-            el.style.height = height.value + 'vh'
-            canvas.height = height.value + 'vh'
-          }
-
-          const chart = new Chart(canvas, chartConfig)
-        } catch (e) {
-          el.className = 'chart-error'
-          el.innerHTML = 'chartjs diagram parse error: ' + e.message
-        }
-      }
-    )
-    _.forEach(
-      this.refs.root.contentWindow.document.querySelectorAll('.mermaid'),
-      el => {
-        mermaidRender(el, htmlTextHelper.decodeEntities(el.innerHTML), theme)
-      }
-    )
+    })
   }
 
   focus () {
@@ -778,9 +422,7 @@ export default class MarkdownPreview extends React.Component {
   }
 
   scrollTo (targetRow) {
-    const blocks = this.getWindow().document.querySelectorAll(
-      'body>[data-line]'
-    )
+    const blocks = this.getWindow().document.querySelectorAll('body>[data-line]')
 
     for (let index = 0; index < blocks.length; index++) {
       let block = blocks[index]
@@ -800,73 +442,25 @@ export default class MarkdownPreview extends React.Component {
 
   notify (title, options) {
     if (global.process.platform === 'win32') {
-      options.icon = path.join(
-        'file://',
-        global.__dirname,
-        '../../resources/app.png'
-      )
+      options.icon = path.join('file://', global.__dirname, '../../resources/app.png')
     }
     return new window.Notification(title, options)
   }
 
   handlelinkClick (e) {
-    e.preventDefault()
-    e.stopPropagation()
-
-    const href = e.target.href
-    const linkHash = href.split('/').pop()
-
-    const regexNoteInternalLink = /main.html#(.+)/
-    if (regexNoteInternalLink.test(linkHash)) {
-      const targetId = mdurl.encode(linkHash.match(regexNoteInternalLink)[1])
-      const targetElement = this.refs.root.contentWindow.document.getElementById(
-        targetId
-      )
-
-      if (targetElement != null) {
-        this.getWindow().scrollTo(0, targetElement.offsetTop)
-      }
-      return
+    const noteHash = e.target.href.split('/').pop()
+    const regexIsNoteLink = /^(.{20})-(.{20})$/
+    if (regexIsNoteLink.test(noteHash)) {
+      eventEmitter.emit('list:jump', noteHash)
     }
-
-    // this will match the new uuid v4 hash and the old hash
-    // e.g.
-    // :note:1c211eb7dcb463de6490 and
-    // :note:7dd23275-f2b4-49cb-9e93-3454daf1af9c
-    const regexIsNoteLink = /^:note:([a-zA-Z0-9-]{20,36})$/
-    if (regexIsNoteLink.test(linkHash)) {
-      eventEmitter.emit('list:jump', linkHash.replace(':note:', ''))
-      return
-    }
-
-    const regexIsLine = /^:line:[0-9]/
-    if (regexIsLine.test(linkHash)) {
-      const numberPattern = /\d+/g
-
-      const lineNumber = parseInt(linkHash.match(numberPattern)[0])
-      eventEmitter.emit('line:jump', lineNumber)
-      return
-    }
-
-    // this will match the old link format storage.key-note.key
-    // e.g.
-    // 877f99c3268608328037-1c211eb7dcb463de6490
-    const regexIsLegacyNoteLink = /^(.{20})-(.{20})$/
-    if (regexIsLegacyNoteLink.test(linkHash)) {
-      eventEmitter.emit('list:jump', linkHash.split('-')[1])
-      return
-    }
-
-    // other case
-    shell.openExternal(href)
   }
 
   render () {
     const { className, style, tabIndex } = this.props
     return (
-      <iframe
-        className={
-          className != null ? 'MarkdownPreview ' + className : 'MarkdownPreview'
+      <iframe className={className != null
+          ? 'MarkdownPreview ' + className
+          : 'MarkdownPreview'
         }
         style={style}
         tabIndex={tabIndex}
@@ -881,12 +475,8 @@ MarkdownPreview.propTypes = {
   onDoubleClick: PropTypes.func,
   onMouseUp: PropTypes.func,
   onMouseDown: PropTypes.func,
-  onContextMenu: PropTypes.func,
   className: PropTypes.string,
   value: PropTypes.string,
   showCopyNotification: PropTypes.bool,
-  storagePath: PropTypes.string,
-  smartQuotes: PropTypes.bool,
-  smartArrows: PropTypes.bool,
-  breaks: PropTypes.bool
+  storagePath: PropTypes.string
 }

browser/components/MarkdownSplitEditor.js

@@ -2,7 +2,6 @@ import React from 'react'
 import CodeEditor from 'browser/components/CodeEditor'
 import MarkdownPreview from 'browser/components/MarkdownPreview'
 import { findStorage } from 'browser/lib/findStorage'
-import _ from 'lodash'
 
 import styles from './MarkdownSplitEditor.styl'
 import CSSModules from 'browser/lib/CSSModules'
@@ -13,15 +12,6 @@ class MarkdownSplitEditor extends React.Component {
     this.value = props.value
     this.focus = () => this.refs.code.focus()
     this.reload = () => this.refs.code.reload()
-    this.userScroll = true
-    this.state = {
-      isSliderFocused: false,
-      codeEditorWidthInPercent: 50
-    }
-  }
-
-  setValue (value) {
-    this.refs.code.setValue(value)
   }
 
   handleOnChange () {
@@ -29,59 +19,12 @@ class MarkdownSplitEditor extends React.Component {
     this.props.onChange()
   }
 
-  handleScroll (e) {
-    if (!this.props.config.preview.scrollSync) return
-
-    const previewDoc = _.get(this, 'refs.preview.refs.root.contentWindow.document')
-    const codeDoc = _.get(this, 'refs.code.editor.doc')
-    let srcTop, srcHeight, targetTop, targetHeight
-
-    if (this.userScroll) {
-      if (e.doc) {
-        srcTop = _.get(e, 'doc.scrollTop')
-        srcHeight = _.get(e, 'doc.height')
-        targetTop = _.get(previewDoc, 'body.scrollTop')
-        targetHeight = _.get(previewDoc, 'body.scrollHeight')
-      } else {
-        srcTop = _.get(previewDoc, 'body.scrollTop')
-        srcHeight = _.get(previewDoc, 'body.scrollHeight')
-        targetTop = _.get(codeDoc, 'scrollTop')
-        targetHeight = _.get(codeDoc, 'height')
-      }
-
-      const distance = (targetHeight * srcTop / srcHeight) - targetTop
-      const framerate = 1000 / 60
-      const frames = 20
-      const refractory = frames * framerate
-
-      this.userScroll = false
-
-      let frame = 0
-      let scrollPos, time
-      const timer = setInterval(() => {
-        time = frame / frames
-        scrollPos = time < 0.5
-                  ? 2 * time * time // ease in
-                  : -1 + (4 - 2 * time) * time // ease out
-        if (e.doc) _.set(previewDoc, 'body.scrollTop', targetTop + scrollPos * distance)
-        else _.get(this, 'refs.code.editor').scrollTo(0, targetTop + scrollPos * distance)
-        if (frame >= frames) {
-          clearInterval(timer)
-          setTimeout(() => { this.userScroll = true }, refractory)
-        }
-        frame++
-      }, framerate)
-    }
-  }
-
   handleCheckboxClick (e) {
     e.preventDefault()
     e.stopPropagation()
     const idMatch = /checkbox-([0-9]+)/
-    const checkedMatch = /^\s*[\+\-\*] \[x\]/i
-    const uncheckedMatch = /^\s*[\+\-\*] \[ \]/
-    const checkReplace = /\[x\]/i
-    const uncheckReplace = /\[ \]/
+    const checkedMatch = /\[x\]/i
+    const uncheckedMatch = /\[ \]/
     if (idMatch.test(e.target.getAttribute('id'))) {
       const lineIndex = parseInt(e.target.getAttribute('id').match(idMatch)[1], 10) - 1
       const lines = this.refs.code.value
@@ -90,70 +33,30 @@ class MarkdownSplitEditor extends React.Component {
       const targetLine = lines[lineIndex]
 
       if (targetLine.match(checkedMatch)) {
-        lines[lineIndex] = targetLine.replace(checkReplace, '[ ]')
+        lines[lineIndex] = targetLine.replace(checkedMatch, '[ ]')
       }
       if (targetLine.match(uncheckedMatch)) {
-        lines[lineIndex] = targetLine.replace(uncheckReplace, '[x]')
+        lines[lineIndex] = targetLine.replace(uncheckedMatch, '[x]')
       }
       this.refs.code.setValue(lines.join('\n'))
     }
   }
 
-  handleMouseMove (e) {
-    if (this.state.isSliderFocused) {
-      const rootRect = this.refs.root.getBoundingClientRect()
-      const rootWidth = rootRect.width
-      const offset = rootRect.left
-      let newCodeEditorWidthInPercent = (e.pageX - offset) / rootWidth * 100
-
-      // limit minSize to 10%, maxSize to 90%
-      if (newCodeEditorWidthInPercent <= 10) {
-        newCodeEditorWidthInPercent = 10
-      }
-
-      if (newCodeEditorWidthInPercent >= 90) {
-        newCodeEditorWidthInPercent = 90
-      }
-
-      this.setState({
-        codeEditorWidthInPercent: newCodeEditorWidthInPercent
-      })
-    }
-  }
-
-  handleMouseUp (e) {
-    e.preventDefault()
-    this.setState({
-      isSliderFocused: false
-    })
-  }
-
-  handleMouseDown (e) {
-    e.preventDefault()
-    this.setState({
-      isSliderFocused: true
-    })
-  }
-
   render () {
-    const {config, value, storageKey, noteKey} = this.props
+    const { config, value, storageKey } = this.props
     const storage = findStorage(storageKey)
     let editorFontSize = parseInt(config.editor.fontSize, 10)
     if (!(editorFontSize > 0 && editorFontSize < 101)) editorFontSize = 14
     let editorIndentSize = parseInt(config.editor.indentSize, 10)
     if (!(editorFontSize > 0 && editorFontSize < 132)) editorIndentSize = 4
     const previewStyle = {}
-    previewStyle.width = (100 - this.state.codeEditorWidthInPercent) + '%'
-    if (this.props.ignorePreviewPointerEvents || this.state.isSliderFocused) previewStyle.pointerEvents = 'none'
+    if (this.props.ignorePreviewPointerEvents) previewStyle.pointerEvents = 'none'
     return (
-      <div styleName='root' ref='root'
-        onMouseMove={e => this.handleMouseMove(e)}
-        onMouseUp={e => this.handleMouseUp(e)}>
+      <div styleName='root'>
         <CodeEditor
           styleName='codeEditor'
           ref='code'
-          width={this.state.codeEditorWidthInPercent + '%'}
-          mode='Boost Flavored Markdown'
+          mode='GitHub Flavored Markdown'
           value={value}
           theme={config.editor.theme}
           keyMap={config.editor.keyMap}
@@ -162,23 +65,10 @@ class MarkdownSplitEditor extends React.Component {
           displayLineNumbers={config.editor.displayLineNumbers}
           indentType={config.editor.indentType}
           indentSize={editorIndentSize}
-          enableRulers={config.editor.enableRulers}
-          rulers={config.editor.rulers}
           scrollPastEnd={config.editor.scrollPastEnd}
-          fetchUrlTitle={config.editor.fetchUrlTitle}
-          enableTableEditor={config.editor.enableTableEditor}
           storageKey={storageKey}
-          noteKey={noteKey}
           onChange={this.handleOnChange.bind(this)}
-          onScroll={this.handleScroll.bind(this)}
-          spellCheck={config.editor.spellcheck}
-          enableSmartPaste={config.editor.enableSmartPaste}
-          hotkey={config.hotkey}
-          switchPreview={config.editor.switchPreview}
        />
-        <div styleName='slider' style={{left: this.state.codeEditorWidthInPercent + '%'}} onMouseDown={e => this.handleMouseDown(e)} >
-          <div styleName='slider-hitbox' />
-        </div>
         <MarkdownPreview
           style={previewStyle}
           styleName='preview'
@@ -190,21 +80,12 @@ class MarkdownSplitEditor extends React.Component {
           codeBlockFontFamily={config.editor.fontFamily}
           lineNumber={config.preview.lineNumber}
           scrollPastEnd={config.preview.scrollPastEnd}
-          smartQuotes={config.preview.smartQuotes}
-          smartArrows={config.preview.smartArrows}
-          breaks={config.preview.breaks}
-          sanitize={config.preview.sanitize}
           ref='preview'
           tabInde='0'
           value={value}
           onCheckboxClick={(e) => this.handleCheckboxClick(e)}
-          onScroll={this.handleScroll.bind(this)}
           showCopyNotification={config.ui.showCopyNotification}
           storagePath={storage.path}
-          noteKey={noteKey}
-          customCSS={config.preview.customCSS}
-          allowCustomCSS={config.preview.allowCustomCSS}
-          lineThroughCheckbox={config.preview.lineThroughCheckbox}
        />
       </div>
     )

browser/components/MarkdownSplitEditor.styl

@@ -3,14 +3,7 @@
   height 100%
   font-size 30px
   display flex
-  .slider
-    absolute top bottom
-    top -2px
-    width 0
-    z-index 0
-  .slider-hitbox
-    absolute top bottom left right
-    width 7px
-    left -3px
-    z-index 10
-    cursor col-resize
+  .codeEditor
+    width 50%
+  .preview
+    width 50%

browser/components/NoteItem.js

@@ -8,7 +8,6 @@ import CSSModules from 'browser/lib/CSSModules'
 import { getTodoStatus } from 'browser/lib/getTodoStatus'
 import styles from './NoteItem.styl'
 import TodoProcess from './TodoProcess'
-import i18n from 'browser/lib/i18n'
 
 /**
  * @description Tag element component.
@@ -24,19 +23,18 @@ const TagElement = ({ tagName }) => (
 /**
  * @description Tag element list component.
  * @param {Array|null} tags
- * @param {boolean} showTagsAlphabetically
  * @return {React.Component}
  */
-const TagElementList = (tags, showTagsAlphabetically) => {
+const TagElementList = (tags) => {
   if (!isArray(tags)) {
     return []
   }
 
-  if (showTagsAlphabetically) {
-    return _.sortBy(tags).map(tag => TagElement({ tagName: tag }))
-  } else {
-    return tags.map(tag => TagElement({ tagName: tag }))
-  }
+  const tagElements = tags.map(tag => (
+    TagElement({tagName: tag})
+  ))
+
+  return tagElements
 }
 
 /**
@@ -48,76 +46,46 @@ const TagElementList = (tags, showTagsAlphabetically) => {
  * @param {Function} handleDragStart
  * @param {string} dateDisplay
  */
-const NoteItem = ({
-  isActive,
-  note,
-  dateDisplay,
-  handleNoteClick,
-  handleNoteContextMenu,
-  handleDragStart,
-  pathname,
-  storageName,
-  folderName,
-  viewType,
-  showTagsAlphabetically
-}) => (
-  <div
-    styleName={isActive ? 'item--active' : 'item'}
-    key={note.key}
-    onClick={e => handleNoteClick(e, note.key)}
-    onContextMenu={e => handleNoteContextMenu(e, note.key)}
+const NoteItem = ({ isActive, note, dateDisplay, handleNoteClick, handleNoteContextMenu, handleDragStart, pathname }) => (
+  <div styleName={isActive
+      ? 'item--active'
+      : 'item'
+    }
+    key={`${note.storage}-${note.key}`}
+    onClick={e => handleNoteClick(e, `${note.storage}-${note.key}`)}
+    onContextMenu={e => handleNoteContextMenu(e, `${note.storage}-${note.key}`)}
     onDragStart={e => handleDragStart(e, note)}
     draggable='true'
   >
     <div styleName='item-wrapper'>
       {note.type === 'SNIPPET_NOTE'
         ? <i styleName='item-title-icon' className='fa fa-fw fa-code' />
-        : <i styleName='item-title-icon' className='fa fa-fw fa-file-text-o' />}
+        : <i styleName='item-title-icon' className='fa fa-fw fa-file-text-o' />
+      }
       <div styleName='item-title'>
         {note.title.trim().length > 0
           ? note.title
-          : <span styleName='item-title-empty'>{i18n.__('Empty note')}</span>}
-      </div>
-      <div styleName='item-middle'>
-        <div styleName='item-middle-time'>{dateDisplay}</div>
-        <div styleName='item-middle-app-meta'>
-          <div
-            title={
-              viewType === 'ALL'
-                ? storageName
-                : viewType === 'STORAGE' ? folderName : null
-            }
-            styleName='item-middle-app-meta-label'
-          >
-            {viewType === 'ALL' && storageName}
-            {viewType === 'STORAGE' && folderName}
-          </div>
-        </div>
+          : <span styleName='item-title-empty'>Empty</span>
+        }
       </div>
+
+      <div styleName='item-bottom-time'>{dateDisplay}</div>
+      {note.isStarred
+        ? <img styleName='item-star' src='../resources/icon/icon-starred.svg' /> : ''
+      }
+      {note.isPinned && !pathname.match(/\/home|\/starred|\/trash/)
+        ? <i styleName='item-pin' className='fa fa-thumb-tack' /> : ''
+      }
+      {note.type === 'MARKDOWN_NOTE'
+        ? <TodoProcess todoStatus={getTodoStatus(note.content)} />
+        : ''
+      }
       <div styleName='item-bottom'>
         <div styleName='item-bottom-tagList'>
           {note.tags.length > 0
-            ? TagElementList(note.tags, showTagsAlphabetically)
-            : <span
-              style={{ fontStyle: 'italic', opacity: 0.5 }}
-              styleName='item-bottom-tagList-empty'
-              >
-              {i18n.__('No tags')}
-            </span>}
-        </div>
-        <div>
-          {note.isStarred
-            ? <img
-              styleName='item-star'
-              src='../resources/icon/icon-starred.svg'
-              />
-            : ''}
-          {note.isPinned && !pathname.match(/\/starred|\/trash/)
-            ? <i styleName='item-pin' className='fa fa-thumb-tack' />
-            : ''}
-          {note.type === 'MARKDOWN_NOTE'
-            ? <TodoProcess todoStatus={getTodoStatus(note.content)} />
-            : ''}
+            ? TagElementList(note.tags)
+            : <span styleName='item-bottom-tagList-empty' />
+          }
         </div>
       </div>
     </div>
@@ -134,11 +102,7 @@ NoteItem.propTypes = {
     title: PropTypes.string.isrequired,
     tags: PropTypes.array,
     isStarred: PropTypes.bool.isRequired,
-    isTrashed: PropTypes.bool.isRequired,
-    blog: {
-      blogLink: PropTypes.string,
-      blogId: PropTypes.number
-    }
+    isTrashed: PropTypes.bool.isRequired
   }),
   handleNoteClick: PropTypes.func.isRequired,
   handleNoteContextMenu: PropTypes.func.isRequired,

browser/components/NoteItem.styl

@@ -90,26 +90,6 @@ $control-height = 30px
   font-weight normal
   color $ui-inactive-text-color
 
-.item-middle
-  font-size 13px
-  padding-left 2px
-  padding-bottom 2px
-
-.item-middle-time
-  color $ui-inactive-text-color
-  display inline-block
-
-.item-middle-app-meta
-  float right
-  .item-middle-app-meta-label
-    opacity 0.4
-    color $ui-inactive-text-color
-    padding 0 3px
-    white-space nowrap
-    text-overflow ellipsis
-    overflow hidden
-    max-width 200px
-
 .item-bottom
   position relative
   bottom 0px
@@ -117,7 +97,7 @@ $control-height = 30px
   font-size 12px
   line-height 20px
   overflow ellipsis
-  display block
+  display flex
 
 .item-bottom-tagList
   flex 1
@@ -145,8 +125,10 @@ $control-height = 30px
 
 .item-star
   position absolute
-  right 2px
-  top 5px
+  right -6px
+  bottom 23px
+  width 16px
+  height 16px
   color alpha($ui-favorite-star-button-color, 60%)
   font-size 12px
   padding 0
@@ -154,8 +136,10 @@ $control-height = 30px
 
 .item-pin
   position absolute
-  right 25px
-  top 7px
+  right 0px
+  bottom 2px
+  width 34px
+  height 34px
   color #E54D42
   font-size 14px
   padding 0
@@ -208,7 +192,7 @@ body[data-theme="dark"]
       .item-bottom-tagList-item
         transition 0.15s
         background-color alpha(white, 10%)
-        color $ui-dark-text-color
+        color $ui-dark-text-color  
 
   .item-wrapper
     border-color alpha($ui-dark-button--active-backgroundColor, 60%)
@@ -282,7 +266,7 @@ body[data-theme="solarized-dark"]
       .item-bottom-tagList-item
         transition 0.15s
         background-color alpha($ui-solarized-dark-noteList-backgroundColor, 10%)
-        color $ui-solarized-dark-text-color
+        color $ui-solarized-dark-text-color  
 
   .item-wrapper
     border-color alpha($ui-solarized-dark-button--active-backgroundColor, 60%)
@@ -318,152 +302,6 @@ body[data-theme="solarized-dark"]
     background-color alpha($ui-dark-button--active-backgroundColor, 40%)
     color $ui-inactive-text-color
 
-  .item-bottom-tagList-empty
-    color $ui-inactive-text-color
-    vertical-align middle
-
-body[data-theme="monokai"]
-  .root
-    border-color $ui-monokai-borderColor
-    background-color $ui-monokai-noteList-backgroundColor
-
-  .item
-    border-color $ui-monokai-borderColor
-    background-color $ui-monokai-noteList-backgroundColor
-    &:hover
-      transition 0.15s
-      // background-color alpha($ui-monokai-noteList-backgroundColor, 20%)
-      color $ui-monokai-text-color
-      .item-title
-      .item-title-icon
-      .item-bottom-time
-        transition 0.15s
-        color $ui-monokai-text-color
-      .item-bottom-tagList-item
-        transition 0.15s
-        background-color alpha($ui-monokai-noteList-backgroundColor, 20%)
-        color $ui-monokai-text-color
-    &:active
-      transition 0.15s
-      background-color $ui-monokai-noteList-backgroundColor
-      color $ui-monokai-text-color
-      .item-title
-      .item-title-icon
-      .item-bottom-time
-        transition 0.15s
-        color $ui-monokai-text-color
-      .item-bottom-tagList-item
-        transition 0.15s
-        background-color alpha($ui-monokai-noteList-backgroundColor, 10%)
-        color $ui-monokai-text-color
-
-  .item-wrapper
-    border-color alpha($ui-monokai-button-backgroundColor, 60%)
-
-  .item--active
-    border-color $ui-monokai-borderColor
-    background-color $ui-monokai-button-backgroundColor
-    .item-wrapper
-      border-color transparent
-    .item-title
-    .item-title-icon
-    .item-bottom-time
-      color $ui-monokai-active-color
-    .item-bottom-tagList-item
-      background-color alpha(white, 10%)
-      color $ui-monokai-text-color
-    &:hover
-      // background-color alpha($ui-monokai-button--active-backgroundColor, 60%)
-      color #f92672
-      .item-bottom-tagList-item
-        background-color alpha(#fff, 20%)
-
-  .item-title
-    color $ui-inactive-text-color
-
-  .item-title-icon
-    color $ui-inactive-text-color
-
-  .item-title-empty
-    color $ui-inactive-text-color
-
-  .item-bottom-tagList-item
-    background-color alpha($ui-dark-button--active-backgroundColor, 40%)
-    color $ui-inactive-text-color
-
-  .item-bottom-tagList-empty
-    color $ui-inactive-text-color
-    vertical-align middle
-
-body[data-theme="dracula"]
-  .root
-    border-color $ui-dracula-borderColor
-    background-color $ui-dracula-noteList-backgroundColor
-
-  .item
-    border-color $ui-dracula-borderColor
-    background-color $ui-dracula-noteList-backgroundColor
-    &:hover
-      transition 0.15s
-      // background-color alpha($ui-dracula-noteList-backgroundColor, 20%)
-      color $ui-dracula-text-color
-      .item-title
-      .item-title-icon
-      .item-bottom-time
-        transition 0.15s
-        color $ui-dracula-text-color
-      .item-bottom-tagList-item
-        transition 0.15s
-        background-color alpha($ui-dracula-noteList-backgroundColor, 20%)
-        color $ui-dracula-text-color
-    &:active
-      transition 0.15s
-      background-color $ui-dracula-noteList-backgroundColor
-      color $ui-dracula-text-color
-      .item-title
-      .item-title-icon
-      .item-bottom-time
-        transition 0.15s
-        color $ui-dracula-text-color
-      .item-bottom-tagList-item
-        transition 0.15s
-        background-color alpha($ui-dracula-noteList-backgroundColor, 10%)
-        color $ui-dracula-text-color
-
-  .item-wrapper
-    border-color alpha($ui-dracula-button-backgroundColor, 60%)
-
-  .item--active
-    border-color $ui-dracula-borderColor
-    background-color $ui-dracula-button-backgroundColor
-    .item-wrapper
-      border-color transparent
-    .item-title
-    .item-title-icon
-    .item-bottom-time
-      color $ui-dracula-active-color
-    .item-bottom-tagList-item
-      background-color alpha(#f8f8f2, 10%)
-      color $ui-dracula-text-color
-    &:hover
-      // background-color alpha($ui-dracula-button--active-backgroundColor, 60%)
-      color #ff79c6
-      .item-bottom-tagList-item
-        background-color alpha(#f8f8f2, 20%)
-
-  .item-title
-    color $ui-inactive-text-color
-
-  .item-title-icon
-    color $ui-inactive-text-color
-
-  .item-title-empty
-    color $ui-inactive-text-color
-
-  .item-bottom-tagList-item
-    background-color alpha($ui-dark-button--active-backgroundColor, 40%)
-    color $ui-inactive-text-color
-
   .item-bottom-tagList-empty
     color $ui-inactive-text-color
     vertical-align middle

browser/components/NoteItemSimple.js

@@ -5,7 +5,6 @@ import PropTypes from 'prop-types'
 import React from 'react'
 import CSSModules from 'browser/lib/CSSModules'
 import styles from './NoteItemSimple.styl'
-import i18n from 'browser/lib/i18n'
 
 /**
  * @description Note item component when using simple display mode.
@@ -15,23 +14,14 @@ import i18n from 'browser/lib/i18n'
  * @param {Function} handleNoteContextMenu
  * @param {Function} handleDragStart
  */
-const NoteItemSimple = ({
-  isActive,
-  isAllNotesView,
-  note,
-  handleNoteClick,
-  handleNoteContextMenu,
-  handleDragStart,
-  pathname,
-  storage
-}) => (
+const NoteItemSimple = ({ isActive, note, handleNoteClick, handleNoteContextMenu, handleDragStart, pathname }) => (
   <div styleName={isActive
-    ? 'item-simple--active'
-    : 'item-simple'
-  }
-    key={note.key}
-    onClick={e => handleNoteClick(e, note.key)}
-    onContextMenu={e => handleNoteContextMenu(e, note.key)}
+      ? 'item-simple--active'
+      : 'item-simple'
+    }
+    key={`${note.storage}-${note.key}`}
+    onClick={e => handleNoteClick(e, `${note.storage}-${note.key}`)}
+    onContextMenu={e => handleNoteContextMenu(e, `${note.storage}-${note.key}`)}
     onDragStart={e => handleDragStart(e, note)}
     draggable='true'
   >
@@ -40,19 +30,14 @@ const NoteItemSimple = ({
         ? <i styleName='item-simple-title-icon' className='fa fa-fw fa-code' />
         : <i styleName='item-simple-title-icon' className='fa fa-fw fa-file-text-o' />
       }
-      {note.isPinned && !pathname.match(/\/starred|\/trash/)
+      {note.isPinned && !pathname.match(/\/home|\/starred|\/trash/)
         ? <i styleName='item-pin' className='fa fa-thumb-tack' />
         : ''
       }
       {note.title.trim().length > 0
         ? note.title
-        : <span styleName='item-simple-title-empty'>{i18n.__('Empty note')}</span>
+        : <span styleName='item-simple-title-empty'>Empty</span>
       }
-      {isAllNotesView && <div styleName='item-simple-right'>
-        <span styleName='item-simple-right-storageName'>
-          {storage.name}
-        </span>
-      </div>}
     </div>
   </div>
 )

browser/components/NoteItemSimple.styl

@@ -104,7 +104,6 @@ body[data-theme="dark"]
       background-color alpha($ui-dark-button--active-backgroundColor, 20%)
       color $ui-dark-text-color
       .item-simple-title
-      .item-simple-title-empty
       .item-simple-title-icon
       .item-simple-bottom-time
         transition 0.15s
@@ -118,7 +117,6 @@ body[data-theme="dark"]
       background-color $ui-dark-button--active-backgroundColor
       color $ui-dark-text-color
       .item-simple-title
-      .item-simple-title-empty
       .item-simple-title-icon
       .item-simple-bottom-time
         transition 0.15s
@@ -126,7 +124,7 @@ body[data-theme="dark"]
       .item-simple-bottom-tagList-item
         transition 0.15s
         background-color alpha(white, 10%)
-        color $ui-dark-text-color
+        color $ui-dark-text-color  
 
   .item-simple--active
     border-color $ui-dark-borderColor
@@ -134,7 +132,6 @@ body[data-theme="dark"]
     .item-simple-wrapper
       border-color transparent
     .item-simple-title
-    .item-simple-title-empty
     .item-simple-title-icon
     .item-simple-bottom-time
       color $ui-dark-text-color
@@ -168,10 +165,9 @@ body[data-theme="solarized-dark"]
     background-color $ui-solarized-dark-noteList-backgroundColor
     &:hover
       transition 0.15s
-      background-color alpha($ui-dark-button--active-backgroundColor, 60%)
+      // background-color alpha($ui-dark-button--active-backgroundColor, 20%)
       color $ui-solarized-dark-text-color
       .item-simple-title
-      .item-simple-title-empty
       .item-simple-title-icon
       .item-simple-bottom-time
         transition 0.15s
@@ -182,10 +178,9 @@ body[data-theme="solarized-dark"]
         color $ui-solarized-dark-text-color
     &:active
       transition 0.15s
-      // background-color $ui-solarized-dark-button--active-backgroundColor
-      color $ui-dark-text-color
+      background-color $ui-solarized-dark-button--active-backgroundColor
+      color $ui-solarized-dark-text-color
       .item-simple-title
-      .item-simple-title-empty
       .item-simple-title-icon
       .item-simple-bottom-time
         transition 0.15s
@@ -193,17 +188,15 @@ body[data-theme="solarized-dark"]
       .item-simple-bottom-tagList-item
         transition 0.15s
         background-color alpha(white, 10%)
-        color $ui-solarized-dark-text-color
+        color $ui-solarized-dark-text-color  
 
   .item-simple--active
     border-color $ui-solarized-dark-borderColor
-    background-color $ui-solarized-dark-tag-backgroundColor
+    background-color $ui-solarized-dark-button--active-backgroundColor
     .item-simple-wrapper
       border-color transparent
     .item-simple-title
-    .item-simple-title-empty
     .item-simple-title-icon
-       color $ui-dark-text-color
     .item-simple-bottom-time
       color $ui-solarized-dark-text-color
     .item-simple-bottom-tagList-item
@@ -213,140 +206,4 @@ body[data-theme="solarized-dark"]
       // background-color alpha($ui-dark-button--active-backgroundColor, 60%)
       color #c0392b
       .item-simple-bottom-tagList-item
-        background-color alpha(#fff, 20%)
-  .item-simple-title
-    color $ui-dark-text-color
-    border-bottom $ui-dark-borderColor
-  .item-simple-right
-    float right
-    .item-simple-right-storageName
-      padding-left 4px
-      opacity 0.4
-
-body[data-theme="monokai"]
-  .root
-    border-color $ui-monokai-borderColor
-    background-color $ui-monokai-noteList-backgroundColor
-
-  .item-simple
-    border-color $ui-monokai-borderColor
-    background-color $ui-monokai-noteList-backgroundColor
-    &:hover
-      transition 0.15s
-      background-color alpha($ui-monokai-button-backgroundColor, 60%)
-      color $ui-monokai-text-color
-      .item-simple-title
-      .item-simple-title-empty
-      .item-simple-title-icon
-      .item-simple-bottom-time
-        transition 0.15s
-        color $ui-monokai-text-color
-      .item-simple-bottom-tagList-item
-        transition 0.15s
-        background-color alpha(#fff, 20%)
-        color $ui-monokai-text-color
-    &:active
-      transition 0.15s
-      background-color $ui-monokai-button--active-backgroundColor
-      color $ui-monokai-text-color
-      .item-simple-title
-      .item-simple-title-empty
-      .item-simple-title-icon
-      .item-simple-bottom-time
-        transition 0.15s
-        color $ui-monokai-text-color
-      .item-simple-bottom-tagList-item
-        transition 0.15s
-        background-color alpha(white, 10%)
-        color $ui-monokai-text-color
-
-  .item-simple--active
-    border-color $ui-monokai-borderColor
-    background-color $ui-monokai-button--active-backgroundColor
-    .item-simple-wrapper
-      border-color transparent
-    .item-simple-title
-    .item-simple-title-empty
-    .item-simple-title-icon
-    .item-simple-bottom-time
-      color $ui-monokai-text-color
-    .item-simple-bottom-tagList-item
-      background-color alpha(white, 10%)
-      color $ui-monokai-text-color
-    &:hover
-      // background-color alpha($ui-dark-button--active-backgroundColor, 60%)
-      color #c0392b
-      .item-simple-bottom-tagList-item
-        background-color alpha(#fff, 20%)
-  .item-simple-title
-    color $ui-dark-text-color
-    border-bottom $ui-dark-borderColor
-  .item-simple-right
-    float right
-    .item-simple-right-storageName
-      padding-left 4px
-      opacity 0.4
-
-body[data-theme="dracula"]
-  .root
-    border-color $ui-dracula-borderColor
-    background-color $ui-dracula-noteList-backgroundColor
-
-  .item-simple
-    border-color $ui-dracula-borderColor
-    background-color $ui-dracula-noteList-backgroundColor
-    &:hover
-      transition 0.15s
-      background-color alpha($ui-dracula-button-backgroundColor, 60%)
-      color $ui-dracula-text-color
-      .item-simple-title
-      .item-simple-title-empty
-      .item-simple-title-icon
-      .item-simple-bottom-time
-        transition 0.15s
-        color $ui-dracula-text-color
-      .item-simple-bottom-tagList-item
-        transition 0.15s
-        background-color alpha(#f8f8f2, 20%)
-        color $ui-dracula-text-color
-    &:active
-      transition 0.15s
-      background-color $ui-dracula-button--active-backgroundColor
-      color $ui-dracula-text-color
-      .item-simple-title
-      .item-simple-title-empty
-      .item-simple-title-icon
-      .item-simple-bottom-time
-        transition 0.15s
-        color $ui-dracula-text-color
-      .item-simple-bottom-tagList-item
-        transition 0.15s
-        background-color alpha(#f8f8f2, 10%)
-        color $ui-dracula-text-color
-
-  .item-simple--active
-    border-color $ui-dracula-borderColor
-    background-color $ui-dracula-button--active-backgroundColor
-    .item-simple-wrapper
-      border-color transparent
-    .item-simple-title
-    .item-simple-title-empty
-    .item-simple-title-icon
-    .item-simple-bottom-time
-      color $ui-dracula-text-color
-    .item-simple-bottom-tagList-item
-      background-color alpha(#f8f8f2, 10%)
-      color $ui-dracula-text-color
-    &:hover
-      // background-color alpha($ui-dark-button--active-backgroundColor, 60%)
-      color #c0392b
-      .item-simple-bottom-tagList-item
-        background-color alpha(#f8f8f2, 20%)
-  .item-simple-title
-    color $ui-dark-text-color
-    border-bottom $ui-dark-borderColor
-  .item-simple-right
-    float right
-    .item-simple-right-storageName
-      padding-left 4px
-      opacity 0.4
+        background-color alpha(#fff, 20%)

browser/components/RealtimeNotification.styl

@@ -41,25 +41,3 @@ body[data-theme="solarized-dark"]
     background-color $ui-solarized-dark-button-backgroundColor
     &:hover
       color #5CB85C
-
-body[data-theme="monokai"]
-  .notification-area
-    background-color none
-
-  .notification-link
-    color $ui-monokai-text-color
-    border none
-    background-color $ui-monokai-button-backgroundColor
-    &:hover
-      color #5CB85C
-
-body[data-theme="dracula"]
-  .notification-area
-    background-color none
-
-  .notification-link
-    color $ui-dracula-text-color
-    border none
-    background-color $ui-dracula-button-backgroundColor
-    &:hover
-      color #ff79c6

browser/components/SideNavFilter.js

@@ -5,7 +5,6 @@ import PropTypes from 'prop-types'
 import React from 'react'
 import CSSModules from 'browser/lib/CSSModules'
 import styles from './SideNavFilter.styl'
-import i18n from 'browser/lib/i18n'
 
 /**
  * @param {boolean} isFolded
@@ -18,7 +17,7 @@ import i18n from 'browser/lib/i18n'
 const SideNavFilter = ({
   isFolded, isHomeActive, handleAllNotesButtonClick,
   isStarredActive, handleStarredButtonClick, isTrashedActive, handleTrashedButtonClick, counterDelNote,
-  counterTotalNote, counterStarredNote, handleFilterButtonContextMenu
+  counterTotalNote, counterStarredNote
 }) => (
   <div styleName={isFolded ? 'menu--folded' : 'menu'}>
 
@@ -27,12 +26,12 @@ const SideNavFilter = ({
     >
       <div styleName='iconWrap'>
         <img src={isHomeActive
-          ? '../resources/icon/icon-all-active.svg'
-          : '../resources/icon/icon-all.svg'
-        }
+            ? '../resources/icon/icon-all-active.svg'
+            : '../resources/icon/icon-all.svg'
+          }
         />
       </div>
-      <span styleName='menu-button-label'>{i18n.__('All Notes')}</span>
+      <span styleName='menu-button-label'>All Notes</span>
       <span styleName='counters'>{counterTotalNote}</span>
     </button>
 
@@ -41,26 +40,26 @@ const SideNavFilter = ({
     >
       <div styleName='iconWrap'>
         <img src={isStarredActive
-          ? '../resources/icon/icon-star-active.svg'
-          : '../resources/icon/icon-star-sidenav.svg'
-        }
+            ? '../resources/icon/icon-star-active.svg'
+            : '../resources/icon/icon-star-sidenav.svg'
+          }
         />
       </div>
-      <span styleName='menu-button-label'>{i18n.__('Starred')}</span>
+      <span styleName='menu-button-label'>Starred</span>
       <span styleName='counters'>{counterStarredNote}</span>
     </button>
 
     <button styleName={isTrashedActive ? 'menu-button-trash--active' : 'menu-button'}
-      onClick={handleTrashedButtonClick} onContextMenu={handleFilterButtonContextMenu}
+      onClick={handleTrashedButtonClick}
     >
       <div styleName='iconWrap'>
         <img src={isTrashedActive
-          ? '../resources/icon/icon-trash-active.svg'
-          : '../resources/icon/icon-trash-sidenav.svg'
-        }
+            ? '../resources/icon/icon-trash-active.svg'
+            : '../resources/icon/icon-trash-sidenav.svg'
+          }
         />
       </div>
-      <span styleName='menu-button-label'>{i18n.__('Trash')}</span>
+      <span styleName='menu-button-label'>Trash</span>
       <span styleName='counters'>{counterDelNote}</span>
     </button>
 

browser/components/SideNavFilter.styl

@@ -18,7 +18,7 @@
 .iconWrap
   width 20px
   text-align center
-
+  
 .counters
   float right
   color $ui-inactive-text-color
@@ -68,9 +68,10 @@
   .menu-button-label
     position fixed
     display inline-block
-    height 36px
+    height 32px
     left 44px
     padding 0 10px
+    margin-top -8px
     margin-left 0
     overflow ellipsis
     z-index 10
@@ -221,88 +222,4 @@ body[data-theme="solarized-dark"]
       background-color $ui-solarized-dark-button-backgroundColor
       color $ui-solarized-dark-text-color
       .menu-button-label
-        color $ui-solarized-dark-text-color
-
-body[data-theme="monokai"]
-  .menu-button
-    &:active
-      background-color $ui-monokai-noteList-backgroundColor
-      color $ui-monokai-text-color
-    &:hover
-      background-color $ui-monokai-button-backgroundColor
-      color $ui-monokai-text-color
-
-  .menu-button--active
-    color $ui-monokai-text-color
-    background-color $ui-monokai-button-backgroundColor
-    .menu-button-label
-      color $ui-monokai-text-color
-    &:hover
-      background-color $ui-monokai-button-backgroundColor
-      color $ui-monokai-text-color
-      .menu-button-label
-        color $ui-monokai-text-color
-
-  .menu-button-star--active
-    color $ui-monokai-text-color
-    background-color $ui-monokai-button-backgroundColor
-    .menu-button-label
-      color $ui-monokai-text-color
-    &:hover
-      background-color $ui-monokai-button-backgroundColor
-      color $ui-monokai-text-color
-      .menu-button-label
-        color $ui-monokai-text-color
-
-  .menu-button-trash--active
-    color $ui-monokai-text-color
-    background-color $ui-monokai-button-backgroundColor
-    .menu-button-label
-      color $ui-monokai-text-color
-    &:hover
-      background-color $ui-monokai-button-backgroundColor
-      color $ui-monokai-text-color
-      .menu-button-label
-        color $ui-monokai-text-color
-
-body[data-theme="dracula"]
-  .menu-button
-    &:active
-      background-color $ui-dracula-noteList-backgroundColor
-      color $ui-dracula-text-color
-    &:hover
-      background-color $ui-dracula-button-backgroundColor
-      color $ui-dracula-text-color
-
-  .menu-button--active
-    color $ui-dracula-text-color
-    background-color $ui-dracula-button-backgroundColor
-    .menu-button-label
-      color $ui-dracula-text-color
-    &:hover
-      background-color $ui-dracula-button-backgroundColor
-      color $ui-dracula-text-color
-      .menu-button-label
-        color $ui-dracula-text-color
-
-  .menu-button-star--active
-    color $ui-dracula-text-color
-    background-color $ui-dracula-button-backgroundColor
-    .menu-button-label
-      color $ui-dracula-text-color
-    &:hover
-      background-color $ui-dracula-button-backgroundColor
-      color $ui-dracula-text-color
-      .menu-button-label
-        color $ui-dracula-text-color
-
-  .menu-button-trash--active
-    color $ui-dracula-text-color
-    background-color $ui-dracula-button-backgroundColor
-    .menu-button-label
-      color $ui-dracula-text-color
-    &:hover
-      background-color $ui-dracula-button-backgroundColor
-      color $ui-dracula-text-color
-      .menu-button-label
-        color $ui-dracula-text-color
+        color $ui-solarized-dark-text-color

browser/components/SnippetTab.js

@@ -2,7 +2,6 @@ import React from 'react'
 import CSSModules from 'browser/lib/CSSModules'
 import styles from './SnippetTab.styl'
 import context from 'browser/lib/context'
-import i18n from 'browser/lib/i18n'
 
 class SnippetTab extends React.Component {
   constructor (props) {
@@ -29,7 +28,7 @@ class SnippetTab extends React.Component {
   handleContextMenu (e) {
     context.popup([
       {
-        label: i18n.__('Rename'),
+        label: 'Rename',
         click: (e) => this.handleRenameClick(e)
       }
     ])
@@ -55,10 +54,10 @@ class SnippetTab extends React.Component {
         this.handleRename()
         break
       case 27:
-        this.setState((prevState, props) => ({
-          name: props.snippet.name,
+        this.setState({
+          name: this.props.snippet.name,
           isRenaming: false
-        }))
+        })
         break
     }
   }
@@ -115,7 +114,7 @@ class SnippetTab extends React.Component {
             {snippet.name.trim().length > 0
               ? snippet.name
               : <span styleName='button-unnamed'>
-                {i18n.__('Unnamed')}
+                Unnamed
               </span>
             }
           </button>

browser/components/SnippetTab.styl

@@ -1,7 +1,6 @@
 .root
   position relative
   flex 1
-  min-width 70px
   overflow hidden
   &:hover
     .deleteButton
@@ -22,7 +21,7 @@
   height 29px
   overflow ellipsis
   text-align left
-  padding-right 23px
+  padding-right 30px
   border none
   background-color transparent
   transition 0.15s
@@ -136,92 +135,4 @@ body[data-theme="solarized-dark"]
     color $ui-solarized-dark-text-color
 
   .deleteButton
-    color alpha($ui-solarized-dark-text-color, 30%)
-
-body[data-theme="monokai"]
-  .root
-    color $ui-monokai-text-color
-    border-color $ui-dark-borderColor
-    &: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
-
-  .root--active
-    color $ui-monokai-text-color
-    border-color $ui-monokai-borderColor
-    &: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
-
-  .button
-    border none
-    color $ui-monokai-text-color
-    background-color transparent
-    transition color background-color 0.15s
-    border-left 4px solid transparent
-    &:hover
-      color $ui-monokai-text-color
-      background-color $ui-monokai-noteDetail-backgroundColor
-
-  .input
-    background-color $ui-monokai-noteDetail-backgroundColor
-    color $ui-monokai-text-color
-
-  .deleteButton
-    color alpha($ui-monokai-text-color, 30%)
-
-body[data-theme="dracula"]
-  .root
-    color $ui-dracula-text-color
-    border-color $ui-dark-borderColor
-    &: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
-
-  .root--active
-    color $ui-dracula-text-color
-    border-color $ui-dracula-borderColor
-    &: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
-
-  .button
-    border none
-    color $ui-dracula-text-color
-    background-color transparent
-    transition color background-color 0.15s
-    border-left 4px solid transparent
-    &:hover
-      color $ui-dracula-text-color
-      background-color $ui-dracula-noteDetail-backgroundColor
-
-  .input
-    background-color $ui-dracula-noteDetail-backgroundColor
-    color $ui-dracula-text-color
-
-  .deleteButton
-    color alpha($ui-dracula-text-color, 30%)
+    color alpha($ui-solarized-dark-text-color, 30%)

browser/components/StorageItem.js

@@ -6,18 +6,6 @@ import React from 'react'
 import styles from './StorageItem.styl'
 import CSSModules from 'browser/lib/CSSModules'
 import _ from 'lodash'
-import { SortableHandle } from 'react-sortable-hoc'
-
-const DraggableIcon = SortableHandle(({ className }) => (
-  <i className={`fa ${className}`} />
-))
-
-const FolderIcon = ({ className, color, isActive }) => {
-  const iconStyle = isActive ? 'fa-folder-open-o' : 'fa-folder-o'
-  return (
-    <i className={`fa ${iconStyle} ${className}`} style={{ color: color }} />
-  )
-}
 
 /**
  * @param {boolean} isActive
@@ -33,51 +21,34 @@ const FolderIcon = ({ className, color, isActive }) => {
  * @return {React.Component}
  */
 const StorageItem = ({
-  styles,
-  isActive,
-  handleButtonClick,
-  handleContextMenu,
-  folderName,
-  folderColor,
-  isFolded,
-  noteCount,
-  handleDrop,
-  handleDragEnter,
-  handleDragLeave
-}) => {
-  return (
-    <button
-      styleName={isActive ? 'folderList-item--active' : 'folderList-item'}
-      onClick={handleButtonClick}
-      onContextMenu={handleContextMenu}
-      onDrop={handleDrop}
-      onDragEnter={handleDragEnter}
-      onDragLeave={handleDragLeave}
-    >
-      {!isFolded &&
-        <DraggableIcon className={styles['folderList-item-reorder']} />}
-      <span
-        styleName={
-          isFolded ? 'folderList-item-name--folded' : 'folderList-item-name'
-        }
-      >
-        <FolderIcon
-          styleName='folderList-item-icon'
-          color={folderColor}
-          isActive={isActive}
-        />
-        {isFolded
-          ? _.truncate(folderName, { length: 1, omission: '' })
-          : folderName}
+  isActive, handleButtonClick, handleContextMenu, folderName,
+  folderColor, isFolded, noteCount, handleDrop, handleDragEnter, handleDragLeave
+}) => (
+  <button styleName={isActive
+      ? 'folderList-item--active'
+      : 'folderList-item'
+    }
+    onClick={handleButtonClick}
+    onContextMenu={handleContextMenu}
+    onDrop={handleDrop}
+    onDragEnter={handleDragEnter}
+    onDragLeave={handleDragLeave}
+  >
+    <span styleName={isFolded
+      ? 'folderList-item-name--folded' : 'folderList-item-name'
+    }>
+      <text style={{color: folderColor, paddingRight: '10px'}}>{isActive ? <i className='fa fa-folder-open-o' /> : <i className='fa fa-folder-o' />}</text>{isFolded ? _.truncate(folderName, {length: 1, omission: ''}) : folderName}
+    </span>
+    {(!isFolded && _.isNumber(noteCount)) &&
+      <span styleName='folderList-item-noteCount'>{noteCount}</span>
+    }
+    {isFolded &&
+      <span styleName='folderList-item-tooltip'>
+        {folderName}
       </span>
-      {!isFolded &&
-        _.isNumber(noteCount) &&
-        <span styleName='folderList-item-noteCount'>{noteCount}</span>}
-      {isFolded &&
-        <span styleName='folderList-item-tooltip'>{folderName}</span>}
-    </button>
-  )
-}
+    }
+  </button>
+)
 
 StorageItem.propTypes = {
   isActive: PropTypes.bool.isRequired,

browser/components/StorageItem.styl

@@ -13,7 +13,6 @@
   border none
   overflow ellipsis
   font-size 14px
-  align-items: center
   &:first-child
     margin-top 0
   &:hover
@@ -23,7 +22,7 @@
   &:active
     color $$ui-button-default-color
     background-color alpha($ui-button-default--active-backgroundColor, 20%)
-
+    
 .folderList-item--active
   @extend .folderList-item
   color #1EC38B
@@ -35,7 +34,9 @@
 .folderList-item-name
   display block
   flex 1
-  padding-right: 10px
+  padding 0 12px
+  height 26px
+  line-height 26px
   border-width 0 0 0 2px
   border-style solid
   border-color transparent
@@ -58,8 +59,8 @@
   opacity 0
   border-top-right-radius 2px
   border-bottom-right-radius 2px
-  height 34px
-  line-height 32px
+  height 26px
+  line-height 26px
 
 .folderList-item:hover, .folderList-item--active:hover
   .folderList-item-tooltip
@@ -68,20 +69,9 @@
 .folderList-item-name--folded
   @extend .folderList-item-name
   padding-left 7px
-  .folderList-item-icon
+  text
     font-size 9px
 
-.folderList-item-icon
-  padding-right: 10px
-
-.folderList-item-reorder
-  font-size: 9px
-  padding: 10px 8px 10px 9px;
-  color: rgba(147, 147, 149, 0.3)
-  cursor: ns-resize
-  &:before
-    content: "\f142 \f142"
-
 body[data-theme="white"]
   .folderList-item
     color $ui-inactive-text-color
@@ -137,42 +127,4 @@ body[data-theme="solarized-dark"]
       background-color $ui-solarized-dark-button-backgroundColor
     &:hover
       color $ui-solarized-dark-text-color
-      background-color $ui-solarized-dark-button-backgroundColor
-
-body[data-theme="monokai"]
-  .folderList-item
-    &:hover
-      background-color $ui-monokai-button-backgroundColor
-      color $ui-monokai-text-color
-    &:active
-      color $ui-monokai-text-color
-      background-color $ui-monokai-button-backgroundColor
-
-  .folderList-item--active
-    @extend .folderList-item
-    color $ui-monokai-text-color
-    background-color $ui-monokai-button-backgroundColor
-    &:active
-      background-color $ui-monokai-button-backgroundColor
-    &:hover
-      color $ui-monokai-text-color
-      background-color $ui-monokai-button-backgroundColor
-
-body[data-theme="dracula"]
-  .folderList-item
-    &:hover
-      background-color $ui-dracula-button-backgroundColor
-      color $ui-dracula-text-color
-    &:active
-      color $ui-dracula-text-color
-      background-color $ui-dracula-button-backgroundColor
-
-  .folderList-item--active
-    @extend .folderList-item
-    color $ui-dracula-text-color
-    background-color $ui-dracula-button-backgroundColor
-    &:active
-      background-color $ui-dracula-button-backgroundColor
-    &:hover
-      color $ui-dracula-text-color
-      background-color $ui-dracula-button-backgroundColor
+      background-color $ui-solarized-dark-button-backgroundColor

browser/components/StorageList.js

@@ -7,18 +7,18 @@ import styles from './StorageList.styl'
 import CSSModules from 'browser/lib/CSSModules'
 
 /**
-* @param {Array} storageList
+* @param {Array} storgaeList
 */
 
-const StorageList = ({storageList, isFolded}) => (
-  <div styleName={isFolded ? 'storageList-folded' : 'storageList'}>
+const StorageList = ({storageList}) => (
+  <div styleName='storageList'>
     {storageList.length > 0 ? storageList : (
-      <div styleName='storageList-empty'>No storage mount.</div>
+      <div styleName='storgaeList-empty'>No storage mount.</div>
     )}
   </div>
 )
 
 StorageList.propTypes = {
-  storageList: PropTypes.arrayOf(PropTypes.element).isRequired
+  storgaeList: PropTypes.arrayOf(PropTypes.element).isRequired
 }
 export default CSSModules(StorageList, styles)

browser/components/StorageList.styl

@@ -4,10 +4,6 @@
   top 180px
   overflow-y auto
 
-.storageList-folded
-  @extend .storageList
-  width 44px
-
 .storageList-empty
   padding 0 10px
   margin-top 15px

browser/components/TagListItem.js

@@ -9,26 +9,15 @@ import CSSModules from 'browser/lib/CSSModules'
 /**
 * @param {string} name
 * @param {Function} handleClickTagListItem
-* @param {Function} handleClickNarrowToTag
 * @param {bool} isActive
-* @param {bool} isRelated
 */
 
-const TagListItem = ({name, handleClickTagListItem, handleClickNarrowToTag, handleContextMenu, isActive, isRelated, count}) => (
-  <div styleName='tagList-itemContainer' onContextMenu={e => handleContextMenu(e, name)}>
-    {isRelated
-      ? <button styleName={isActive ? 'tagList-itemNarrow-active' : 'tagList-itemNarrow'} onClick={() => handleClickNarrowToTag(name)}>
-        <i className={isActive ? 'fa fa-minus-circle' : 'fa fa-plus-circle'} />
-      </button>
-      : <div styleName={isActive ? 'tagList-itemNarrow-active' : 'tagList-itemNarrow'} />
-    }
-    <button styleName={isActive ? 'tagList-item-active' : 'tagList-item'} onClick={() => handleClickTagListItem(name)}>
-      <span styleName='tagList-item-name'>
-        {`# ${name}`}
-        <span styleName='tagList-item-count'>{count !== 0 ? count : ''}</span>
-      </span>
-    </button>
-  </div>
+const TagListItem = ({name, handleClickTagListItem, isActive}) => (
+  <button styleName={isActive ? 'tagList-item-active' : 'tagList-item'} onClick={() => handleClickTagListItem(name)}>
+    <span styleName='tagList-item-name'>
+      {`# ${name}`}
+    </span>
+  </button>
 )
 
 TagListItem.propTypes = {

browser/components/TagListItem.styl

@@ -1,9 +1,5 @@
-.tagList-itemContainer
-  display flex
-
 .tagList-item
   display flex
-  flex 1
   width 100%
   height 26px
   background-color transparent
@@ -24,16 +20,9 @@
     color $ui-button-default-color
     background-color $ui-button-default--active-backgroundColor
 
-.tagList-itemNarrow
-  composes tagList-item
-  flex none
-  width 20px
-  padding 0 4px
-
 .tagList-item-active
   background-color $ui-button-default--active-backgroundColor
   display flex
-  flex 1
   width 100%
   height 26px
   padding 0
@@ -47,16 +36,10 @@
     background-color alpha($ui-button-default--active-backgroundColor, 60%)
     transition 0.2s
 
-.tagList-itemNarrow-active
-  composes tagList-item-active
-  flex none
-  width 20px
-  padding 0 4px
-
 .tagList-item-name
   display block
   flex 1
-  padding 0 8px 0 4px
+  padding 0 15px
   height 26px
   line-height 26px
   border-width 0 0 0 2px
@@ -65,12 +48,6 @@
   overflow hidden
   text-overflow ellipsis
 
-.tagList-item-count
-  float right
-  line-height 26px
-  padding-right 15px
-  font-size 13px
-
 body[data-theme="white"]
   .tagList-item
     color $ui-inactive-text-color
@@ -86,8 +63,6 @@ body[data-theme="white"]
     color $ui-text-color
     &:hover
       background-color alpha($ui-button--active-backgroundColor, 60%)
-  .tagList-item-count
-    color $ui-text-color
 
 body[data-theme="dark"]
   .tagList-item
@@ -106,6 +81,4 @@ body[data-theme="dark"]
       background-color alpha($ui-dark-button--active-backgroundColor, 50%)
     &:hover
       color $ui-dark-text-color
-      background-color alpha($ui-dark-button--active-backgroundColor, 50%)
-  .tagList-item-count
-    color $ui-dark-button--active-color
+      background-color alpha($ui-dark-button--active-backgroundColor, 50%)

browser/components/TodoListPercentage.js

@@ -12,7 +12,7 @@ import styles from './TodoListPercentage.styl'
  */
 
 const TodoListPercentage = ({
-  percentageOfTodo, onClearCheckboxClick
+  percentageOfTodo
 }) => (
   <div styleName='percentageBar' style={{display: isNaN(percentageOfTodo) ? 'none' : ''}}>
     <div styleName='progressBar' style={{width: `${percentageOfTodo}%`}}>
@@ -20,15 +20,11 @@ const TodoListPercentage = ({
         <p styleName='percentageText'>{percentageOfTodo}%</p>
       </div>
     </div>
-    <div styleName='todoClear'>
-      <p styleName='todoClearText' onClick={(e) => onClearCheckboxClick(e)}>clear</p>
-    </div>
   </div>
 )
 
 TodoListPercentage.propTypes = {
-  percentageOfTodo: PropTypes.number.isRequired,
-  onClearCheckboxClick: PropTypes.func.isRequired
+  percentageOfTodo: PropTypes.number.isRequired
 }
 
 export default CSSModules(TodoListPercentage, styles)

browser/components/TodoListPercentage.styl

@@ -1,5 +1,4 @@
 .percentageBar
-  display: flex
   position absolute
   top 72px
   right 0px
@@ -31,20 +30,6 @@
   color #f4f4f4
   font-weight 600
 
-.todoClear
-  display flex
-  justify-content: flex-end
-  position absolute
-  z-index 120
-  width 100%
-  height 100%
-  padding 2px 10px
-
-.todoClearText
-  color #f4f4f4
-  cursor pointer
-  font-weight 500
-
 body[data-theme="dark"]
   .percentageBar
     background-color #444444
@@ -54,10 +39,7 @@ body[data-theme="dark"]
 
   .percentageText
     color $ui-dark-text-color
-  
-  .todoClearText
-    color $ui-dark-text-color
-
+    
 body[data-theme="solarized-dark"]
   .percentageBar
     background-color #002b36
@@ -66,30 +48,4 @@ body[data-theme="solarized-dark"]
     background-color: #2aa198
 
   .percentageText
-    color #fdf6e3
-
-  .todoClearText
-    color #fdf6e3
-
-body[data-theme="monokai"]
-  .percentageBar
-    background-color: $ui-monokai-borderColor
-
-  .progressBar
-    background-color $ui-monokai-active-color
-
-  .percentageText
-    color $ui-monokai-text-color
-
-body[data-theme="dracula"]
-  .percentageBar
-    background-color $ui-dracula-borderColor
-
-  .progressBar
-    background-color: $ui-dracula-active-color
-
-  .percentageText
-    color $ui-dracula-text-color
-
-  .percentageText
-    color $ui-dracula-text-color
+    color #fdf6e3

browser/components/markdown.styl

@@ -58,7 +58,7 @@ body
   .katex
     font 400 1.2em 'KaTeX_Main'
     line-height 1.2em
-    white-space initial
+    white-space nowrap
     text-indent 0
   .katex .mfrac>.vlist>span:nth-child(2)
     top 0 !important
@@ -68,7 +68,7 @@ body
     padding 5px
     margin -5px
     border-radius 5px
-  .flowchart-error, .sequence-error .chart-error
+  .flowchart-error, .sequence-error
     background-color errorBackgroundColor
     color errorTextColor
     padding 5px
@@ -76,13 +76,10 @@ body
     justify-content left
 li
   label.taskListItem
-    margin-left -1.8em
+    margin-left -2em
     &.checked
       text-decoration line-through
       opacity 0.5
-  &.taskListItem.checked
-    text-decoration line-through
-    opacity 0.5
 div.math-rendered
   text-align center
 .math-failed
@@ -181,8 +178,6 @@ ul
   margin-bottom 1em
   li
     display list-item
-    &.taskListItem
-      list-style none
     p
       margin 0
   &>li>ul, &>li>ol
@@ -202,6 +197,7 @@ ol
   &>li>ul, &>li>ol
     margin 0
 code
+  color #CC305F
   padding 0.2em 0.4em
   background-color #f7f7f7
   border-radius 3px
@@ -209,39 +205,33 @@ code
   text-decoration none
   margin-right 2px
 pre
-  padding 0.5rem !important
+  padding 0.5em !important
   border solid 1px #D1D1D1
   border-radius 5px
   overflow-x auto
-  margin 0 0 1rem
+  margin 0 0 1em
   display flex
   line-height 1.4em
+  &.flowchart, &.sequence
+    display flex
+    justify-content center
+    background-color white
+  &.CodeMirror
+    height initial
+    &>code
+      flex 1
+      overflow-x auto
   code
     background-color inherit
     margin 0
     padding 0
     border none
     border-radius 0
-  &.CodeMirror
-    height initial
-    flex-wrap wrap
-    &>code
-      flex 1
-      overflow-x auto
-  &.mermaid svg
-    max-width 100% !important
-  &>span.filename
-    margin -0.5rem 100% 0.5rem -0.5rem
-    padding 0.125rem 0.375rem
-    background-color #777;
-    color white
-    &:empty
-      display none
   &>span.lineNumber
     display none
     font-size 1em
-    padding 0.5rem 0
-    margin -0.5rem 0.5rem -0.5rem -0.5rem
+    padding 0.5em 0
+    margin -0.5em 0.5em -0.5em -0.5em
     border-right 1px solid
     text-align right
     border-top-left-radius 4px
@@ -258,7 +248,6 @@ table
   display block
   width 100%
   margin 0 0 1em
-  overflow-x auto
   thead
     tr
       background-color tableHeadBgColor
@@ -295,127 +284,6 @@ kbd
   line-height 1
   padding 3px 5px
 
-$admonition
-    box-shadow 0 2px 2px 0 rgba(0,0,0,.14),0 1px 5px 0 rgba(0,0,0,.12),0 3px 1px -2px rgba(0,0,0,.2)
-    position relative
-    margin 1.5625em 0
-    padding 0 1.2rem
-    border-left .4rem solid #448aff
-    border-radius .2rem
-    overflow auto
-
-html .admonition>:last-child
-    margin-bottom 1.2rem
-
-.admonition .admonition
-    margin 1em 0
-
-.admonition p
-    margin-top: 0.5em
-
-$admonition-icon
-    position absolute
-    left 1.2rem
-    font-family: "Material Icons"
-    font-weight: normal;
-    font-style: normal;
-    font-size: 24px
-    display: inline-block;
-    line-height: 1;
-    text-transform: none;
-    letter-spacing: normal;
-    word-wrap: normal;
-    white-space: nowrap;
-    direction: ltr;
-
-    /* Support for all WebKit browsers. */
-    -webkit-font-smoothing: antialiased;
-    /* Support for Safari and Chrome. */
-    text-rendering: optimizeLegibility;
-
-    /* Support for Firefox. */
-    -moz-osx-font-smoothing: grayscale;
-
-    /* Support for IE. */
-    font-feature-settings: 'liga';
-
-$admonition-title
-    margin 0 -1.2rem
-    padding .8rem 1.2rem .8rem 4rem
-    border-bottom .1rem solid rgba(68,138,255,.1)
-    background-color rgba(68,138,255,.1)
-    font-weight 700
-
-.admonition>.admonition-title:last-child
-    margin-bottom 0
-
-admonition_types = {
-    note: {color: #0288D1, icon: "note"},
-    hint: {color: #009688, icon: "info_outline"},
-    danger: {color: #c2185b, icon: "block"},
-    caution: {color: #ffa726, icon: "warning"},
-    error: {color: #d32f2f, icon: "error_outline"},
-    attention: {color: #455a64, icon: "priority_high"}
-}
-
-for name, val in admonition_types
-    .admonition.{name}
-        @extend $admonition
-        border-left-color: val[color]
-
-    .admonition.{name}>.admonition-title
-        @extend $admonition-title
-        border-bottom-color: .1rem solid rgba(val[color], 0.2)
-        background-color: rgba(val[color], 0.2)
-
-    .admonition.{name}>.admonition-title:before
-        @extend $admonition-icon
-        color: val[color]
-        content: val[icon]
-
-dl
-  margin 2rem 0
-  padding 0
-  display flex
-  width 100%
-  flex-wrap wrap
-  align-items flex-start
-  border-bottom 1px solid borderColor
-  background-color tableHeadBgColor
-
-dt
-  border-top 1px solid borderColor
-  font-weight bold
-  text-align right
-  overflow hidden
-  flex-basis 20%
-  padding 0.4rem 0.9rem
-  box-sizing border-box
-
-dd
-  border-top 1px solid borderColor
-  flex-basis 80%
-  padding 0.4rem 0.9rem
-  min-height 2.5rem
-  background-color $ui-noteDetail-backgroundColor
-  box-sizing border-box
-
-dd + dd
-  margin-left 20%
-
-pre.fence
-  flex-wrap wrap
-
-  .chart, .flowchart, .mermaid, .sequence
-    display flex
-    justify-content center
-    background-color white
-    max-width 100%
-    flex-grow 1
-
-    canvas, svg
-      max-width 100% !important
-
 themeDarkBackground = darken(#21252B, 10%)
 themeDarkText = #f9f9f9
 themeDarkBorder = lighten(themeDarkBackground, 20%)
@@ -466,14 +334,6 @@ body[data-theme="dark"]
   kbd
     background-color themeDarkBorder
     color themeDarkText
-  dl
-    border-color themeDarkBorder
-    background-color themeDarkTableHead
-  dt
-    border-color themeDarkBorder
-  dd
-    border-color themeDarkBorder
-    background-color themeDarkPreview
 
 themeSolarizedDarkTableOdd = $ui-solarized-dark-noteDetail-backgroundColor
 themeSolarizedDarkTableEven = darken($ui-solarized-dark-noteDetail-backgroundColor, 10%)
@@ -501,85 +361,3 @@ body[data-theme="solarized-dark"]
         border-color themeSolarizedDarkTableBorder
         &:last-child
           border-right solid 1px themeSolarizedDarkTableBorder
-  dl
-    border-color themeDarkBorder
-    background-color themeSolarizedDarkTableHead
-  dt
-    border-color themeDarkBorder
-  dd
-    border-color themeDarkBorder
-    background-color $ui-solarized-dark-noteDetail-backgroundColor
-
-themeMonokaiTableOdd = $ui-monokai-noteDetail-backgroundColor
-themeMonokaiTableEven = darken($ui-monokai-noteDetail-backgroundColor, 10%)
-themeMonokaiTableHead = themeMonokaiTableEven
-themeMonokaiTableBorder = themeDarkBorder
-
-body[data-theme="monokai"]
-  color $ui-monokai-text-color
-  border-color themeDarkBorder
-  background-color $ui-monokai-noteDetail-backgroundColor
-  table
-    thead
-      tr
-        background-color themeMonokaiTableHead
-      th
-        border-color themeMonokaiTableBorder
-        &:last-child
-          border-right solid 1px themeMonokaiTableBorder
-    tbody
-      tr:nth-child(2n + 1)
-        background-color themeMonokaiTableOdd
-      tr:nth-child(2n)
-        background-color themeMonokaiTableEven
-      td
-        border-color themeMonokaiTableBorder
-        &:last-child
-          border-right solid 1px themeMonokaiTableBorder
-  kbd
-    background-color themeDarkBackground
-  dl
-    border-color themeDarkBorder
-    background-color themeMonokaiTableHead
-  dt
-    border-color themeDarkBorder
-  dd
-    border-color themeDarkBorder
-    background-color $ui-monokai-noteDetail-backgroundColor
-
-themeDraculaTableOdd = $ui-dracula-noteDetail-backgroundColor
-themeDraculaTableEven = darken($ui-dracula-noteDetail-backgroundColor, 10%)
-themeDraculaTableHead = themeDraculaTableEven
-themeDraculaTableBorder = themeDarkBorder
-
-body[data-theme="dracula"]
-  color $ui-dracula-text-color
-  border-color themeDarkBorder
-  background-color $ui-dracula-noteDetail-backgroundColor
-  table
-    thead
-      tr
-        background-color themeDraculaTableHead
-      th
-        border-color themeDraculaTableBorder
-        &:last-child
-          border-right solid 1px themeDraculaTableBorder
-    tbody
-      tr:nth-child(2n + 1)
-        background-color themeDraculaTableOdd
-      tr:nth-child(2n)
-        background-color themeDraculaTableEven
-      td
-        border-color themeDraculaTableBorder
-        &:last-child
-          border-right solid 1px themeDraculaTableBorder
-  kbd
-    background-color themeDarkBackground
-  dl
-    border-color themeDarkBorder
-    background-color themeDraculaTableHead
-  dt
-    border-color themeDarkBorder
-  dd
-    border-color themeDarkBorder
-    background-color $ui-dracula-noteDetail-backgroundColor

browser/components/render/MermaidRender.js

@@ -1,43 +0,0 @@
-import mermaidAPI from 'mermaid'
-
-// fixes bad styling in the mermaid dark theme
-const darkThemeStyling = `
-.loopText tspan {
-  fill: white;
-}`
-
-function getRandomInt (min, max) {
-  return Math.floor(Math.random() * (max - min)) + min
-}
-
-function getId () {
-  const pool = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'
-  let id = 'm-'
-  for (let i = 0; i < 7; i++) {
-    id += pool[getRandomInt(0, 16)]
-  }
-  return id
-}
-
-function render (element, content, theme) {
-  try {
-    const height = element.attributes.getNamedItem('data-height')
-    if (height && height.value !== 'undefined') {
-      element.style.height = height.value + 'vh'
-    }
-    const isDarkTheme = theme === 'dark' || theme === 'solarized-dark' || theme === 'monokai' || theme === 'dracula'
-    mermaidAPI.initialize({
-      theme: isDarkTheme ? 'dark' : 'default',
-      themeCSS: isDarkTheme ? darkThemeStyling : '',
-      useMaxWidth: false
-    })
-    mermaidAPI.render(getId(), content, (svgGraph) => {
-      element.innerHTML = svgGraph
-    })
-  } catch (e) {
-    element.className = 'mermaid-error'
-    element.innerHTML = 'mermaid diagram parse error: ' + e.message
-  }
-}
-
-export default render

browser/lib/Languages.js

@@ -1,85 +0,0 @@
-const languages = [
-  {
-    name: 'Albanian',
-    locale: 'sq'
-  },
-  {
-    name: 'Chinese (zh-CN)',
-    locale: 'zh-CN'
-  },
-  {
-    name: 'Chinese (zh-TW)',
-    locale: 'zh-TW'
-  },
-  {
-    name: 'Danish',
-    locale: 'da'
-  },
-  {
-    name: 'English',
-    locale: 'en'
-  },
-  {
-    name: 'French',
-    locale: 'fr'
-  },
-  {
-    name: 'German',
-    locale: 'de'
-  },
-  {
-    name: 'Hungarian',
-    locale: 'hu'
-  },
-  {
-    name: 'Japanese',
-    locale: 'ja'
-  },
-  {
-    name: 'Korean',
-    locale: 'ko'
-  },
-  {
-    name: 'Norwegian',
-    locale: 'no'
-  },
-  {
-    name: 'Polish',
-    locale: 'pl'
-  },
-  {
-    name: 'Portuguese (PT-BR)',
-    locale: 'pt-BR'
-  },
-  {
-    name: 'Portuguese (PT-PT)',
-    locale: 'pt-PT'
-  },
-  {
-    name: 'Russian',
-    locale: 'ru'
-  },
-  {
-    name: 'Spanish',
-    locale: 'es-ES'
-  }, {
-    name: 'Turkish',
-    locale: 'tr'
-  }, {
-    name: 'Thai',
-    locale: 'th'
-  }
-]
-
-module.exports = {
-  getLocales () {
-    return languages.reduce(function (localeList, locale) {
-      localeList.push(locale.locale)
-      return localeList
-    }, [])
-  },
-  getLanguages () {
-    return languages
-  }
-}
-

browser/lib/TextEditorInterface.js

@@ -1,113 +0,0 @@
-import { Point } from '@susisu/mte-kernel'
-
-export default class TextEditorInterface {
-  constructor (editor) {
-    this.editor = editor
-    this.doc = editor.getDoc()
-    this.transaction = false
-  }
-
-  getCursorPosition () {
-    const { line, ch } = this.doc.getCursor()
-    return new Point(line, ch)
-  }
-
-  setCursorPosition (pos) {
-    this.doc.setCursor({
-      line: pos.row,
-      ch: pos.column
-    })
-  }
-
-  setSelectionRange (range) {
-    this.doc.setSelection(
-      { line: range.start.row, ch: range.start.column },
-      { line: range.end.row, ch: range.end.column }
-    )
-  }
-
-  getLastRow () {
-    return this.doc.lineCount() - 1
-  }
-
-  acceptsTableEdit () {
-    return true
-  }
-
-  getLine (row) {
-    return this.doc.getLine(row)
-  }
-
-  insertLine (row, line) {
-    const lastRow = this.getLastRow()
-    if (row > lastRow) {
-      const lastLine = this.getLine(lastRow)
-      this.doc.replaceRange(
-        '\n' + line,
-        { line: lastRow, ch: lastLine.length },
-        { line: lastRow, ch: lastLine.length }
-      )
-    } else {
-      this.doc.replaceRange(
-        line + '\n',
-        { line: row, ch: 0 },
-        { line: row, ch: 0 }
-      )
-    }
-  }
-
-  deleteLine (row) {
-    const lastRow = this.getLastRow()
-    if (row >= lastRow) {
-      if (lastRow > 0) {
-        const preLastLine = this.getLine(lastRow - 1)
-        const lastLine = this.getLine(lastRow)
-        this.doc.replaceRange(
-          '',
-          { line: lastRow - 1, ch: preLastLine.length },
-          { line: lastRow, ch: lastLine.length }
-        )
-      } else {
-        const lastLine = this.getLine(lastRow)
-        this.doc.replaceRange(
-          '',
-          { line: lastRow, ch: 0 },
-          { line: lastRow, ch: lastLine.length }
-        )
-      }
-    } else {
-      this.doc.replaceRange(
-        '',
-        { line: row, ch: 0 },
-        { line: row + 1, ch: 0 }
-      )
-    }
-  }
-
-  replaceLines (startRow, endRow, lines) {
-    const lastRow = this.getLastRow()
-    if (endRow > lastRow) {
-      const lastLine = this.getLine(lastRow)
-      this.doc.replaceRange(
-        lines.join('\n'),
-        { line: startRow, ch: 0 },
-        { line: lastRow, ch: lastLine.length }
-      )
-    } else {
-      this.doc.replaceRange(
-        lines.join('\n') + '\n',
-        { line: startRow, ch: 0 },
-        { line: endRow, ch: 0 }
-      )
-    }
-  }
-
-  transact (func) {
-    this.transaction = true
-    func()
-    this.transaction = false
-    if (this.onDidFinishTransaction) {
-      this.onDidFinishTransaction.call(undefined)
-    }
-  }
-}

browser/lib/confirmDeleteNote.js

@@ -1,23 +0,0 @@
-import electron from 'electron'
-import i18n from 'browser/lib/i18n'
-const { remote } = electron
-const { dialog } = remote
-
-export function confirmDeleteNote (confirmDeletion, permanent) {
-  if (confirmDeletion || permanent) {
-    const alertConfig = {
-      ype: 'warning',
-      message: i18n.__('Confirm note deletion'),
-      detail: i18n.__('This will permanently remove this note.'),
-      buttons: [i18n.__('Confirm'), i18n.__('Cancel')]
-    }
-
-    const dialogButtonIndex = dialog.showMessageBox(
-      remote.getCurrentWindow(), alertConfig
-    )
-
-    return dialogButtonIndex === 0
-  }
-
-  return true
-}

browser/lib/consts.js

@@ -12,10 +12,6 @@ const themes = fs.readdirSync(themePath)
   })
 themes.splice(themes.indexOf('solarized'), 1, 'solarized dark', 'solarized light')
 
-const snippetFile = process.env.NODE_ENV !== 'test'
-  ? path.join(app.getPath('userData'), 'snippets.json')
-  : '' // return nothing as we specified different path to snippets.json in test
-
 const consts = {
   FOLDER_COLORS: [
     '#E10051',
@@ -35,16 +31,7 @@ const consts = {
     'Dodger Blue',
     'Violet Eggplant'
   ],
-  THEMES: ['default'].concat(themes),
-  SNIPPET_FILE: snippetFile,
-  DEFAULT_EDITOR_FONT_FAMILY: [
-    'Monaco',
-    'Menlo',
-    'Ubuntu Mono',
-    'Consolas',
-    'source-code-pro',
-    'monospace'
-  ]
+  THEMES: ['default'].concat(themes)
 }
 
 module.exports = consts

browser/lib/contextMenuBuilder.js

@@ -1,65 +0,0 @@
-const {remote} = require('electron')
-const {Menu} = remote.require('electron')
-const spellcheck = require('./spellcheck')
-
-/**
- * Creates the context menu that is shown when there is a right click in the editor of a (not-snippet) note.
- * If the word is does not contains a spelling error (determined by the 'error style'), no suggestions for corrections are requested
- * => they are not visible in the context menu
- * @param editor CodeMirror editor
- * @param {MouseEvent} event that has triggered the creation of the context menu
- * @returns {Electron.Menu} The created electron context menu
- */
-const buildEditorContextMenu = function (editor, event) {
-  if (editor == null || event == null || event.pageX == null || event.pageY == null) {
-    return null
-  }
-  const cursor = editor.coordsChar({left: event.pageX, top: event.pageY})
-  const wordRange = editor.findWordAt(cursor)
-  const word = editor.getRange(wordRange.anchor, wordRange.head)
-  const existingMarks = editor.findMarks(wordRange.anchor, wordRange.head) || []
-  let isMisspelled = false
-  for (const mark of existingMarks) {
-    if (mark.className === spellcheck.getCSSClassName()) {
-      isMisspelled = true
-      break
-    }
-  }
-  let suggestion = []
-  if (isMisspelled) {
-    suggestion = spellcheck.getSpellingSuggestion(word)
-  }
-
-  const selection = {
-    isMisspelled: isMisspelled,
-    spellingSuggestions: suggestion
-  }
-  const template = [{
-    role: 'cut'
-  }, {
-    role: 'copy'
-  }, {
-    role: 'paste'
-  }, {
-    role: 'selectall'
-  }]
-
-  if (selection.isMisspelled) {
-    const suggestions = selection.spellingSuggestions
-    template.unshift.apply(template, suggestions.map(function (suggestion) {
-      return {
-        label: suggestion,
-        click: function (suggestion) {
-          if (editor != null) {
-            editor.replaceRange(suggestion.label, wordRange.anchor, wordRange.head)
-          }
-        }
-      }
-    }).concat({
-      type: 'separator'
-    }))
-  }
-  return Menu.buildFromTemplate(template)
-}
-
-module.exports = buildEditorContextMenu

browser/lib/convertModeName.js

@@ -1,14 +0,0 @@
-export default function convertModeName (name) {
-  switch (name) {
-    case 'ejs':
-      return 'Embedded Javascript'
-    case 'html_ruby':
-      return 'Embedded Ruby'
-    case 'objectivec':
-      return 'Objective C'
-    case 'text':
-      return 'Plain Text'
-    default:
-      return name
-  }
-}

browser/lib/findNoteTitle.js

@@ -1,37 +1,19 @@
-export function findNoteTitle (value, enableFrontMatterTitle, frontMatterTitleField = 'title') {
+export function findNoteTitle (value) {
   const splitted = value.split('\n')
   let title = null
   let isInsideCodeBlock = false
 
-  if (splitted[0] === '---') {
-    let line = 0
-    while (++line < splitted.length) {
-      if (enableFrontMatterTitle && splitted[line].startsWith(frontMatterTitleField + ':')) {
-        title = splitted[line].substring(frontMatterTitleField.length + 1).trim()
-
-        break
-      }
-      if (splitted[line] === '---') {
-        splitted.splice(0, line + 1)
-
-        break
-      }
+  splitted.some((line, index) => {
+    const trimmedLine = line.trim()
+    const trimmedNextLine = splitted[index + 1] === undefined ? '' : splitted[index + 1].trim()
+    if (trimmedLine.match('```')) {
+      isInsideCodeBlock = !isInsideCodeBlock
     }
-  }
-
-  if (title === null) {
-    splitted.some((line, index) => {
-      const trimmedLine = line.trim()
-      const trimmedNextLine = splitted[index + 1] === undefined ? '' : splitted[index + 1].trim()
-      if (trimmedLine.match('```')) {
-        isInsideCodeBlock = !isInsideCodeBlock
-      }
-      if (isInsideCodeBlock === false && (trimmedLine.match(/^# +/) || trimmedNextLine.match(/^=+$/))) {
-        title = trimmedLine
-        return true
-      }
-    })
-  }
+    if (isInsideCodeBlock === false && (trimmedLine.match(/^# +/) || trimmedNextLine.match(/^=+$/))) {
+      title = trimmedLine
+      return true
+    }
+  })
 
   if (title === null) {
     title = ''

browser/lib/getTodoStatus.js

@@ -5,10 +5,10 @@ export function getTodoStatus (content) {
 
   splitted.forEach((line) => {
     const trimmedLine = line.trim()
-    if (trimmedLine.match(/^[\+\-\*] \[(\s|x)\] ./i)) {
+    if (trimmedLine.match(/^[\+\-\*] \[(\s|x)\] ./)) {
       numberOfTodo++
     }
-    if (trimmedLine.match(/^[\+\-\*] \[x\] ./i)) {
+    if (trimmedLine.match(/^[\+\-\*] \[x\] ./)) {
       numberOfCompletedTodo++
     }
   })

browser/lib/i18n.js

@@ -1,17 +0,0 @@
-const path = require('path')
-const { remote } = require('electron')
-const { app } = remote
-const { getLocales } = require('./Languages.js')
-
-// load package for localization
-const i18n = new (require('i18n-2'))({
-  // setup some locales - other locales default to the first locale
-  locales: getLocales(),
-  extension: '.json',
-  directory: process.env.NODE_ENV === 'production'
-    ? path.join(app.getAppPath(), './locales')
-    : path.resolve('./locales'),
-  devMode: false
-})
-
-export default i18n

browser/lib/keygen.js

@@ -1,11 +1,7 @@
 const crypto = require('crypto')
 const _ = require('lodash')
-const uuidv4 = require('uuid/v4')
 
-module.exports = function (uuid) {
-  if (typeof uuid === typeof true && uuid) {
-    return uuidv4()
-  }
-  const length = 10
+module.exports = function (length) {
+  if (!_.isFinite(length)) length = 10
   return crypto.randomBytes(length).toString('hex')
 }

browser/lib/markdown-it-deflist.js

@@ -1,232 +0,0 @@
-'use strict'
-
-module.exports = function definitionListPlugin (md) {
-  var isSpace = md.utils.isSpace
-
-  // Search `[:~][\n ]`, returns next pos after marker on success
-  // or -1 on fail.
-  function skipMarker (state, line) {
-    let start = state.bMarks[line] + state.tShift[line]
-    const max = state.eMarks[line]
-
-    if (start >= max) { return -1 }
-
-    // Check bullet
-    const marker = state.src.charCodeAt(start++)
-    if (marker !== 0x7E/* ~ */ && marker !== 0x3A/* : */) { return -1 }
-
-    const pos = state.skipSpaces(start)
-
-    // require space after ":"
-    if (start === pos) { return -1 }
-
-    return start
-  }
-
-  function markTightParagraphs (state, idx) {
-    const level = state.level + 2
-
-    let i
-    let l
-    for (i = idx + 2, l = state.tokens.length - 2; i < l; i++) {
-      if (state.tokens[i].level === level && state.tokens[i].type === 'paragraph_open') {
-        state.tokens[i + 2].hidden = true
-        state.tokens[i].hidden = true
-        i += 2
-      }
-    }
-  }
-
-  function deflist (state, startLine, endLine, silent) {
-    var ch,
-      contentStart,
-      ddLine,
-      dtLine,
-      itemLines,
-      listLines,
-      listTokIdx,
-      max,
-      newEndLine,
-      nextLine,
-      offset,
-      oldDDIndent,
-      oldIndent,
-      oldLineMax,
-      oldParentType,
-      oldSCount,
-      oldTShift,
-      oldTight,
-      pos,
-      prevEmptyEnd,
-      tight,
-      token
-
-    if (silent) {
-      // quirk: validation mode validates a dd block only, not a whole deflist
-      if (state.ddIndent < 0) { return false }
-      return skipMarker(state, startLine) >= 0
-    }
-
-    nextLine = startLine + 1
-    if (nextLine >= endLine) { return false }
-
-    if (state.isEmpty(nextLine)) {
-      nextLine++
-      if (nextLine >= endLine) { return false }
-    }
-
-    if (state.sCount[nextLine] < state.blkIndent) { return false }
-    contentStart = skipMarker(state, nextLine)
-    if (contentStart < 0) { return false }
-
-    // Start list
-    listTokIdx = state.tokens.length
-    tight = true
-
-    token = state.push('dl_open', 'dl', 1)
-    token.map = listLines = [ startLine, 0 ]
-
-    //
-    // Iterate list items
-    //
-
-    dtLine = startLine
-    ddLine = nextLine
-
-    // One definition list can contain multiple DTs,
-    // and one DT can be followed by multiple DDs.
-    //
-    // Thus, there is two loops here, and label is
-    // needed to break out of the second one
-    //
-    /* eslint no-labels:0,block-scoped-var:0 */
-    OUTER:
-    for (;;) {
-      prevEmptyEnd = false
-
-      token = state.push('dt_open', 'dt', 1)
-      token.map = [ dtLine, dtLine ]
-
-      token = state.push('inline', '', 0)
-      token.map = [ dtLine, dtLine ]
-      token.content = state.getLines(dtLine, dtLine + 1, state.blkIndent, false).trim()
-      token.children = []
-
-      token = state.push('dt_close', 'dt', -1)
-
-      for (;;) {
-        token = state.push('dd_open', 'dd', 1)
-        token.map = itemLines = [ ddLine, 0 ]
-
-        pos = contentStart
-        max = state.eMarks[ddLine]
-        offset = state.sCount[ddLine] + contentStart - (state.bMarks[ddLine] + state.tShift[ddLine])
-
-        while (pos < max) {
-          ch = state.src.charCodeAt(pos)
-
-          if (isSpace(ch)) {
-            if (ch === 0x09) {
-              offset += 4 - offset % 4
-            } else {
-              offset++
-            }
-          } else {
-            break
-          }
-
-          pos++
-        }
-
-        contentStart = pos
-
-        oldTight = state.tight
-        oldDDIndent = state.ddIndent
-        oldIndent = state.blkIndent
-        oldTShift = state.tShift[ddLine]
-        oldSCount = state.sCount[ddLine]
-        oldParentType = state.parentType
-        state.blkIndent = state.ddIndent = state.sCount[ddLine] + 2
-        state.tShift[ddLine] = contentStart - state.bMarks[ddLine]
-        state.sCount[ddLine] = offset
-        state.tight = true
-        state.parentType = 'deflist'
-
-        newEndLine = ddLine
-        while (++newEndLine < endLine && (state.sCount[newEndLine] >= state.sCount[ddLine] || state.isEmpty(newEndLine))) {
-        }
-
-        oldLineMax = state.lineMax
-        state.lineMax = newEndLine
-
-        state.md.block.tokenize(state, ddLine, newEndLine, true)
-
-        state.lineMax = oldLineMax
-
-        // If any of list item is tight, mark list as tight
-        if (!state.tight || prevEmptyEnd) {
-          tight = false
-        }
-        // Item become loose if finish with empty line,
-        // but we should filter last element, because it means list finish
-        prevEmptyEnd = (state.line - ddLine) > 1 && state.isEmpty(state.line - 1)
-
-        state.tShift[ddLine] = oldTShift
-        state.sCount[ddLine] = oldSCount
-        state.tight = oldTight
-        state.parentType = oldParentType
-        state.blkIndent = oldIndent
-        state.ddIndent = oldDDIndent
-
-        token = state.push('dd_close', 'dd', -1)
-
-        itemLines[1] = nextLine = state.line
-
-        if (nextLine >= endLine) { break OUTER }
-
-        if (state.sCount[nextLine] < state.blkIndent) { break OUTER }
-        contentStart = skipMarker(state, nextLine)
-        if (contentStart < 0) { break }
-
-        ddLine = nextLine
-
-        // go to the next loop iteration:
-        // insert DD tag and repeat checking
-      }
-
-      if (nextLine >= endLine) { break }
-      dtLine = nextLine
-
-      if (state.isEmpty(dtLine)) { break }
-      if (state.sCount[dtLine] < state.blkIndent) { break }
-
-      ddLine = dtLine + 1
-      if (ddLine >= endLine) { break }
-      if (state.isEmpty(ddLine)) { ddLine++ }
-      if (ddLine >= endLine) { break }
-
-      if (state.sCount[ddLine] < state.blkIndent) { break }
-      contentStart = skipMarker(state, ddLine)
-      if (contentStart < 0) { break }
-
-      // go to the next loop iteration:
-      // insert DT and DD tags and repeat checking
-    }
-
-    // Finilize list
-    token = state.push('dl_close', 'dl', -1)
-
-    listLines[1] = nextLine
-
-    state.line = nextLine
-
-    // mark paragraphs tight if needed
-    if (tight) {
-      markTightParagraphs(state, listTokIdx)
-    }
-
-    return true
-  }
-
-  md.block.ruler.before('paragraph', 'deflist', deflist, { alt: [ 'paragraph', 'reference' ] })
-}

browser/lib/markdown-it-fence.js

@@ -1,136 +0,0 @@
-'use strict'
-
-module.exports = function (md, renderers, defaultRenderer) {
-  const paramsRE = /^[ \t]*([\w+#-]+)?(?:\(((?:\s*\w[-\w]*(?:=(?:'(?:.*?[^\\])?'|"(?:.*?[^\\])?"|(?:[^'"][^\s]*)))?)*)\))?(?::([^:]*)(?::(\d+))?)?\s*$/
-
-  function fence (state, startLine, endLine, silent) {
-    let pos = state.bMarks[startLine] + state.tShift[startLine]
-    let max = state.eMarks[startLine]
-
-    if (state.sCount[startLine] - state.blkIndent >= 4 || pos + 3 > max) {
-      return false
-    }
-
-    const marker = state.src.charCodeAt(pos)
-    if (marker !== 0x7E/* ~ */ && marker !== 0x60 /* ` */) {
-      return false
-    }
-
-    let mem = pos
-    pos = state.skipChars(pos, marker)
-
-    let len = pos - mem
-    if (len < 3) {
-      return false
-    }
-
-    const markup = state.src.slice(mem, pos)
-    const params = state.src.slice(pos, max)
-
-    if (silent) {
-      return true
-    }
-
-    let nextLine = startLine
-    let haveEndMarker = false
-
-    while (true) {
-      nextLine++
-      if (nextLine >= endLine) {
-        break
-      }
-
-      pos = mem = state.bMarks[nextLine] + state.tShift[nextLine]
-      max = state.eMarks[nextLine]
-
-      if (pos < max && state.sCount[nextLine] < state.blkIndent) {
-        break
-      }
-      if (state.src.charCodeAt(pos) !== marker || state.sCount[nextLine] - state.blkIndent >= 4) {
-        continue
-      }
-
-      pos = state.skipChars(pos, marker)
-
-      if (pos - mem < len) {
-        continue
-      }
-
-      pos = state.skipSpaces(pos)
-
-      if (pos >= max) {
-        haveEndMarker = true
-        break
-      }
-    }
-
-    len = state.sCount[startLine]
-    state.line = nextLine + (haveEndMarker ? 1 : 0)
-
-    const parameters = {}
-    let langType = ''
-    let fileName = ''
-    let firstLineNumber = 1
-
-    let match = paramsRE.exec(params)
-    if (match) {
-      if (match[1]) {
-        langType = match[1]
-      }
-      if (match[3]) {
-        fileName = match[3]
-      }
-      if (match[4]) {
-        firstLineNumber = parseInt(match[4], 10)
-      }
-
-      if (match[2]) {
-        const params = match[2]
-        const regex = /(\w[-\w]*)(?:=(?:'(.*?[^\\])?'|"(.*?[^\\])?"|([^'"][^\s]*)))?/g
-
-        let name, value
-        while ((match = regex.exec(params))) {
-          name = match[1]
-          value = match[2] || match[3] || match[4] || null
-
-          const height = /^(\d+)h$/.exec(name)
-          if (height && !value) {
-            parameters.height = height[1]
-          } else {
-            parameters[name] = value
-          }
-        }
-      }
-    }
-
-    let token
-    if (renderers[langType]) {
-      token = state.push(`${langType}_fence`, 'div', 0)
-    } else {
-      token = state.push('_fence', 'code', 0)
-    }
-
-    token.langType = langType
-    token.fileName = fileName
-    token.firstLineNumber = firstLineNumber
-    token.parameters = parameters
-
-    token.content = state.getLines(startLine + 1, nextLine, len, true)
-    token.markup = markup
-    token.map = [startLine, state.line]
-
-    return true
-  }
-
-  md.block.ruler.before('fence', '_fence', fence, {
-    alt: ['paragraph', 'reference', 'blockquote', 'list']
-  })
-
-  for (const name in renderers) {
-    md.renderer.rules[`${name}_fence`] = (tokens, index) => renderers[name](tokens[index])
-  }
-
-  if (defaultRenderer) {
-    md.renderer.rules['_fence'] = (tokens, index) => defaultRenderer(tokens[index])
-  }
-}

browser/lib/markdown-it-frontmatter.js

@@ -1,24 +0,0 @@
-'use strict'
-
-module.exports = function frontMatterPlugin (md) {
-  function frontmatter (state, startLine, endLine, silent) {
-    if (startLine !== 0 || state.src.substr(startLine, state.eMarks[0]) !== '---') {
-      return false
-    }
-
-    let line = 0
-    while (++line < state.lineMax) {
-      if (state.src.substring(state.bMarks[line], state.eMarks[line]) === '---') {
-        state.line = line + 1
-
-        return true
-      }
-    }
-
-    return false
-  }
-
-  md.block.ruler.before('table', 'frontmatter', frontmatter, {
-    alt: [ 'paragraph', 'reference', 'blockquote', 'list' ]
-  })
-}

browser/lib/markdown-it-sanitize-html.js

@@ -1,124 +0,0 @@
-'use strict'
-
-import sanitizeHtml from 'sanitize-html'
-import { escapeHtmlCharacters } from './utils'
-import url from 'url'
-
-module.exports = function sanitizePlugin (md, options) {
-  options = options || {}
-
-  md.core.ruler.after('linkify', 'sanitize_inline', state => {
-    for (let tokenIdx = 0; tokenIdx < state.tokens.length; tokenIdx++) {
-      if (state.tokens[tokenIdx].type === 'html_block') {
-        state.tokens[tokenIdx].content = sanitizeHtml(
-          state.tokens[tokenIdx].content,
-          options
-        )
-      }
-      if (state.tokens[tokenIdx].type === '_fence') {
-        // escapeHtmlCharacters has better performance
-        state.tokens[tokenIdx].content = escapeHtmlCharacters(
-          state.tokens[tokenIdx].content,
-          { skipSingleQuote: true }
-        )
-      }
-      if (state.tokens[tokenIdx].type === 'inline') {
-        const inlineTokens = state.tokens[tokenIdx].children
-        for (let childIdx = 0; childIdx < inlineTokens.length; childIdx++) {
-          if (inlineTokens[childIdx].type === 'html_inline') {
-            inlineTokens[childIdx].content = sanitizeInline(
-              inlineTokens[childIdx].content,
-              options
-            )
-          }
-        }
-      }
-    }
-  })
-}
-
-const tagRegex = /<([A-Z][A-Z0-9]*)\s*((?:\s*[A-Z][A-Z0-9]*(?:=("|')(?:[^\3]+?)\3)?)*)\s*\/?>|<\/([A-Z][A-Z0-9]*)\s*>/i
-const attributesRegex = /([A-Z][A-Z0-9]*)(?:=("|')([^\2]+?)\2)?/ig
-
-function sanitizeInline (html, options) {
-  let match = tagRegex.exec(html)
-  if (!match) {
-    return ''
-  }
-
-  const { allowedTags, allowedAttributes, selfClosing, allowedSchemesAppliedToAttributes } = options
-
-  if (match[1] !== undefined) {
-    // opening tag
-    const tag = match[1].toLowerCase()
-    if (allowedTags.indexOf(tag) === -1) {
-      return ''
-    }
-
-    const attributes = match[2]
-
-    let attrs = ''
-    let name
-    let value
-
-    while ((match = attributesRegex.exec(attributes))) {
-      name = match[1].toLowerCase()
-      value = match[3]
-
-      if (allowedAttributes['*'].indexOf(name) !== -1 || (allowedAttributes[tag] && allowedAttributes[tag].indexOf(name) !== -1)) {
-        if (allowedSchemesAppliedToAttributes.indexOf(name) !== -1) {
-          if (naughtyHRef(value, options) || (tag === 'iframe' && name === 'src' && naughtyIFrame(value, options))) {
-            continue
-          }
-        }
-
-        attrs += ` ${name}`
-        if (match[2]) {
-          attrs += `="${value}"`
-        }
-      }
-    }
-
-    if (selfClosing.indexOf(tag) === -1) {
-      return '<' + tag + attrs + '>'
-    } else {
-      return '<' + tag + attrs + ' />'
-    }
-  } else {
-    // closing tag
-    if (allowedTags.indexOf(match[4].toLowerCase()) !== -1) {
-      return html
-    } else {
-      return ''
-    }
-  }
-}
-
-function naughtyHRef (href, options) {
-  // href = href.replace(/[\x00-\x20]+/g, '')
-  href = href.replace(/<\!\-\-.*?\-\-\>/g, '')
-
-  const matches = href.match(/^([a-zA-Z]+)\:/)
-  if (!matches) {
-    if (href.match(/^[\/\\]{2}/)) {
-      return !options.allowProtocolRelative
-    }
-
-    // No scheme
-    return false
-  }
-
-  const scheme = matches[1].toLowerCase()
-
-  return options.allowedSchemes.indexOf(scheme) === -1
-}
-
-function naughtyIFrame (src, options) {
-  try {
-    const parsed = url.parse(src, false, true)
-
-    return options.allowedIframeHostnames.index(parsed.hostname) === -1
-  } catch (e) {
-    return true
-  }
-}

browser/lib/markdown-toc-generator.js

@@ -1,107 +0,0 @@
-/**
- * @fileoverview Markdown table of contents generator
- */
-
-import toc from 'markdown-toc'
-import diacritics from 'diacritics-map'
-import stripColor from 'strip-color'
-import mdlink from 'markdown-link'
-
-const EOL = require('os').EOL
-
-/**
- * @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
- */
-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
-}
-
-const TOC_MARKER_START = '<!-- toc -->'
-const TOC_MARKER_END = '<!-- tocstop -->'
-
-/**
- * Takes care of proper updating given editor with TOC.
- * If TOC doesn't exit in the editor, it's inserted at current caret position.
- * Otherwise,TOC is updated in place.
- * @param editor CodeMirror editor to be updated with TOC
- */
-export function generateInEditor (editor) {
-  const tocRegex = new RegExp(`${TOC_MARKER_START}[\\s\\S]*?${TOC_MARKER_END}`)
-
-  function tocExistsInEditor () {
-    return tocRegex.test(editor.getValue())
-  }
-
-  function updateExistingToc () {
-    const toc = generate(editor.getValue())
-    const search = editor.getSearchCursor(tocRegex)
-    while (search.findNext()) {
-      search.replace(toc)
-    }
-  }
-
-  function addTocAtCursorPosition () {
-    const toc = generate(editor.getRange(editor.getCursor(), {line: Infinity}))
-    editor.replaceRange(wrapTocWithEol(toc, editor), editor.getCursor())
-  }
-
-  if (tocExistsInEditor()) {
-    updateExistingToc()
-  } else {
-    addTocAtCursorPosition()
-  }
-}
-
-/**
- * Generates MD TOC based on MD document passed as string.
- * @param markdownText MD document
- * @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
-}
-
-function wrapTocWithEol (toc, editor) {
-  const leftWrap = editor.getCursor().ch === 0 ? '' : EOL
-  const rightWrap = editor.getLine(editor.getCursor().line).length === editor.getCursor().ch ? '' : EOL
-  return leftWrap + toc + rightWrap
-}
-
-export default {
-  generate,
-  generateInEditor
-}

browser/lib/markdown.js

@@ -1,298 +1,173 @@
 import markdownit from 'markdown-it'
-import sanitize from './markdown-it-sanitize-html'
 import emoji from 'markdown-it-emoji'
 import math from '@rokt33r/markdown-it-math'
-import smartArrows from 'markdown-it-smartarrows'
 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
-  const lastLineNumber = (str.match(/\n/g) || []).length + firstLineNumber - 1
+// FIXME We should not depend on global variable.
+const katex = window.katex
+const config = ConfigManager.get()
+
+function createGutter (str) {
+  const lc = (str.match(/\n/g) || []).length
   const lines = []
-  for (let i = firstLineNumber; i <= lastLineNumber; i++) {
+  for (let i = 1; i <= lc; i++) {
     lines.push('<span class="CodeMirror-linenumber">' + i + '</span>')
   }
   return '<span class="lineNumber CodeMirror-gutters">' + lines.join('') + '</span>'
 }
 
-class Markdown {
-  constructor (options = {}) {
-    const config = ConfigManager.get()
-    const defaultOptions = {
-      typographer: config.preview.smartQuotes,
-      linkify: true,
-      html: true,
-      xhtmlOut: true,
-      breaks: config.preview.breaks,
-      sanitize: 'STRICT'
+var md = markdownit({
+  typographer: true,
+  linkify: true,
+  html: true,
+  xhtmlOut: true,
+  breaks: true,
+  highlight: function (str, lang) {
+    if (lang === 'flowchart') {
+      return `<pre class="flowchart">${str}</pre>`
     }
-
-    const updatedOptions = Object.assign(defaultOptions, options)
-    this.md = markdownit(updatedOptions)
-
-    if (updatedOptions.sanitize !== 'NONE') {
-      const allowedTags = ['iframe', 'input', 'b',
-        'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'h7', 'h8', 'br', 'b', 'i', 'strong', 'em', 'a', 'pre', 'code', 'img', 'tt',
-        'div', 'ins', 'del', 'sup', 'sub', 'p', 'ol', 'ul', 'table', 'thead', 'tbody', 'tfoot', 'blockquote',
-        'dl', 'dt', 'dd', 'kbd', 'q', 'samp', 'var', 'hr', 'ruby', 'rt', 'rp', 'li', 'tr', 'td', 'th', 's', 'strike', 'summary', 'details'
-      ]
-      const allowedAttributes = [
-        'abbr', 'accept', 'accept-charset',
-        'accesskey', 'action', 'align', 'alt', 'axis',
-        'border', 'cellpadding', 'cellspacing', 'char',
-        'charoff', 'charset', 'checked',
-        'clear', 'cols', 'colspan', 'color',
-        'compact', 'coords', 'datetime', 'dir',
-        'disabled', 'enctype', 'for', 'frame',
-        'headers', 'height', 'hreflang',
-        'hspace', 'ismap', 'label', 'lang',
-        'maxlength', 'media', 'method',
-        'multiple', 'name', 'nohref', 'noshade',
-        'nowrap', 'open', 'prompt', 'readonly', 'rel', 'rev',
-        'rows', 'rowspan', 'rules', 'scope',
-        'selected', 'shape', 'size', 'span',
-        'start', 'summary', 'tabindex', 'target',
-        'title', 'type', 'usemap', 'valign', 'value',
-        'vspace', 'width', 'itemprop'
-      ]
-
-      if (updatedOptions.sanitize === 'ALLOW_STYLES') {
-        allowedTags.push('style')
-        allowedAttributes.push('style')
-      }
-
-      // Sanitize use rinput before other plugins
-      this.md.use(sanitize, {
-        allowedTags,
-        allowedAttributes: {
-          '*': allowedAttributes,
-          'a': ['href'],
-          'div': ['itemscope', 'itemtype'],
-          'blockquote': ['cite'],
-          'del': ['cite'],
-          'ins': ['cite'],
-          'q': ['cite'],
-          'img': ['src', 'width', 'height'],
-          'iframe': ['src', 'width', 'height', 'frameborder', 'allowfullscreen'],
-          'input': ['type', 'id', 'checked']
-        },
-        allowedIframeHostnames: ['www.youtube.com'],
-        selfClosing: [ 'img', 'br', 'hr', 'input' ],
-        allowedSchemes: [ 'http', 'https', 'ftp', 'mailto' ],
-        allowedSchemesAppliedToAttributes: [ 'href', 'src', 'cite' ],
-        allowProtocolRelative: true
-      })
+    if (lang === 'sequence') {
+      return `<pre class="sequence">${str}</pre>`
     }
-
-    this.md.use(emoji, {
-      shortcuts: {}
-    })
-    this.md.use(math, {
-      inlineOpen: config.preview.latexInlineOpen,
-      inlineClose: config.preview.latexInlineClose,
-      blockOpen: config.preview.latexBlockOpen,
-      blockClose: config.preview.latexBlockClose,
-      inlineRenderer: function (str) {
-        let output = ''
-        try {
-          output = katex.renderToString(str.trim())
-        } catch (err) {
-          output = `<span class="katex-error">${err.message}</span>`
-        }
-        return output
-      },
-      blockRenderer: function (str) {
-        let output = ''
-        try {
-          output = katex.renderToString(str.trim(), { displayMode: true })
-        } catch (err) {
-          output = `<div class="katex-error">${err.message}</div>`
-        }
-        return output
-      }
-    })
-    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('markdown-it-kbd'))
-    this.md.use(require('markdown-it-admonition'), {types: ['note', 'hint', 'attention', 'caution', 'danger', 'error']})
-    this.md.use(require('markdown-it-abbr'))
-    this.md.use(require('markdown-it-sub'))
-    this.md.use(require('markdown-it-sup'))
-    this.md.use(require('./markdown-it-deflist'))
-    this.md.use(require('./markdown-it-frontmatter'))
-
-    this.md.use(require('./markdown-it-fence'), {
-      chart: token => {
-        if (token.parameters.hasOwnProperty('yaml')) {
-          token.parameters.format = 'yaml'
-        }
-
-        return `<pre class="fence" data-line="${token.map[0]}">
-          <span class="filename">${token.fileName}</span>
-          <div class="chart" data-height="${token.parameters.height}" data-format="${token.parameters.format || 'json'}">${token.content}</div>
-        </pre>`
-      },
-      flowchart: token => {
-        return `<pre class="fence" data-line="${token.map[0]}">
-          <span class="filename">${token.fileName}</span>
-          <div class="flowchart" 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>
-          <div class="mermaid" data-height="${token.parameters.height}">${token.content}</div>
-        </pre>`
-      },
-      sequence: token => {
-        return `<pre class="fence" data-line="${token.map[0]}">
-          <span class="filename">${token.fileName}</span>
-          <div class="sequence" data-height="${token.parameters.height}">${token.content}</div>
-        </pre>`
-      }
-    }, token => {
-      return `<pre class="code CodeMirror" data-line="${token.map[0]}">
-        <span class="filename">${token.fileName}</span>
-        ${createGutter(token.content, token.firstLineNumber)}
-        <code class="${token.langType}">${token.content}</code>
-      </pre>`
-    })
-
-    const deflate = require('markdown-it-plantuml/lib/deflate')
-    this.md.use(require('markdown-it-plantuml'), '', {
-      generateSource: function (umlCode) {
-        const stripTrailingSlash = (url) => url.endsWith('/') ? url.slice(0, -1) : url
-        const serverAddress = stripTrailingSlash(config.preview.plantUMLServerAddress) + '/svg'
-        const s = unescape(encodeURIComponent(umlCode))
-        const zippedCode = deflate.encode64(
-          deflate.zip_deflate(`@startuml\n${s}\n@enduml`, 9)
-        )
-        return `${serverAddress}/${zippedCode}`
-      }
-    })
-
-    // Ditaa support
-    this.md.use(require('markdown-it-plantuml'), {
-      openMarker: '@startditaa',
-      closeMarker: '@endditaa',
-      generateSource: function (umlCode) {
-        const stripTrailingSlash = (url) => url.endsWith('/') ? url.slice(0, -1) : url
-        // Currently PlantUML server doesn't support Ditaa in SVG, so we set the format as PNG at the moment.
-        const serverAddress = stripTrailingSlash(config.preview.plantUMLServerAddress) + '/png'
-        const s = unescape(encodeURIComponent(umlCode))
-        const zippedCode = deflate.encode64(
-          deflate.zip_deflate(`@startditaa\n${s}\n@endditaa`, 9)
-        )
-        return `${serverAddress}/${zippedCode}`
-      }
-    })
-
-    // Override task item
-    this.md.block.ruler.at('paragraph', function (state, startLine/*, endLine */) {
-      let content, terminate, i, l, token
-      let nextLine = startLine + 1
-      const terminatorRules = state.md.block.ruler.getRules('paragraph')
-      const endLine = state.lineMax
-
-      // jump line-by-line until empty one or EOF
-      for (; nextLine < endLine && !state.isEmpty(nextLine); nextLine++) {
-        // this would be a code block normally, but after paragraph
-        // it's considered a lazy continuation regardless of what's there
-        if (state.sCount[nextLine] - state.blkIndent > 3) { continue }
-
-        // quirk for blockquotes, this line should already be checked by that rule
-        if (state.sCount[nextLine] < 0) { continue }
-
-        // Some tags can terminate paragraph without empty line.
-        terminate = false
-        for (i = 0, l = terminatorRules.length; i < l; i++) {
-          if (terminatorRules[i](state, nextLine, endLine, true)) {
-            terminate = true
-            break
-          }
-        }
-        if (terminate) { break }
-      }
-
-      content = state.getLines(startLine, nextLine, state.blkIndent, false).trim()
-
-      state.line = nextLine
-
-      token = state.push('paragraph_open', 'p', 1)
-      token.map = [startLine, state.line]
-
-      if (state.parentType === 'list') {
-        const match = content.match(/^\[( |x)\] ?(.+)/i)
-        if (match) {
-          const liToken = lastFindInArray(state.tokens, token => token.type === 'list_item_open')
-          if (liToken) {
-            if (!liToken.attrs) {
-              liToken.attrs = []
-            }
-            if (config.preview.lineThroughCheckbox) {
-              liToken.attrs.push(['class', `taskListItem${match[1] !== ' ' ? ' checked' : ''}`])
-            } else {
-              liToken.attrs.push(['class', 'taskListItem'])
-            }
-          }
-          content = `<label class='taskListItem${match[1] !== ' ' ? ' checked' : ''}' for='checkbox-${startLine + 1}'><input type='checkbox'${match[1] !== ' ' ? ' checked' : ''} id='checkbox-${startLine + 1}'/> ${content.substring(4, content.length)}</label>`
-        }
-      }
-
-      token = state.push('inline', '', 0)
-      token.content = content
-      token.map = [startLine, state.line]
-      token.children = []
-
-      token = state.push('paragraph_close', 'p', -1)
-
-      return true
-    })
-
-    if (config.preview.smartArrows) {
-      this.md.use(smartArrows)
+    return '<pre class="code">' +
+      createGutter(str) +
+      '<code class="' + lang + '">' +
+      str +
+      '</code></pre>'
+  }
+})
+md.use(emoji, {
+  shortcuts: {}
+})
+md.use(math, {
+  inlineOpen: config.preview.latexInlineOpen,
+  inlineClose: config.preview.latexInlineClose,
+  blockOpen: config.preview.latexBlockOpen,
+  blockClose: config.preview.latexBlockClose,
+  inlineRenderer: function (str) {
+    let output = ''
+    try {
+      output = katex.renderToString(str.trim())
+    } catch (err) {
+      output = `<span class="katex-error">${err.message}</span>`
     }
-
-    // Add line number attribute for scrolling
-    const originalRender = this.md.renderer.render
-    this.md.renderer.render = (tokens, options, env) => {
-      tokens.forEach((token) => {
-        switch (token.type) {
-          case 'blockquote_open':
-          case 'dd_open':
-          case 'dt_open':
-          case 'heading_open':
-          case 'list_item_open':
-          case 'paragraph_open':
-          case 'table_open':
-            token.attrPush(['data-line', token.map[0]])
-        }
-      })
-      const result = originalRender.call(this.md.renderer, tokens, options, env)
-      return result
+    return output
+  },
+  blockRenderer: function (str) {
+    let output = ''
+    try {
+      output = katex.renderToString(str.trim(), { displayMode: true })
+    } catch (err) {
+      output = `<div class="katex-error">${err.message}</div>`
     }
-    // FIXME We should not depend on global variable.
-    window.md = this.md
+    return output
+  }
+})
+md.use(require('markdown-it-imsize'))
+md.use(require('markdown-it-footnote'))
+md.use(require('markdown-it-multimd-table'))
+md.use(require('markdown-it-named-headers'), {
+  slugify: (header) => {
+    return encodeURI(header.trim()
+      .replace(/[\]\[\!\"\#\$\%\&\'\(\)\*\+\,\.\/\:\;\<\=\>\?\@\\\^\_\{\|\}\~]/g, '')
+      .replace(/\s+/g, '-'))
+      .replace(/\-+$/, '')
+  }
+})
+md.use(require('markdown-it-kbd'))
+
+const deflate = require('markdown-it-plantuml/lib/deflate')
+md.use(require('markdown-it-plantuml'), '', {
+  generateSource: function (umlCode) {
+    const s = unescape(encodeURIComponent(umlCode))
+    const zippedCode = deflate.encode64(
+      deflate.zip_deflate(`@startuml\n${s}\n@enduml`, 9)
+    )
+    return `http://www.plantuml.com/plantuml/svg/${zippedCode}`
+  }
+})
+
+// Override task item
+md.block.ruler.at('paragraph', function (state, startLine/*, endLine */) {
+  let content, terminate, i, l, token
+  let nextLine = startLine + 1
+  const terminatorRules = state.md.block.ruler.getRules('paragraph')
+  const endLine = state.lineMax
+
+  // jump line-by-line until empty one or EOF
+  for (; nextLine < endLine && !state.isEmpty(nextLine); nextLine++) {
+    // this would be a code block normally, but after paragraph
+    // it's considered a lazy continuation regardless of what's there
+    if (state.sCount[nextLine] - state.blkIndent > 3) { continue }
+
+    // quirk for blockquotes, this line should already be checked by that rule
+    if (state.sCount[nextLine] < 0) { continue }
+
+    // Some tags can terminate paragraph without empty line.
+    terminate = false
+    for (i = 0, l = terminatorRules.length; i < l; i++) {
+      if (terminatorRules[i](state, nextLine, endLine, true)) {
+        terminate = true
+        break
+      }
+    }
+    if (terminate) { break }
   }
 
-  render (content) {
-    if (!_.isString(content)) content = ''
-    return this.md.render(content)
+  content = state.getLines(startLine, nextLine, state.blkIndent, false).trim()
+
+  state.line = nextLine
+
+  token = state.push('paragraph_open', 'p', 1)
+  token.map = [startLine, state.line]
+
+  if (state.parentType === 'list') {
+    const match = content.match(/^\[( |x)\] ?(.+)/i)
+    if (match) {
+      content = `<label class='taskListItem${match[1] !== ' ' ? ' checked' : ''}' for='checkbox-${startLine + 1}'><input type='checkbox'${match[1] !== ' ' ? ' checked' : ''} id='checkbox-${startLine + 1}'/> ${content.substring(4, content.length)}</label>`
+    }
   }
+
+  token = state.push('inline', '', 0)
+  token.content = content
+  token.map = [startLine, state.line]
+  token.children = []
+
+  token = state.push('paragraph_close', 'p', -1)
+
+  return true
+})
+
+// Add line number attribute for scrolling
+const originalRender = md.renderer.render
+md.renderer.render = function render (tokens, options, env) {
+  tokens.forEach((token) => {
+    switch (token.type) {
+      case 'heading_open':
+      case 'paragraph_open':
+      case 'blockquote_open':
+      case 'table_open':
+        token.attrPush(['data-line', token.map[0]])
+    }
+  })
+  const result = originalRender.call(md.renderer, tokens, options, env)
+  return result
+}
+// FIXME We should not depend on global variable.
+window.md = md
+
+function normalizeLinkText (linkText) {
+  return md.normalizeLinkText(linkText)
 }
 
-export default Markdown
+const markdown = {
+  render: function markdown (content) {
+    if (!_.isString(content)) content = ''
+    const renderedContent = md.render(content)
+    return renderedContent
+  },
+  normalizeLinkText
+}
+
+export default markdown

browser/lib/newNote.js

@@ -1,76 +0,0 @@
-import { hashHistory } from 'react-router'
-import dataApi from 'browser/main/lib/dataApi'
-import ee from 'browser/main/lib/eventEmitter'
-import AwsMobileAnalyticsConfig from 'browser/main/lib/AwsMobileAnalyticsConfig'
-
-export function createMarkdownNote (storage, folder, dispatch, location, params, config) {
-  AwsMobileAnalyticsConfig.recordDynamicCustomEvent('ADD_MARKDOWN')
-  AwsMobileAnalyticsConfig.recordDynamicCustomEvent('ADD_ALLNOTE')
-
-  let tags = []
-  if (config.ui.tagNewNoteWithFilteringTags && location.pathname.match(/\/tags/)) {
-    tags = params.tagname.split(' ')
-  }
-
-  return dataApi
-    .createNote(storage, {
-      type: 'MARKDOWN_NOTE',
-      folder: folder,
-      title: '',
-      tags,
-      content: ''
-    })
-    .then(note => {
-      const noteHash = note.key
-      dispatch({
-        type: 'UPDATE_NOTE',
-        note: note
-      })
-
-      hashHistory.push({
-        pathname: location.pathname,
-        query: { key: noteHash }
-      })
-      ee.emit('list:jump', noteHash)
-      ee.emit('detail:focus')
-    })
-}
-
-export function createSnippetNote (storage, folder, dispatch, location, params, config) {
-  AwsMobileAnalyticsConfig.recordDynamicCustomEvent('ADD_SNIPPET')
-  AwsMobileAnalyticsConfig.recordDynamicCustomEvent('ADD_ALLNOTE')
-
-  let tags = []
-  if (config.ui.tagNewNoteWithFilteringTags && location.pathname.match(/\/tags/)) {
-    tags = params.tagname.split(' ')
-  }
-
-  return dataApi
-    .createNote(storage, {
-      type: 'SNIPPET_NOTE',
-      folder: folder,
-      title: '',
-      tags,
-      description: '',
-      snippets: [
-        {
-          name: '',
-          mode: config.editor.snippetDefaultLanguage || 'text',
-          content: ''
-        }
-      ]
-    })
-    .then(note => {
-      const noteHash = note.key
-      dispatch({
-        type: 'UPDATE_NOTE',
-        note: note
-      })
-      hashHistory.push({
-        pathname: location.pathname,
-        query: { key: noteHash }
-      })
-      ee.emit('list:jump', noteHash)
-      ee.emit('detail:focus')
-    })
-}

browser/lib/normalizeEditorFontFamily.js

@@ -1,9 +0,0 @@
-import consts from 'browser/lib/consts'
-import isString from 'lodash/isString'
-
-export default function normalizeEditorFontFamily (fontFamily) {
-  const defaultEditorFontFamily = consts.DEFAULT_EDITOR_FONT_FAMILY
-  return isString(fontFamily) && fontFamily.length > 0
-    ? [fontFamily].concat(defaultEditorFontFamily).join(', ')
-    : defaultEditorFontFamily.join(', ')
-}

browser/lib/search.js

@@ -4,30 +4,39 @@ export default function searchFromNotes (notes, search) {
   if (search.trim().length === 0) return []
   const searchBlocks = search.split(' ').filter(block => { return block !== '' })
 
-  let foundNotes = notes
+  let foundNotes = findByWord(notes, searchBlocks[0])
   searchBlocks.forEach((block) => {
-    foundNotes = findByWordOrTag(foundNotes, block)
+    foundNotes = findByWord(foundNotes, block)
+    if (block.match(/^#.+/)) {
+      foundNotes = foundNotes.concat(findByTag(notes, block))
+    }
   })
   return foundNotes
 }
 
-function findByWordOrTag (notes, block) {
-  let tag = block
-  if (tag.match(/^#.+/)) {
-    tag = tag.match(/#(.+)/)[1]
-  }
-  const tagRegExp = new RegExp(_.escapeRegExp(tag), 'i')
-  const wordRegExp = new RegExp(_.escapeRegExp(block), 'i')
+function findByTag (notes, block) {
+  const tag = block.match(/#(.+)/)[1]
+  const regExp = new RegExp(_.escapeRegExp(tag), 'i')
   return notes.filter((note) => {
-    if (_.isArray(note.tags) && note.tags.some((_tag) => _tag.match(tagRegExp))) {
+    if (!_.isArray(note.tags)) return false
+    return note.tags.some((_tag) => {
+      return _tag.match(regExp)
+    })
+  })
+}
+
+function findByWord (notes, block) {
+  const regExp = new RegExp(_.escapeRegExp(block), 'i')
+  return notes.filter((note) => {
+    if (_.isArray(note.tags) && note.tags.some((_tag) => {
+      return _tag.match(regExp)
+    })) {
       return true
     }
     if (note.type === 'SNIPPET_NOTE') {
-      return note.description.match(wordRegExp) || note.snippets.some((snippet) => {
-        return snippet.name.match(wordRegExp) || snippet.content.match(wordRegExp)
-      })
+      return note.description.match(regExp)
     } else if (note.type === 'MARKDOWN_NOTE') {
-      return note.content.match(wordRegExp)
+      return note.content.match(regExp)
     }
     return false
   })

browser/lib/spellcheck.js

@@ -1,232 +0,0 @@
-import styles from '../components/CodeEditor.styl'
-import i18n from 'browser/lib/i18n'
-
-const Typo = require('typo-js')
-const _ = require('lodash')
-
-const CSS_ERROR_CLASS = 'codeEditor-typo'
-const SPELLCHECK_DISABLED = 'NONE'
-const DICTIONARY_PATH = '../dictionaries'
-const MILLISECONDS_TILL_LIVECHECK = 500
-
-let dictionary = null
-let self
-
-function getAvailableDictionaries () {
-  return [
-    {label: i18n.__('Disabled'), value: SPELLCHECK_DISABLED},
-    {label: i18n.__('English'), value: 'en_GB'},
-    {label: i18n.__('German'), value: 'de_DE'},
-    {label: i18n.__('French'), value: 'fr_FR'}
-  ]
-}
-
-/**
- * Only to be used in the tests :)
- */
-function setDictionaryForTestsOnly (newDictionary) {
-  dictionary = newDictionary
-}
-
-/**
- * @description Initializes the spellcheck. It removes all existing marks of the current editor.
- * If a language was given (i.e. lang !== this.SPELLCHECK_DISABLED) it will load the stated dictionary and use it to check the whole document.
- * @param {Codemirror} editor CodeMirror-Editor
- * @param {String} lang on of the values from getAvailableDictionaries()-Method
- */
-function setLanguage (editor, lang) {
-  self = this
-  dictionary = null
-
-  if (editor == null) {
-    return
-  }
-
-  const existingMarks = editor.getAllMarks() || []
-  for (const mark of existingMarks) {
-    mark.clear()
-  }
-  if (lang !== SPELLCHECK_DISABLED) {
-    dictionary = new Typo(lang, false, false, {
-      dictionaryPath: DICTIONARY_PATH,
-      asyncLoad: true,
-      loadedCallback: () =>
-        checkWholeDocument(editor)
-    })
-  }
-}
-
-/**
- * Checks the whole content of the editor for typos
- * @param {Codemirror} editor CodeMirror-Editor
- */
-function checkWholeDocument (editor) {
-  const lastLine = editor.lineCount() - 1
-  const textOfLastLine = editor.getLine(lastLine) || ''
-  const lastChar = textOfLastLine.length
-  const from = {line: 0, ch: 0}
-  const to = {line: lastLine, ch: lastChar}
-  checkMultiLineRange(editor, from, to)
-}
-
-/**
- * Checks the given range for typos
- * @param {Codemirror} editor CodeMirror-Editor
- * @param {line, ch} from starting position of the spellcheck
- * @param {line, ch} to end position of the spellcheck
- */
-function checkMultiLineRange (editor, from, to) {
-  function sortRange (pos1, pos2) {
-    if (pos1.line > pos2.line || (pos1.line === pos2.line && pos1.ch > pos2.ch)) {
-      return {from: pos2, to: pos1}
-    }
-    return {from: pos1, to: pos2}
-  }
-
-  const {from: smallerPos, to: higherPos} = sortRange(from, to)
-  for (let l = smallerPos.line; l <= higherPos.line; l++) {
-    const line = editor.getLine(l) || ''
-    let w = 0
-    if (l === smallerPos.line) {
-      w = smallerPos.ch
-    }
-    let wEnd = line.length
-    if (l === higherPos.line) {
-      wEnd = higherPos.ch
-    }
-    while (w <= wEnd) {
-      const wordRange = editor.findWordAt({line: l, ch: w})
-      self.checkWord(editor, wordRange)
-      w += (wordRange.head.ch - wordRange.anchor.ch) + 1
-    }
-  }
-}
-
-/**
- * @description Checks whether a certain range of characters in the editor (i.e. a word) contains a typo.
- * If so the ranged will be marked with the class CSS_ERROR_CLASS.
- * Note: Due to performance considerations, only words with more then 3 signs are checked.
- * @param {Codemirror} editor CodeMirror-Editor
- * @param wordRange Object specifying the range that should be checked.
- * Having the following structure: <code>{anchor: {line: integer, ch: integer}, head: {line: integer, ch: integer}}</code>
- */
-function checkWord (editor, wordRange) {
-  const word = editor.getRange(wordRange.anchor, wordRange.head)
-  if (word == null || word.length <= 3) {
-    return
-  }
-  if (!dictionary.check(word)) {
-    editor.markText(wordRange.anchor, wordRange.head, {className: styles[CSS_ERROR_CLASS]})
-  }
-}
-
-/**
- * Checks the changes recently made (aka live check)
- * @param {Codemirror} editor CodeMirror-Editor
- * @param fromChangeObject codeMirror changeObject describing the start of the editing
- * @param toChangeObject codeMirror changeObject describing the end of the editing
- */
-function checkChangeRange (editor, fromChangeObject, toChangeObject) {
-  /**
-   * Calculate the smallest respectively largest position as a start, resp. end, position and return it
-   * @param start CodeMirror change object
-   * @param end CodeMirror change object
-   * @returns {{start: {line: *, ch: *}, end: {line: *, ch: *}}}
-   */
-  function getStartAndEnd (start, end) {
-    const possiblePositions = [start.from, start.to, end.from, end.to]
-    let smallest = start.from
-    let biggest = end.to
-    for (const currentPos of possiblePositions) {
-      if (currentPos.line < smallest.line || (currentPos.line === smallest.line && currentPos.ch < smallest.ch)) {
-        smallest = currentPos
-      }
-      if (currentPos.line > biggest.line || (currentPos.line === biggest.line && currentPos.ch > biggest.ch)) {
-        biggest = currentPos
-      }
-    }
-    return {start: smallest, end: biggest}
-  }
-
-  if (dictionary === null || editor == null) { return }
-
-  try {
-    const {start, end} = getStartAndEnd(fromChangeObject, toChangeObject)
-
-    // Expand the range to include words after/before whitespaces
-    start.ch = Math.max(start.ch - 1, 0)
-    end.ch = end.ch + 1
-
-    // clean existing marks
-    const existingMarks = editor.findMarks(start, end) || []
-    for (const mark of existingMarks) {
-      mark.clear()
-    }
-
-    self.checkMultiLineRange(editor, start, end)
-  } catch (e) {
-    console.info('Error during the spell check. It might be due to problems figuring out the range of the new text..', e)
-  }
-}
-
-function saveLiveSpellCheckFrom (changeObject) {
-  liveSpellCheckFrom = changeObject
-}
-let liveSpellCheckFrom
-const debouncedSpellCheckLeading = _.debounce(saveLiveSpellCheckFrom, MILLISECONDS_TILL_LIVECHECK, {
-  'leading': true,
-  'trailing': false
-})
-const debouncedSpellCheck = _.debounce(checkChangeRange, MILLISECONDS_TILL_LIVECHECK, {
-  'leading': false,
-  'trailing': true
-})
-
-/**
- * Handles a keystroke. Buffers the input and performs a live spell check after a certain time. Uses _debounce from lodash to buffer the input
- * @param {Codemirror} editor CodeMirror-Editor
- * @param changeObject codeMirror changeObject
- */
-function handleChange (editor, changeObject) {
-  if (dictionary === null) {
-    return
-  }
-  debouncedSpellCheckLeading(changeObject)
-  debouncedSpellCheck(editor, liveSpellCheckFrom, changeObject)
-}
-
-/**
- * Returns an array of spelling suggestions for the given (wrong written) word.
- * Returns an empty array if the dictionary is null (=> spellcheck is disabled) or the given word was null
- * @param word word to be checked
- * @returns {String[]} Array of suggestions
- */
-function getSpellingSuggestion (word) {
-  if (dictionary == null || word == null) {
-    return []
-  }
-  return dictionary.suggest(word)
-}
-
-/**
- * Returns the name of the CSS class used for errors
- */
-function getCSSClassName () {
-  return styles[CSS_ERROR_CLASS]
-}
-
-module.exports = {
-  DICTIONARY_PATH,
-  CSS_ERROR_CLASS,
-  SPELLCHECK_DISABLED,
-  getAvailableDictionaries,
-  setLanguage,
-  checkChangeRange,
-  handleChange,
-  getSpellingSuggestion,
-  checkWord,
-  checkMultiLineRange,
-  checkWholeDocument,
-  setDictionaryForTestsOnly,
-  getCSSClassName
-}

browser/lib/utils.js

@@ -1,139 +0,0 @@
-export function lastFindInArray (array, callback) {
-  for (let i = array.length - 1; i >= 0; --i) {
-    if (callback(array[i], i, array)) {
-      return array[i]
-    }
-  }
-}
-
-export function escapeHtmlCharacters (
-  html,
-  opt = { detectCodeBlock: false, skipSingleQuote: false }
-) {
-  const matchHtmlRegExp = /["'&<>]/g
-  const matchCodeBlockRegExp = /```/g
-  const escapes = ['&quot;', '&amp;', '&#39;', '&lt;', '&gt;']
-  let match = null
-  const replaceAt = (str, index, replace) =>
-    str.substr(0, index) +
-    replace +
-    str.substr(index + replace.length - (replace.length - 1))
-
-  while ((match = matchHtmlRegExp.exec(html)) !== null) {
-    const current = { char: match[0], index: match.index }
-    const codeBlockIndexs = []
-    let openCodeBlock = null
-    // if the detectCodeBlock option is activated then this function should skip
-    // characters that needed to be escape but located in code block
-    if (opt.detectCodeBlock) {
-      // The first type of code block is lines that start with 4 spaces
-      // Here we check for the \n character located before the character that
-      // needed to be escape. It means we check for the begining of the line that
-      // contain that character, then we check if there are 4 spaces next to the
-      // \n character (the line start with 4 spaces)
-      let previousLineEnd = current.index - 1
-      while (html[previousLineEnd] !== '\n' && previousLineEnd !== -1) {
-        previousLineEnd--
-      }
-      // 4 spaces means this character is in a code block
-      if (
-        html[previousLineEnd + 1] === ' ' &&
-        html[previousLineEnd + 2] === ' ' &&
-        html[previousLineEnd + 3] === ' ' &&
-        html[previousLineEnd + 4] === ' '
-      ) {
-        // skip the current character
-        continue
-      }
-      // The second type of code block is lines that wrapped in ```
-      // We will get the position of each ```
-      // then push it into an array
-      // then the array returned will be like this:
-      // [startCodeblock, endCodeBlock, startCodeBlock, endCodeBlock]
-      while ((openCodeBlock = matchCodeBlockRegExp.exec(html)) !== null) {
-        codeBlockIndexs.push(openCodeBlock.index)
-      }
-      let shouldSkipChar = false
-      // we loop through the array of positions
-      // we skip 2 element as the i index position is the position of ``` that
-      // open the codeblock and the i + 1 is the position of the ``` that close
-      // the code block
-      for (let i = 0; i < codeBlockIndexs.length; i += 2) {
-        // the i index position is the position of the ``` that open code block
-        // so we have to + 2 as that position is the position of the first ` in the ````
-        // but we need to make sure that the position current character is larger
-        // that the last ` in the ``` that open the code block so we have to take
-        // the position of the first ` and + 2
-        // the i + 1 index position is the closing ``` so the char must less than it
-        if (
-          current.index > codeBlockIndexs[i] + 2 &&
-          current.index < codeBlockIndexs[i + 1]
-        ) {
-          // skip it
-          shouldSkipChar = true
-          break
-        }
-      }
-      if (shouldSkipChar) {
-        // skip the current character
-        continue
-      }
-    }
-    // otherwise, escape it !!!
-    if (current.char === '&') {
-      // when escaping character & we have to be becareful as the & could be a part
-      // of an escaped character like &quot; will be came &amp;quot;
-      let nextStr = ''
-      let nextIndex = current.index
-      let escapedStr = false
-      // maximum length of an escaped string is 5. For example ('&quot;')
-      // we take the next 5 character of the next string if it is one of the string:
-      // ['&quot;', '&amp;', '&#39;', '&lt;', '&gt;'] then we will not escape the & character
-      // as it is a part of the escaped string and should not be escaped
-      while (nextStr.length <= 5) {
-        nextStr += html[nextIndex]
-        nextIndex++
-        if (escapes.indexOf(nextStr) !== -1) {
-          escapedStr = true
-          break
-        }
-      }
-      if (!escapedStr) {
-        // this & char is not a part of an escaped string
-        html = replaceAt(html, current.index, '&amp;')
-      }
-    } else if (current.char === '"') {
-      html = replaceAt(html, current.index, '&quot;')
-    } else if (current.char === "'" && !opt.skipSingleQuote) {
-      html = replaceAt(html, current.index, '&#39;')
-    } else if (current.char === '<') {
-      html = replaceAt(html, current.index, '&lt;')
-    } else if (current.char === '>') {
-      html = replaceAt(html, current.index, '&gt;')
-    }
-  }
-  return html
-}
-
-export function isObjectEqual (a, b) {
-  const aProps = Object.getOwnPropertyNames(a)
-  const bProps = Object.getOwnPropertyNames(b)
-
-  if (aProps.length !== bProps.length) {
-    return false
-  }
-
-  for (var i = 0; i < aProps.length; i++) {
-    const propName = aProps[i]
-    if (a[propName] !== b[propName]) {
-      return false
-    }
-  }
-  return true
-}
-
-export default {
-  lastFindInArray,
-  escapeHtmlCharacters,
-  isObjectEqual
-}

browser/main/Detail/Detail.styl

@@ -23,24 +23,10 @@ body[data-theme="dark"]
     border-left 1px solid $ui-dark-borderColor
   .empty-message
     color $ui-dark-inactive-text-color
-
+    
 body[data-theme="solarized-dark"]
   .root
     background-color $ui-solarized-dark-noteDetail-backgroundColor
     border-left 1px solid $ui-solarized-dark-borderColor
   .empty-message
     color $ui-solarized-dark-text-color
-
-body[data-theme="monokai"]
-  .root
-    background-color $ui-monokai-noteDetail-backgroundColor
-    border-left 1px solid $ui-monokai-borderColor
-  .empty-message
-    color $ui-monokai-text-color
-
-body[data-theme="dracula"]
-  .root
-    background-color $ui-dracula-noteDetail-backgroundColor
-    border-left 1px solid $ui-dracula-borderColor
-  .empty-message
-    color $ui-dracula-text-color

browser/main/Detail/FolderSelect.js

@@ -3,7 +3,6 @@ import React from 'react'
 import CSSModules from 'browser/lib/CSSModules'
 import styles from './FolderSelect.styl'
 import _ from 'lodash'
-import i18n from 'browser/lib/i18n'
 
 class FolderSelect extends React.Component {
   constructor (props) {
@@ -250,7 +249,7 @@ class FolderSelect extends React.Component {
             <input styleName='search-input'
               ref='search'
               value={this.state.search}
-              placeholder={i18n.__('Folder...')}
+              placeholder='Folder...'
               onChange={(e) => this.handleSearchInputChange(e)}
               onBlur={(e) => this.handleSearchInputBlur(e)}
               onKeyDown={(e) => this.handleSearchInputKeyDown(e)}

browser/main/Detail/FolderSelect.styl

@@ -36,7 +36,7 @@
   height 34px
   width 20px
   line-height 34px
-
+  
 .search-input
   vertical-align middle
   position relative
@@ -71,7 +71,7 @@
   overflow ellipsis
   cursor pointer
   &:hover
-    background-color $ui-button--hover-backgroundColor
+    background-color $ui-button--hover-backgroundColor 
 
 .search-optionList-item--active
   @extend .search-optionList-item
@@ -133,55 +133,3 @@ body[data-theme="dark"]
       color $ui-dark-button--active-color
   .search-optionList-item-name-surfix
     color $ui-dark-inactive-text-color
-
-body[data-theme="monokai"]
- .root
-    color $ui-dark-text-color
-    &:hover
-      color white
-      background-color $ui-monokai-button--hover-backgroundColor
-      border-color $ui-monokai-borderColor
-
-  .search-optionList
-    color white
-    border-color $ui-monokai-borderColor
-    background-color $ui-monokai-button-backgroundColor
-
-  .search-optionList-item
-    &:hover
-      background-color lighten($ui-monokai-button--hover-backgroundColor, 15%)
-
-  .search-optionList-item--active
-    background-color $ui-monokai-button--active-backgroundColor
-    color $ui-monokai-button--active-color
-    &:hover
-      background-color $ui-monokai-button--active-backgroundColor
-      color $ui-monokai-button--active-color
-  .search-optionList-item-name-surfix
-    color $ui-monokai-inactive-text-color
-
-body[data-theme="dracula"]
- .root
-    color $ui-dracula-text-color
-    &:hover
-      color #f8f8f2
-      background-color $ui-dark-button--hover-backgroundColor
-      border-color $ui-dracula-borderColor
-
-  .search-optionList
-    color #f8f8f2
-    border-color $ui-dracula-borderColor
-    background-color $ui-dracula-button-backgroundColor
-
-  .search-optionList-item
-    &:hover
-      background-color lighten($ui-dracula-button--hover-backgroundColor, 15%)
-
-  .search-optionList-item--active
-    background-color $ui-dracula-button--active-backgroundColor
-    color $ui-dracula-button--active-color
-    &:hover
-      background-color $ui-dark-button--hover-backgroundColor
-      color $ui-dracula-button--active-color
-  .search-optionList-item-name-surfix
-    color $ui-dracula-inactive-text-color

browser/main/Detail/FullscreenButton.js

@@ -2,16 +2,13 @@ import PropTypes from 'prop-types'
 import React from 'react'
 import CSSModules from 'browser/lib/CSSModules'
 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)}>
+  <button styleName='control-fullScreenButton' title='Fullscreen' onMouseDown={(e) => onClick(e)}>
     <img styleName='iconInfo' src='../resources/icon/icon-full.svg' />
-    <span styleName='tooltip'>{i18n.__('Fullscreen')}({hotkey})</span>
+    <span styleName='tooltip'>Fullscreen</span>
   </button>
 )
 

browser/main/Detail/InfoButton.js

@@ -2,7 +2,6 @@ import PropTypes from 'prop-types'
 import React from 'react'
 import CSSModules from 'browser/lib/CSSModules'
 import styles from './InfoButton.styl'
-import i18n from 'browser/lib/i18n'
 
 const InfoButton = ({
   onClick
@@ -11,7 +10,7 @@ const InfoButton = ({
     onClick={(e) => onClick(e)}
   >
     <img className='infoButton' src='../resources/icon/icon-info.svg' />
-    <span styleName='tooltip'>{i18n.__('Info')}</span>
+    <span styleName='tooltip'>Info</span>
   </button>
 )
 

browser/main/Detail/InfoPanel.js

@@ -3,7 +3,6 @@ import React from 'react'
 import CSSModules from 'browser/lib/CSSModules'
 import styles from './InfoPanel.styl'
 import copy from 'copy-to-clipboard'
-import i18n from 'browser/lib/i18n'
 
 class InfoPanel extends React.Component {
   copyNoteLink () {
@@ -20,7 +19,7 @@ class InfoPanel extends React.Component {
       <div className='infoPanel' styleName='control-infoButton-panel' style={{display: 'none'}}>
         <div>
           <p styleName='modification-date'>{updatedAt}</p>
-          <p styleName='modification-date-desc'>{i18n.__('MODIFICATION DATE')}</p>
+          <p styleName='modification-date-desc'>MODIFICATION DATE</p>
         </div>
 
         <hr />
@@ -30,11 +29,11 @@ class InfoPanel extends React.Component {
           : <div styleName='count-wrap'>
             <div styleName='count-number'>
               <p styleName='infoPanel-defaul-count'>{wordCount}</p>
-              <p styleName='infoPanel-sub-count'>{i18n.__('Words')}</p>
+              <p styleName='infoPanel-sub-count'>Words</p>
             </div>
             <div styleName='count-number'>
               <p styleName='infoPanel-defaul-count'>{letterCount}</p>
-              <p styleName='infoPanel-sub-count'>{i18n.__('Letters')}</p>
+              <p styleName='infoPanel-sub-count'>Letters</p>
             </div>
           </div>
         }
@@ -46,17 +45,17 @@ class InfoPanel extends React.Component {
 
         <div>
           <p styleName='infoPanel-default'>{storageName}</p>
-          <p styleName='infoPanel-sub'>{i18n.__('STORAGE')}</p>
+          <p styleName='infoPanel-sub'>STORAGE</p>
         </div>
 
         <div>
           <p styleName='infoPanel-default'>{folderName}</p>
-          <p styleName='infoPanel-sub'>{i18n.__('FOLDER')}</p>
+          <p styleName='infoPanel-sub'>FOLDER</p>
         </div>
 
         <div>
           <p styleName='infoPanel-default'>{createdAt}</p>
-          <p styleName='infoPanel-sub'>{i18n.__('CREATION DATE')}</p>
+          <p styleName='infoPanel-sub'>CREATION DATE</p>
         </div>
 
         <div>
@@ -64,30 +63,30 @@ class InfoPanel extends React.Component {
           <button onClick={() => this.copyNoteLink()} styleName='infoPanel-copyButton'>
             <i className='fa fa-clipboard' />
           </button>
-          <p styleName='infoPanel-sub'>{i18n.__('NOTE LINK')}</p>
+          <p styleName='infoPanel-sub'>NOTE LINK</p>
         </div>
 
         <hr />
 
         <div id='export-wrap'>
-          <button styleName='export--enable' onClick={(e) => exportAsMd(e, 'export-md')}>
+          <button styleName='export--enable' onClick={(e) => exportAsMd(e)}>
             <i className='fa fa-file-code-o' />
-            <p>{i18n.__('.md')}</p>
+            <p>.md</p>
           </button>
 
-          <button styleName='export--enable' onClick={(e) => exportAsTxt(e, 'export-txt')}>
+          <button styleName='export--enable' onClick={(e) => exportAsTxt(e)}>
             <i className='fa fa-file-text-o' />
-            <p>{i18n.__('.txt')}</p>
+            <p>.txt</p>
           </button>
 
-          <button styleName='export--enable' onClick={(e) => exportAsHtml(e, 'export-html')}>
+          <button styleName='export--enable' onClick={(e) => exportAsHtml(e)}>
             <i className='fa fa-html5' />
-            <p>{i18n.__('.html')}</p>
+            <p>.html</p>
           </button>
 
-          <button styleName='export--enable' onClick={(e) => print(e, 'print')}>
+          <button styleName='export--enable' onClick={(e) => print(e)}>
             <i className='fa fa-print' />
-            <p>{i18n.__('Print')}</p>
+            <p>Print</p>
           </button>
         </div>
       </div>

browser/main/Detail/InfoPanel.styl

@@ -11,7 +11,6 @@
 .control-infoButton-panel
   z-index 200
   margin-top 0px
-  top: 50px
   right 25px
   position absolute
   padding 20px 25px 0 25px
@@ -33,7 +32,6 @@
 .control-infoButton-panel-trash
   z-index 200
   margin-top 0px
-  top 50px
   right 0px
   position absolute
   padding 20px 25px 0 25px
@@ -217,83 +215,3 @@ body[data-theme="solarized-dark"]
       color $ui-dark-inactive-text-color
       &:hover
         color $ui-solarized-ark-text-color
-
-body[data-theme="monokai"]
-  .control-infoButton-panel
-    background-color $ui-monokai-noteList-backgroundColor
-
-  .control-infoButton-panel-trash
-    background-color $ui-monokai-noteList-backgroundColor
-
-  .modification-date
-    color $ui-monokai-text-color
-
-  .modification-date-desc
-    color $ui-inactive-text-color
-
-  .infoPanel-defaul-count
-    color $ui-monokai-text-color
-
-  .infoPanel-sub-count
-    color $ui-inactive-text-color
-
-  .infoPanel-default
-    color $ui-monokai-text-color
-
-  .infoPanel-sub
-    color $ui-inactive-text-color
-
-  .infoPanel-noteLink
-    background-color alpha($ui-monokai-borderColor, 20%)
-    color $ui-monokai-text-color
-
-  [id=export-wrap]
-    button
-      color $ui-dark-inactive-text-color
-      &:hover
-        background-color alpha($ui-monokai-borderColor, 20%)
-        color $ui-monokai-text-color
-    p
-      color $ui-dark-inactive-text-color
-      &:hover
-        color $ui-monokai-text-color
-
-body[data-theme="dracula"]
-  .control-infoButton-panel
-    background-color $ui-dracula-noteList-backgroundColor
-
-  .control-infoButton-panel-trash
-    background-color $ui-dracula-noteList-backgroundColor
-
-  .modification-date
-    color $ui-dracula-text-color
-
-  .modification-date-desc
-    color $ui-inactive-text-color
-
-  .infoPanel-defaul-count
-    color $ui-dracula-text-color
-
-  .infoPanel-sub-count
-    color $ui-inactive-text-color
-
-  .infoPanel-default
-    color $ui-dracula-text-color
-
-  .infoPanel-sub
-    color $ui-inactive-text-color
-
-  .infoPanel-noteLink
-    background-color alpha($ui-dracula-borderColor, 20%)
-    color $ui-dracula-text-color
-
-  [id=export-wrap]
-    button
-      color $ui-dark-inactive-text-color
-      &:hover
-        background-color alpha($ui-dracula-borderColor, 20%)
-        color $ui-dracula-text-color
-    p
-      color $ui-dark-inactive-text-color
-      &:hover
-        color $ui-dracula-text-color

browser/main/Detail/InfoPanelTrashed.js

@@ -2,7 +2,6 @@ import PropTypes from 'prop-types'
 import React from 'react'
 import CSSModules from 'browser/lib/CSSModules'
 import styles from './InfoPanel.styl'
-import i18n from 'browser/lib/i18n'
 
 const InfoPanelTrashed = ({
   storageName, folderName, updatedAt, createdAt, exportAsMd, exportAsTxt, exportAsHtml
@@ -10,38 +9,38 @@ const InfoPanelTrashed = ({
   <div className='infoPanel' styleName='control-infoButton-panel-trash' style={{display: 'none'}}>
     <div>
       <p styleName='modification-date'>{updatedAt}</p>
-      <p styleName='modification-date-desc'>{i18n.__('MODIFICATION DATE')}</p>
+      <p styleName='modification-date-desc'>MODIFICATION DATE</p>
     </div>
 
     <hr />
 
     <div>
       <p styleName='infoPanel-default'>{storageName}</p>
-      <p styleName='infoPanel-sub'>{i18n.__('STORAGE')}</p>
+      <p styleName='infoPanel-sub'>STORAGE</p>
     </div>
 
     <div>
       <p styleName='infoPanel-default'><text styleName='infoPanel-trash'>Trash</text>{folderName}</p>
-      <p styleName='infoPanel-sub'>{i18n.__('FOLDER')}</p>
+      <p styleName='infoPanel-sub'>FOLDER</p>
     </div>
 
     <div>
       <p styleName='infoPanel-default'>{createdAt}</p>
-      <p styleName='infoPanel-sub'>{i18n.__('CREATION DATE')}</p>
+      <p styleName='infoPanel-sub'>CREATION DATE</p>
     </div>
 
     <div id='export-wrap'>
-      <button styleName='export--enable' onClick={(e) => exportAsMd(e, 'export-md')}>
+      <button styleName='export--enable' onClick={(e) => exportAsMd(e)}>
         <i className='fa fa-file-code-o' />
         <p>.md</p>
       </button>
 
-      <button styleName='export--enable' onClick={(e) => exportAsTxt(e, 'export-txt')}>
+      <button styleName='export--enable' onClick={(e) => exportAsTxt(e)}>
         <i className='fa fa-file-text-o' />
         <p>.txt</p>
       </button>
 
-      <button styleName='export--enable' onClick={(e) => exportAsHtml(e, 'export-html')}>
+      <button styleName='export--enable' onClick={(e) => exportAsHtml(e)}>
         <i className='fa fa-html5' />
         <p>.html</p>
       </button>

browser/main/Detail/MarkdownNoteDetail.js

@@ -19,7 +19,6 @@ import AwsMobileAnalyticsConfig from 'browser/main/lib/AwsMobileAnalyticsConfig'
 import ConfigManager from 'browser/main/lib/ConfigManager'
 import TrashButton from './TrashButton'
 import FullscreenButton from './FullscreenButton'
-import RestoreButton from './RestoreButton'
 import PermanentDeleteButton from './PermanentDeleteButton'
 import InfoButton from './InfoButton'
 import ToggleModeButton from './ToggleModeButton'
@@ -28,8 +27,6 @@ import InfoPanelTrashed from './InfoPanelTrashed'
 import { formatDate } from 'browser/lib/date-formatter'
 import { getTodoPercentageOfCompleted } from 'browser/lib/getTodoStatus'
 import striptags from 'striptags'
-import { confirmDeleteNote } from 'browser/lib/confirmDeleteNote'
-import markdownToc from 'browser/lib/markdown-toc-generator'
 
 class MarkdownNoteDetail extends React.Component {
   constructor (props) {
@@ -48,7 +45,6 @@ class MarkdownNoteDetail extends React.Component {
     this.dispatchTimer = null
 
     this.toggleLockButton = this.handleToggleLockButton.bind(this)
-    this.generateToc = () => this.handleGenerateToc()
   }
 
   focus () {
@@ -57,18 +53,10 @@ class MarkdownNoteDetail extends React.Component {
 
   componentDidMount () {
     ee.on('topbar:togglelockbutton', this.toggleLockButton)
-    ee.on('topbar:togglemodebutton', () => {
-      const reversedType = this.state.editorType === 'SPLIT' ? 'EDITOR_PREVIEW' : 'SPLIT'
-      this.handleSwitchMode(reversedType)
-    })
-    ee.on('hotkey:deletenote', this.handleDeleteNote.bind(this))
-    ee.on('code:generate-toc', this.generateToc)
   }
 
   componentWillReceiveProps (nextProps) {
-    const isNewNote = nextProps.note.key !== this.props.note.key
-    const hasDeletedTags = nextProps.note.tags.length < this.props.note.tags.length
-    if (!this.state.isMovingNote && (isNewNote || hasDeletedTags)) {
+    if (nextProps.note.key !== this.props.note.key && !this.isMovingNote) {
       if (this.saveQueue != null) this.saveNow()
       this.setState({
         note: Object.assign({}, nextProps.note)
@@ -80,11 +68,13 @@ class MarkdownNoteDetail extends React.Component {
   }
 
   componentWillUnmount () {
-    ee.off('topbar:togglelockbutton', this.toggleLockButton)
-    ee.off('code:generate-toc', this.generateToc)
     if (this.saveQueue != null) this.saveNow()
   }
 
+  componentDidUnmount () {
+    ee.off('topbar:togglelockbutton', this.toggleLockButton)
+  }
+
   handleUpdateTag () {
     const { note } = this.state
     if (this.refs.tags) note.tags = this.refs.tags.value
@@ -94,7 +84,7 @@ class MarkdownNoteDetail extends React.Component {
   handleUpdateContent () {
     const { note } = this.state
     note.content = this.refs.content.value
-    note.title = markdown.strip(striptags(findNoteTitle(note.content, this.props.config.editor.enableFrontMatterTitle, this.props.config.editor.frontMatterTitleField)))
+    note.title = markdown.strip(striptags(findNoteTitle(note.content)))
     this.updateNote(note)
   }
 
@@ -151,7 +141,7 @@ class MarkdownNoteDetail extends React.Component {
           hashHistory.replace({
             pathname: location.pathname,
             query: {
-              key: newNote.key
+              key: newNote.storage + '-' + newNote.key
             }
           })
           this.setState({
@@ -190,43 +180,13 @@ class MarkdownNoteDetail extends React.Component {
     ee.emit('export:save-html')
   }
 
-  handleKeyDown (e) {
-    switch (e.keyCode) {
-      // tab key
-      case 9:
-        if (e.ctrlKey && !e.shiftKey) {
-          e.preventDefault()
-          this.jumpNextTab()
-        } else if (e.ctrlKey && e.shiftKey) {
-          e.preventDefault()
-          this.jumpPrevTab()
-        } else if (!e.ctrlKey && !e.shiftKey && e.target === this.refs.description) {
-          e.preventDefault()
-          this.focusEditor()
-        }
-        break
-      // I key
-      case 73:
-        {
-          const isSuper = global.process.platform === 'darwin'
-            ? e.metaKey
-            : e.ctrlKey
-          if (isSuper) {
-            e.preventDefault()
-            this.handleInfoButtonClick(e)
-          }
-        }
-        break
-    }
-  }
-
   handleTrashButtonClick (e) {
     const { note } = this.state
     const { isTrashed } = note
-    const { confirmDeletion } = this.props.config.ui
+    const { confirmDeletion } = this.props
 
     if (isTrashed) {
-      if (confirmDeleteNote(confirmDeletion, true)) {
+      if (confirmDeletion(true)) {
         const {note, dispatch} = this.props
         dataApi
           .deleteNote(note.storage, note.key)
@@ -238,12 +198,11 @@ class MarkdownNoteDetail extends React.Component {
                 noteKey: data.noteKey
               })
             }
-            ee.once('list:next', dispatchHandler)
+            ee.once('list:moved', dispatchHandler)
           })
-          .then(() => ee.emit('list:next'))
       }
     } else {
-      if (confirmDeleteNote(confirmDeletion, false)) {
+      if (confirmDeletion()) {
         note.isTrashed = true
 
         this.setState({
@@ -299,11 +258,6 @@ class MarkdownNoteDetail extends React.Component {
     }
   }
 
-  handleGenerateToc () {
-    const editor = this.refs.content.refs.code.editor
-    markdownToc.generateInEditor(editor)
-  }
-
   handleFocus (e) {
     this.focus()
   }
@@ -319,40 +273,15 @@ class MarkdownNoteDetail extends React.Component {
 
   handleSwitchMode (type) {
     this.setState({ editorType: type }, () => {
-      this.focus()
       const newConfig = Object.assign({}, this.props.config)
       newConfig.editor.type = type
       ConfigManager.set(newConfig)
     })
   }
 
-  handleDeleteNote () {
-    this.handleTrashButtonClick()
-  }
-
-  handleClearTodo () {
-    const { note } = this.state
-    const splitted = note.content.split('\n')
-
-    const clearTodoContent = splitted.map((line) => {
-      const trimmedLine = line.trim()
-      if (trimmedLine.match(/\[x\]/i)) {
-        return line.replace(/\[x\]/i, '[ ]')
-      } else {
-        return line
-      }
-    }).join('\n')
-
-    note.content = clearTodoContent
-    this.refs.content.setValue(note.content)
-
-    this.updateNote(note)
-  }
-
   renderEditor () {
     const { config, ignorePreviewPointerEvents } = this.props
     const { note } = this.state
-
     if (this.state.editorType === 'EDITOR_PREVIEW') {
       return <MarkdownEditor
         ref='content'
@@ -360,7 +289,6 @@ class MarkdownNoteDetail extends React.Component {
         config={config}
         value={note.content}
         storageKey={note.storage}
-        noteKey={note.key}
         onChange={this.handleUpdateContent.bind(this)}
         ignorePreviewPointerEvents={ignorePreviewPointerEvents}
       />
@@ -370,7 +298,6 @@ class MarkdownNoteDetail extends React.Component {
         config={config}
         value={note.content}
         storageKey={note.storage}
-        noteKey={note.key}
         onChange={this.handleUpdateContent.bind(this)}
         ignorePreviewPointerEvents={ignorePreviewPointerEvents}
       />
@@ -378,7 +305,7 @@ class MarkdownNoteDetail extends React.Component {
   }
 
   render () {
-    const { data, location, config } = this.props
+    const { data, location } = this.props
     const { note, editorType } = this.state
     const storageKey = note.storage
     const folderKey = note.folder
@@ -396,7 +323,10 @@ class MarkdownNoteDetail extends React.Component {
 
     const trashTopBar = <div styleName='info'>
       <div styleName='info-left'>
-        <RestoreButton onClick={(e) => this.handleUndoButtonClick(e)} />
+        <i styleName='undo-button'
+          className='fa fa-undo fa-fw'
+          onClick={(e) => this.handleUndoButtonClick(e)}
+        />
       </div>
       <div styleName='info-right'>
         <PermanentDeleteButton onClick={(e) => this.handleTrashButtonClick(e)} />
@@ -429,15 +359,14 @@ class MarkdownNoteDetail extends React.Component {
         <TagSelect
           ref='tags'
           value={this.state.note.tags}
-          saveTagsAlphabetically={config.ui.saveTagsAlphabetically}
-          showTagsAlphabetically={config.ui.showTagsAlphabetically}
-          data={data}
           onChange={this.handleUpdateTag.bind(this)}
         />
-        <TodoListPercentage onClearCheckboxClick={(e) => this.handleClearTodo(e)} percentageOfTodo={getTodoPercentageOfCompleted(note.content)} />
+
+        <ToggleModeButton onClick={(e) => this.handleSwitchMode(e)} editorType={editorType} />
+
+        <TodoListPercentage percentageOfTodo={getTodoPercentageOfCompleted(note.content)} />
       </div>
       <div styleName='info-right'>
-        <ToggleModeButton onClick={(e) => this.handleSwitchMode(e)} editorType={editorType} />
         <StarButton
           onClick={(e) => this.handleStarButtonClick(e)}
           isActive={note.isStarred}
@@ -470,7 +399,7 @@ class MarkdownNoteDetail extends React.Component {
         <InfoPanel
           storageName={currentOption.storage.name}
           folderName={currentOption.folder.name}
-          noteLink={`[${note.title}](:note:${location.query.key})`}
+          noteLink={`[${note.title}](${location.query.key})`}
           updatedAt={formatDate(note.updatedAt)}
           createdAt={formatDate(note.createdAt)}
           exportAsMd={this.exportAsMd}
@@ -488,7 +417,6 @@ class MarkdownNoteDetail extends React.Component {
       <div className='NoteDetail'
         style={this.props.style}
         styleName='root'
-        onKeyDown={(e) => this.handleKeyDown(e)}
       >
 
         {location.pathname === '/trashed' ? trashTopBar : detailTopBar}
@@ -515,7 +443,8 @@ MarkdownNoteDetail.propTypes = {
   style: PropTypes.shape({
     left: PropTypes.number
   }),
-  ignorePreviewPointerEvents: PropTypes.bool
+  ignorePreviewPointerEvents: PropTypes.bool,
+  confirmDeletion: PropTypes.bool.isRequired
 }
 
 export default CSSModules(MarkdownNoteDetail, styles)

browser/main/Detail/MarkdownNoteDetail.styl

@@ -7,7 +7,6 @@
   background-color $ui-noteDetail-backgroundColor
   box-shadow none
   padding 20px 40px
-  overflow hidden
 
 .lock-button
   padding-bottom 3px
@@ -45,7 +44,7 @@
   margin 0 30px
 .body-noteEditor
   absolute top bottom left right
-
+  
 body[data-theme="white"]
   .root
     box-shadow $note-detail-box-shadow
@@ -71,13 +70,3 @@ body[data-theme="solarized-dark"]
   .root
     border-left 1px solid $ui-solarized-dark-borderColor
     background-color $ui-solarized-dark-noteDetail-backgroundColor
-
-body[data-theme="monokai"]
-  .root
-    border-left 1px solid $ui-monokai-borderColor
-    background-color $ui-monokai-noteDetail-backgroundColor
-
-body[data-theme="dracula"]
-  .root
-    border-left 1px solid $ui-dracula-borderColor
-    background-color $ui-dracula-noteDetail-backgroundColor

browser/main/Detail/NoteDetailInfo.styl

@@ -13,7 +13,6 @@ $info-margin-under-border = 30px
   display flex
   align-items center
   padding 0 20px
-  z-index 99
 
 .info-left
   padding 0 10px
@@ -98,13 +97,4 @@ body[data-theme="solarized-dark"]
   .info
     border-color $ui-solarized-dark-borderColor
     background-color $ui-solarized-dark-noteDetail-backgroundColor
-
-body[data-theme="monokai"]
-  .info
-    border-color $ui-monokai-borderColor
-    background-color $ui-monokai-noteDetail-backgroundColor
-
-body[data-theme="dracula"]
-  .info
-    border-color $ui-dracula-borderColor
-    background-color $ui-dracula-noteDetail-backgroundColor
+    

browser/main/Detail/PermanentDeleteButton.js

@@ -2,7 +2,6 @@ import PropTypes from 'prop-types'
 import React from 'react'
 import CSSModules from 'browser/lib/CSSModules'
 import styles from './TrashButton.styl'
-import i18n from 'browser/lib/i18n'
 
 const PermanentDeleteButton = ({
   onClick
@@ -11,7 +10,7 @@ const PermanentDeleteButton = ({
     onClick={(e) => onClick(e)}
   >
     <img styleName='iconInfo' src='../resources/icon/icon-trash.svg' />
-    <span styleName='tooltip'>{i18n.__('Permanent Delete')}</span>
+    <span styleName='tooltip'>Permanent Delete</span>
   </button>
 )
 

browser/main/Detail/RestoreButton.js

@@ -1,22 +0,0 @@
-import PropTypes from 'prop-types'
-import React from 'react'
-import CSSModules from 'browser/lib/CSSModules'
-import styles from './RestoreButton.styl'
-import i18n from 'browser/lib/i18n'
-
-const RestoreButton = ({
-  onClick
-}) => (
-  <button styleName='control-restoreButton'
-    onClick={onClick}
-  >
-    <i className='fa fa-undo fa-fw' styleName='iconRestore' />
-    <span styleName='tooltip'>{i18n.__('Restore')}</span>
-  </button>
-)
-
-RestoreButton.propTypes = {
-  onClick: PropTypes.func.isRequired
-}
-
-export default CSSModules(RestoreButton, styles)

browser/main/Detail/RestoreButton.styl

@@ -1,22 +0,0 @@
-.control-restoreButton
-  top 115px
-  topBarButtonRight()
-  &:hover .tooltip
-    opacity 1
-
-.tooltip
-  tooltip()
-  position absolute
-  pointer-events none
-  top 50px
-  left 25px
-  z-index 200
-  padding 5px
-  line-height normal
-  border-radius 2px
-  opacity 0
-  transition 0.1s
-
-body[data-theme="dark"]
-  .control-restoreButton
-    topBarButtonDark()

browser/main/Detail/SnippetNoteDetail.js

@@ -8,7 +8,7 @@ import StarButton from './StarButton'
 import TagSelect from './TagSelect'
 import FolderSelect from './FolderSelect'
 import dataApi from 'browser/main/lib/dataApi'
-import {hashHistory} from 'react-router'
+import { hashHistory } from 'react-router'
 import ee from 'browser/main/lib/eventEmitter'
 import CodeMirror from 'codemirror'
 import 'codemirror-mode-elixir'
@@ -17,23 +17,33 @@ import StatusBar from '../StatusBar'
 import context from 'browser/lib/context'
 import ConfigManager from 'browser/main/lib/ConfigManager'
 import _ from 'lodash'
-import {findNoteTitle} from 'browser/lib/findNoteTitle'
-import convertModeName from 'browser/lib/convertModeName'
+import { findNoteTitle } from 'browser/lib/findNoteTitle'
 import AwsMobileAnalyticsConfig from 'browser/main/lib/AwsMobileAnalyticsConfig'
 import TrashButton from './TrashButton'
-import RestoreButton from './RestoreButton'
 import PermanentDeleteButton from './PermanentDeleteButton'
 import InfoButton from './InfoButton'
 import InfoPanel from './InfoPanel'
 import InfoPanelTrashed from './InfoPanelTrashed'
 import { formatDate } from 'browser/lib/date-formatter'
-import i18n from 'browser/lib/i18n'
-import { confirmDeleteNote } from 'browser/lib/confirmDeleteNote'
-import markdownToc from 'browser/lib/markdown-toc-generator'
+
+function pass (name) {
+  switch (name) {
+    case 'ejs':
+      return 'Embedded Javascript'
+    case 'html_ruby':
+      return 'Embedded Ruby'
+    case 'objectivec':
+      return 'Objective C'
+    case 'text':
+      return 'Plain Text'
+    default:
+      return name
+  }
+}
 
 const electron = require('electron')
 const { remote } = electron
-const { dialog } = remote
+const { Menu, MenuItem, dialog } = remote
 
 class SnippetNoteDetail extends React.Component {
   constructor (props) {
@@ -42,36 +52,16 @@ class SnippetNoteDetail extends React.Component {
     this.state = {
       isMovingNote: false,
       snippetIndex: 0,
-      showArrows: false,
-      enableLeftArrow: false,
-      enableRightArrow: false,
       note: Object.assign({
         description: ''
       }, props.note, {
         snippets: props.note.snippets.map((snippet) => Object.assign({}, snippet))
       })
     }
-
-    this.scrollToNextTabThreshold = 0.7
-    this.generateToc = () => this.handleGenerateToc()
-  }
-
-  componentDidMount () {
-    const visibleTabs = this.visibleTabs
-    const allTabs = this.allTabs
-
-    if (visibleTabs.offsetWidth < allTabs.scrollWidth) {
-      this.setState({
-        showArrows: visibleTabs.offsetWidth < allTabs.scrollWidth,
-        enableRightArrow: allTabs.offsetLeft !== visibleTabs.offsetWidth - allTabs.scrollWidth,
-        enableLeftArrow: allTabs.offsetLeft !== 0
-      })
-    }
-    ee.on('code:generate-toc', this.generateToc)
   }
 
   componentWillReceiveProps (nextProps) {
-    if (nextProps.note.key !== this.props.note.key && !this.state.isMovingNote) {
+    if (nextProps.note.key !== this.props.note.key && !this.isMovingNote) {
       if (this.saveQueue != null) this.saveNow()
       const nextNote = Object.assign({
         description: ''
@@ -87,23 +77,12 @@ class SnippetNoteDetail extends React.Component {
           this.refs['code-' + index].reload()
         })
         if (this.refs.tags) this.refs.tags.reset()
-        this.setState(this.getArrowsState())
       })
     }
   }
 
   componentWillUnmount () {
     if (this.saveQueue != null) this.saveNow()
-    ee.off('code:generate-toc', this.generateToc)
-  }
-
-  handleGenerateToc () {
-    const { note, snippetIndex } = this.state
-    const currentMode = note.snippets[snippetIndex].mode
-    if (currentMode.includes('Markdown')) {
-      const currentEditor = this.refs[`code-${snippetIndex}`].refs.code.editor
-      markdownToc.generateInEditor(currentEditor)
-    }
   }
 
   handleChange (e) {
@@ -112,7 +91,7 @@ class SnippetNoteDetail extends React.Component {
     if (this.refs.tags) note.tags = this.refs.tags.value
     note.description = this.refs.description.value
     note.updatedAt = new Date()
-    note.title = findNoteTitle(note.description, false)
+    note.title = findNoteTitle(note.description)
 
     this.setState({
       note
@@ -167,7 +146,7 @@ class SnippetNoteDetail extends React.Component {
           hashHistory.replace({
             pathname: location.pathname,
             query: {
-              key: newNote.key
+              key: newNote.storage + '-' + newNote.key
             }
           })
           this.setState({
@@ -197,10 +176,10 @@ class SnippetNoteDetail extends React.Component {
   handleTrashButtonClick (e) {
     const { note } = this.state
     const { isTrashed } = note
-    const { confirmDeletion } = this.props.config.ui
+    const { confirmDeletion } = this.props
 
     if (isTrashed) {
-      if (confirmDeleteNote(confirmDeletion, true)) {
+      if (confirmDeletion(true)) {
         const {note, dispatch} = this.props
         dataApi
           .deleteNote(note.storage, note.key)
@@ -212,12 +191,11 @@ class SnippetNoteDetail extends React.Component {
                 noteKey: data.noteKey
               })
             }
-            ee.once('list:next', dispatchHandler)
+            ee.once('list:moved', dispatchHandler)
           })
-          .then(() => ee.emit('list:next'))
       }
     } else {
-      if (confirmDeleteNote(confirmDeletion, false)) {
+      if (confirmDeletion()) {
         note.isTrashed = true
 
         this.setState({
@@ -248,51 +226,6 @@ class SnippetNoteDetail extends React.Component {
     ee.emit('editor:fullscreen')
   }
 
-  handleTabMoveLeftButtonClick (e) {
-    {
-      const left = this.visibleTabs.scrollLeft
-
-      const tabs = this.allTabs.querySelectorAll('div')
-      const lastVisibleTab = Array.from(tabs).find((tab) => {
-        return tab.offsetLeft + tab.offsetWidth >= left
-      })
-
-      if (lastVisibleTab) {
-        const visiblePart = lastVisibleTab.offsetWidth + lastVisibleTab.offsetLeft - left
-        const isFullyVisible = visiblePart > lastVisibleTab.offsetWidth * this.scrollToNextTabThreshold
-        const scrollToTab = (isFullyVisible && lastVisibleTab.previousSibling)
-            ? lastVisibleTab.previousSibling
-            : lastVisibleTab
-
-        // FIXME use `scrollIntoView()` instead of custom method after update to Electron2.0 (with Chrome 61 its possible animate the scroll)
-        this.moveToTab(scrollToTab)
-        // scrollToTab.scrollIntoView({behavior: 'smooth', inline: 'start', block: 'start'})
-      }
-    }
-  }
-
-  handleTabMoveRightButtonClick (e) {
-    const left = this.visibleTabs.scrollLeft
-    const width = this.visibleTabs.offsetWidth
-
-    const tabs = this.allTabs.querySelectorAll('div')
-    const lastVisibleTab = Array.from(tabs).find((tab) => {
-      return tab.offsetLeft + tab.offsetWidth >= width + left
-    })
-
-    if (lastVisibleTab) {
-      const visiblePart = width + left - lastVisibleTab.offsetLeft
-      const isFullyVisible = visiblePart > lastVisibleTab.offsetWidth * this.scrollToNextTabThreshold
-      const scrollToTab = (isFullyVisible && lastVisibleTab.nextSibling)
-          ? lastVisibleTab.nextSibling
-          : lastVisibleTab
-
-      // FIXME use `scrollIntoView()` instead of custom method after update to Electron2.0 (with Chrome 61 its possible animate the scroll)
-      this.moveToTab(scrollToTab)
-      // scrollToTab.scrollIntoView({behavior: 'smooth', inline: 'end', block: 'end'})
-    }
-  }
-
   handleTabPlusButtonClick (e) {
     this.addSnippet()
   }
@@ -329,9 +262,9 @@ class SnippetNoteDetail extends React.Component {
       if (this.state.note.snippets[index].content.trim().length > 0) {
         const dialogIndex = dialog.showMessageBox(remote.getCurrentWindow(), {
           type: 'warning',
-          message: i18n.__('Delete a snippet'),
-          detail: i18n.__('This work cannot be undone.'),
-          buttons: [i18n.__('Confirm'), i18n.__('Cancel')]
+          message: 'Delete a snippet',
+          detail: 'This work cannot be undone.',
+          buttons: ['Confirm', 'Cancel']
         })
         if (dialogIndex === 0) {
           this.deleteSnippetByIndex(index)
@@ -352,19 +285,6 @@ class SnippetNoteDetail extends React.Component {
     this.setState({ note, snippetIndex }, () => {
       this.save()
       this.refs['code-' + this.state.snippetIndex].reload()
-
-      if (this.visibleTabs.offsetWidth > this.allTabs.scrollWidth) {
-        this.moveTabBarBy(0)
-      } else {
-        const lastTab = this.allTabs.lastChild
-        if (lastTab.offsetLeft + lastTab.offsetWidth < this.visibleTabs.offsetWidth) {
-          const width = this.visibleTabs.offsetWidth
-          const newLeft = lastTab.offsetLeft + lastTab.offsetWidth - width
-          this.moveTabBarBy(newLeft > 0 ? -newLeft : 0)
-        } else {
-          this.setState(this.getArrowsState())
-        }
-      }
     })
   }
 
@@ -379,11 +299,11 @@ class SnippetNoteDetail extends React.Component {
         name: mode
       })
     }
-    this.setState(state => ({note: Object.assign(state.note, {snippets: snippets})}))
+    this.setState({note: Object.assign(this.state.note, {snippets: snippets})})
 
-    this.setState(state => ({
-      note: state.note
-    }), () => {
+    this.setState({
+      note: this.state.note
+    }, () => {
       this.save()
     })
   }
@@ -392,11 +312,11 @@ class SnippetNoteDetail extends React.Component {
     return (e) => {
       const snippets = this.state.note.snippets.slice()
       snippets[index].mode = name
-      this.setState(state => ({note: Object.assign(state.note, {snippets: snippets})}))
+      this.setState({note: Object.assign(this.state.note, {snippets: snippets})})
 
-      this.setState(state => ({
-        note: state.note
-      }), () => {
+      this.setState({
+        note: this.state.note
+      }, () => {
         this.save()
       })
 
@@ -410,10 +330,10 @@ class SnippetNoteDetail extends React.Component {
     return (e) => {
       const snippets = this.state.note.snippets.slice()
       snippets[index].content = this.refs['code-' + index].value
-      this.setState(state => ({note: Object.assign(state.note, {snippets: snippets})}))
-      this.setState(state => ({
-        note: state.note
-      }), () => {
+      this.setState({note: Object.assign(this.state.note, {snippets: snippets})})
+      this.setState({
+        note: this.state.note
+      }, () => {
         this.save()
       })
     }
@@ -421,7 +341,6 @@ class SnippetNoteDetail extends React.Component {
 
   handleKeyDown (e) {
     switch (e.keyCode) {
-      // tab key
       case 9:
         if (e.ctrlKey && !e.shiftKey) {
           e.preventDefault()
@@ -434,19 +353,6 @@ class SnippetNoteDetail extends React.Component {
           this.focusEditor()
         }
         break
-      // I key
-      case 73:
-        {
-          const isSuper = global.process.platform === 'darwin'
-            ? e.metaKey
-            : e.ctrlKey
-          if (isSuper) {
-            e.preventDefault()
-            this.handleInfoButtonClick(e)
-          }
-        }
-        break
-      // L key
       case 76:
         {
           const isSuper = global.process.platform === 'darwin'
@@ -458,13 +364,12 @@ class SnippetNoteDetail extends React.Component {
           }
         }
         break
-      // T key
       case 84:
         {
           const isSuper = global.process.platform === 'darwin'
             ? e.metaKey
             : e.ctrlKey
-          if (isSuper && !e.shiftKey && !e.altKey) {
+          if (isSuper) {
             e.preventDefault()
             this.addSnippet()
           }
@@ -474,14 +379,14 @@ class SnippetNoteDetail extends React.Component {
   }
 
   handleModeButtonClick (e, index) {
-    const templetes = []
+    const menu = new Menu()
     CodeMirror.modeInfo.sort(function (a, b) { return a.name.localeCompare(b.name) }).forEach((mode) => {
-      templetes.push({
+      menu.append(new MenuItem({
         label: mode.name,
         click: (e) => this.handleModeOptionClick(index, mode.name)(e)
-      })
+      }))
     })
-    context.popup(templetes)
+    menu.popup(remote.getCurrentWindow())
   }
 
   handleIndentTypeButtonClick (e) {
@@ -550,93 +455,42 @@ class SnippetNoteDetail extends React.Component {
     this.refs.description.focus()
   }
 
-  moveToTab (tab) {
-    const easeOutCubic = t => (--t) * t * t + 1
-    const startScrollPosition = this.visibleTabs.scrollLeft
-    const animationTiming = 300
-    const scrollMoreCoeff = 1.4 // introduce coefficient, because we want to scroll a bit further to see next tab
-
-    let scrollBy = (tab.offsetLeft - startScrollPosition)
-
-    if (tab.offsetLeft > startScrollPosition) {
-      // if tab is on the right side and we want to show the whole tab in visible area,
-      // we need to include width of the tab and visible area in the formula
-      //  ___________________________________________
-      // |____|_______|________|________|_show_this_|
-      //        ↑_____________________↑
-      //            visible area
-      scrollBy += (tab.offsetWidth - this.visibleTabs.offsetWidth)
-    }
-
-    let startTime = null
-    const scrollAnimation = time => {
-      startTime = startTime || time
-      const elapsed = (time - startTime) / animationTiming
-
-      this.visibleTabs.scrollLeft = startScrollPosition + easeOutCubic(elapsed) * scrollBy * scrollMoreCoeff
-      if (elapsed < 1) {
-        window.requestAnimationFrame(scrollAnimation)
-      } else {
-        this.setState(this.getArrowsState())
-      }
-    }
-
-    window.requestAnimationFrame(scrollAnimation)
-  }
-
-  getArrowsState () {
-    const allTabs = this.allTabs
-    const visibleTabs = this.visibleTabs
-
-    const showArrows = visibleTabs.offsetWidth < allTabs.scrollWidth
-    const enableRightArrow = visibleTabs.scrollLeft !== allTabs.scrollWidth - visibleTabs.offsetWidth
-    const enableLeftArrow = visibleTabs.scrollLeft !== 0
-
-    return {showArrows, enableRightArrow, enableLeftArrow}
-  }
-
   addSnippet () {
-    const { config } = this.props
     const { note } = this.state
 
     note.snippets = note.snippets.concat([{
       name: '',
-      mode: config.editor.snippetDefaultLanguage || 'text',
+      mode: 'Plain Text',
       content: ''
     }])
     const snippetIndex = note.snippets.length - 1
 
-    this.setState(Object.assign({
+    this.setState({
       note,
       snippetIndex
-    }, this.getArrowsState()), () => {
-      if (this.state.showArrows) {
-        const tabs = this.allTabs.querySelectorAll('div')
-        if (tabs) {
-          this.moveToTab(tabs[snippetIndex])
-        }
-      }
+    }, () => {
       this.refs['tab-' + snippetIndex].startRenaming()
     })
   }
 
   jumpNextTab () {
-    this.setState(state => ({
-      snippetIndex: (state.snippetIndex + 1) % state.note.snippets.length
-    }), () => {
+    this.setState({
+      snippetIndex: (this.state.snippetIndex + 1) % this.state.note.snippets.length
+    }, () => {
       this.focusEditor()
     })
   }
 
   jumpPrevTab () {
-    this.setState(state => ({
-      snippetIndex: (state.snippetIndex - 1 + state.note.snippets.length) % state.note.snippets.length
-    }), () => {
+    this.setState({
+      snippetIndex: (this.state.snippetIndex - 1 + this.state.note.snippets.length) % this.state.note.snippets.length
+    }, () => {
       this.focusEditor()
     })
   }
 
   focusEditor () {
+    console.log('code-' + this.state.snippetIndex)
     this.refs['code-' + this.state.snippetIndex].focus()
   }
 
@@ -645,19 +499,12 @@ class SnippetNoteDetail extends React.Component {
     if (infoPanel.style) infoPanel.style.display = infoPanel.style.display === 'none' ? 'inline' : 'none'
   }
 
-  showWarning (e, msg) {
-    const warningMessage = (msg) => ({
-      'export-txt': 'Text export',
-      'export-md': 'Markdown export',
-      'export-html': 'HTML export',
-      'print': 'Print'
-    })[msg]
-
+  showWarning () {
     dialog.showMessageBox(remote.getCurrentWindow(), {
       type: 'warning',
-      message: i18n.__('Sorry!'),
-      detail: i18n.__(warningMessage(msg) + ' is available only in markdown notes.'),
-      buttons: [i18n.__('OK')]
+      message: 'Sorry!',
+      detail: 'md/text import is available only a markdown note.',
+      buttons: ['OK']
     })
   }
 
@@ -693,7 +540,7 @@ 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))
+      let syntax = CodeMirror.findModeByName(pass(snippet.mode))
       if (syntax == null) syntax = CodeMirror.findModeByName('Plain Text')
 
       return <div styleName='tabView'
@@ -720,12 +567,8 @@ class SnippetNoteDetail extends React.Component {
             displayLineNumbers={config.editor.displayLineNumbers}
             keyMap={config.editor.keyMap}
             scrollPastEnd={config.editor.scrollPastEnd}
-            fetchUrlTitle={config.editor.fetchUrlTitle}
-            enableTableEditor={config.editor.enableTableEditor}
             onChange={(e) => this.handleCodeChange(index)(e)}
             ref={'code-' + index}
-            enableSmartPaste={config.editor.enableSmartPaste}
-            hotkey={config.hotkey}
           />
         }
       </div>
@@ -744,7 +587,10 @@ class SnippetNoteDetail extends React.Component {
 
     const trashTopBar = <div styleName='info'>
       <div styleName='info-left'>
-        <RestoreButton onClick={(e) => this.handleUndoButtonClick(e)} />
+        <i styleName='undo-button'
+          className='fa fa-undo fa-fw'
+          onClick={(e) => this.handleUndoButtonClick(e)}
+        />
       </div>
       <div styleName='info-right'>
         <PermanentDeleteButton onClick={(e) => this.handleTrashButtonClick(e)} />
@@ -777,9 +623,6 @@ class SnippetNoteDetail extends React.Component {
         <TagSelect
           ref='tags'
           value={this.state.note.tags}
-          saveTagsAlphabetically={config.ui.saveTagsAlphabetically}
-          showTagsAlphabetically={config.ui.showTagsAlphabetically}
-          data={data}
           onChange={(e) => this.handleChange(e)}
         />
       </div>
@@ -789,10 +632,10 @@ class SnippetNoteDetail extends React.Component {
           isActive={note.isStarred}
         />
 
-        <button styleName='control-fullScreenButton' title={i18n.__('Fullscreen')}
+        <button styleName='control-fullScreenButton' title='Fullscreen'
           onMouseDown={(e) => this.handleFullScreenButton(e)}>
           <img styleName='iconInfo' src='../resources/icon/icon-full.svg' />
-          <span styleName='tooltip'>{i18n.__('Fullscreen')}</span>
+          <span styleName='tooltip'>Fullscreen</span>
         </button>
 
         <TrashButton onClick={(e) => this.handleTrashButtonClick(e)} />
@@ -804,14 +647,12 @@ class SnippetNoteDetail extends React.Component {
         <InfoPanel
           storageName={currentOption.storage.name}
           folderName={currentOption.folder.name}
-          noteLink={`[${note.title}](:note:${location.query.key})`}
+          noteLink={`[${note.title}](${location.query.key})`}
           updatedAt={formatDate(note.updatedAt)}
           createdAt={formatDate(note.createdAt)}
           exportAsMd={this.showWarning}
           exportAsTxt={this.showWarning}
-          exportAsHtml={this.showWarning}
           type={note.type}
-          print={this.showWarning}
         />
       </div>
     </div>
@@ -832,32 +673,16 @@ class SnippetNoteDetail extends React.Component {
                 fontSize: parseInt(config.preview.fontSize, 10)
               }}
               ref='description'
-              placeholder={i18n.__('Description...')}
+              placeholder='Description...'
               value={this.state.note.description}
               onChange={(e) => this.handleChange(e)}
             />
           </div>
           <div styleName='tabList'>
-            <button styleName='tabButton'
-              hidden={!this.state.showArrows}
-              disabled={!this.state.enableLeftArrow}
-              onClick={(e) => this.handleTabMoveLeftButtonClick(e)}
-            >
-              <i className='fa fa-chevron-left' />
-            </button>
-            <div styleName='list' onScroll={(e) => { this.setState(this.getArrowsState()) }} ref={(tabs) => { this.visibleTabs = tabs }}>
-              <div styleName='allTabs' ref={(tabs) => { this.allTabs = tabs }}>
-                {tabList}
-              </div>
+            <div styleName='list'>
+              {tabList}
             </div>
-            <button styleName='tabButton'
-              hidden={!this.state.showArrows}
-              disabled={!this.state.enableRightArrow}
-              onClick={(e) => this.handleTabMoveRightButtonClick(e)}
-            >
-              <i className='fa fa-chevron-right' />
-            </button>
-            <button styleName='tabButton'
+            <button styleName='plusButton'
               onClick={(e) => this.handleTabPlusButtonClick(e)}
             >
               <i className='fa fa-plus' />
@@ -871,7 +696,7 @@ class SnippetNoteDetail extends React.Component {
             onClick={(e) => this.handleModeButtonClick(e, this.state.snippetIndex)}
           >
             {this.state.note.snippets[this.state.snippetIndex].mode == null
-              ? i18n.__('Select Syntax...')
+              ? 'Select Syntax...'
               : this.state.note.snippets[this.state.snippetIndex].mode
             }&nbsp;
             <i className='fa fa-caret-down' />
@@ -908,7 +733,8 @@ SnippetNoteDetail.propTypes = {
   style: PropTypes.shape({
     left: PropTypes.number
   }),
-  ignorePreviewPointerEvents: PropTypes.bool
+  ignorePreviewPointerEvents: PropTypes.bool,
+  confirmDeletion: PropTypes.bool.isRequired
 }
 
 export default CSSModules(SnippetNoteDetail, styles)

browser/main/Detail/SnippetNoteDetail.styl

@@ -35,26 +35,13 @@
   height 30px
   display flex
   background-color $ui-noteDetail-backgroundColor
-  overflow hidden
 
 .tabList .list
   flex 1
+  display flex
   overflow hidden
-  overflow-x scroll
-  position relative
 
-  &::-webkit-scrollbar {
-    display: none;
-  }
-
-  .allTabs
-    display flex
-    position relative
-    overflow visible
-    left 0
-    transition left 0.1s
-
-.tabList .tabButton
+.tabList .plusButton
   navWhiteButtonColor()
   width 30px
 
@@ -152,38 +139,4 @@ body[data-theme="solarized-dark"]
 
   .tabList
     background-color $ui-solarized-dark-noteDetail-backgroundColor
-    color $ui-solarized-dark-text-color
-
-body[data-theme="monokai"]
-  .root
-    border-left 1px solid $ui-monokai-borderColor
-    background-color $ui-monokai-noteDetail-backgroundColor
-
-  .body
-    background-color $ui-monokai-noteDetail-backgroundColor
-
-  .body .description textarea
-    background-color $ui-monokai-noteDetail-backgroundColor
-    color $ui-monokai-text-color
-    border 1px solid $ui-monokai-borderColor
-
-  .tabList
-    background-color $ui-monokai-noteDetail-backgroundColor
-    color $ui-monokai-text-color
-
-body[data-theme="dracula"]
-  .root
-    border-left 1px solid $ui-dracula-borderColor
-    background-color $ui-dracula-noteDetail-backgroundColor
-
-  .body
-    background-color $ui-dracula-noteDetail-backgroundColor
-
-  .body .description textarea
-    background-color $ui-dracula-noteDetail-backgroundColor
-    color $ui-dracula-text-color
-    border 1px solid $ui-dracula-borderColor
-
-  .tabList
-    background-color $ui-dracula-noteDetail-backgroundColor
-    color $ui-dracula-text-color
+    color $ui-solarized-dark-text-color

browser/main/Detail/StarButton.js

@@ -3,7 +3,6 @@ import React from 'react'
 import CSSModules from 'browser/lib/CSSModules'
 import styles from './StarButton.styl'
 import _ from 'lodash'
-import i18n from 'browser/lib/i18n'
 
 class StarButton extends React.Component {
   constructor (props) {
@@ -54,7 +53,7 @@ class StarButton extends React.Component {
             : '../resources/icon/icon-star.svg'
           }
         />
-        <span styleName='tooltip'>{i18n.__('Star')}</span>
+        <span styleName='tooltip'>Star</span>
       </button>
     )
   }

browser/main/Detail/TagSelect.js

@@ -4,35 +4,68 @@ import CSSModules from 'browser/lib/CSSModules'
 import styles from './TagSelect.styl'
 import _ from 'lodash'
 import AwsMobileAnalyticsConfig from 'browser/main/lib/AwsMobileAnalyticsConfig'
-import i18n from 'browser/lib/i18n'
-import ee from 'browser/main/lib/eventEmitter'
-import Autosuggest from 'react-autosuggest'
 
 class TagSelect extends React.Component {
   constructor (props) {
     super(props)
 
     this.state = {
-      newTag: '',
-      suggestions: []
+      newTag: ''
     }
-
-    this.handleAddTag = this.handleAddTag.bind(this)
-    this.onInputBlur = this.onInputBlur.bind(this)
-    this.onInputChange = this.onInputChange.bind(this)
-    this.onInputKeyDown = this.onInputKeyDown.bind(this)
-    this.onSuggestionsClearRequested = this.onSuggestionsClearRequested.bind(this)
-    this.onSuggestionsFetchRequested = this.onSuggestionsFetchRequested.bind(this)
-    this.onSuggestionSelected = this.onSuggestionSelected.bind(this)
   }
 
-  addNewTag (newTag) {
-    AwsMobileAnalyticsConfig.recordDynamicCustomEvent('ADD_TAG')
+  componentDidMount () {
+    this.value = this.props.value
+  }
 
-    newTag = newTag.trim().replace(/ +/g, '_')
-    if (newTag.charAt(0) === '#') {
-      newTag.substring(1)
+  componentDidUpdate () {
+    this.value = this.props.value
+  }
+
+  handleNewTagInputKeyDown (e) {
+    switch (e.keyCode) {
+      case 9:
+        e.preventDefault()
+        this.submitTag()
+        break
+      case 13:
+        this.submitTag()
+        break
+      case 8:
+        if (this.refs.newTag.value.length === 0) {
+          this.removeLastTag()
+        }
     }
+  }
+
+  handleNewTagBlur (e) {
+    this.submitTag()
+  }
+
+  removeLastTag () {
+    let { value } = this.props
+
+    value = _.isArray(value)
+      ? value.slice()
+      : []
+    value.pop()
+    value = _.uniq(value)
+
+    this.value = value
+    this.props.onChange()
+  }
+
+  reset () {
+    this.setState({
+      newTag: ''
+    })
+  }
+
+  submitTag () {
+    AwsMobileAnalyticsConfig.recordDynamicCustomEvent('ADD_TAG')
+    let { value } = this.props
+    let newTag = this.refs.newTag.value.trim().replace(/ +/g, '_')
+    newTag = newTag.charAt(0) === '#' ? newTag.substring(1) : newTag
 
     if (newTag.length <= 0) {
       this.setState({
@@ -41,7 +74,6 @@ class TagSelect extends React.Component {
       return
     }
 
-    let { value } = this.props
     value = _.isArray(value)
       ? value.slice()
       : []
@@ -56,140 +88,36 @@ class TagSelect extends React.Component {
     })
   }
 
-  buildSuggestions () {
-    this.suggestions = _.sortBy(this.props.data.tagNoteMap.map(
-      (tag, name) => ({
-        name,
-        nameLC: name.toLowerCase(),
-        size: tag.size
-      })
-    ).filter(
-      tag => tag.size > 0
-    ), ['name'])
-  }
-
-  componentDidMount () {
-    this.value = this.props.value
-
-    this.buildSuggestions()
-
-    ee.on('editor:add-tag', this.handleAddTag)
-  }
-
-  componentDidUpdate () {
-    this.value = this.props.value
-  }
-
-  componentWillUnmount () {
-    ee.off('editor:add-tag', this.handleAddTag)
-  }
-
-  handleAddTag () {
-    this.refs.newTag.input.focus()
-  }
-
-  handleTagLabelClick (tag) {
-    const { router } = this.context
-    router.push(`/tags/${tag}`)
+  handleNewTagInputChange (e) {
+    this.setState({
+      newTag: this.refs.newTag.value
+    })
   }
 
   handleTagRemoveButtonClick (tag) {
-    this.removeTagByCallback((value, tag) => {
+    return (e) => {
+      let { value } = this.props
+
       value.splice(value.indexOf(tag), 1)
-    }, tag)
-  }
+      value = _.uniq(value)
 
-  onInputBlur (e) {
-    this.submitNewTag()
-  }
-
-  onInputChange (e, { newValue, method }) {
-    this.setState({
-      newTag: newValue
-    })
-  }
-
-  onInputKeyDown (e) {
-    switch (e.keyCode) {
-      case 9:
-        e.preventDefault()
-        this.submitNewTag()
-        break
-      case 13:
-        this.submitNewTag()
-        break
-      case 8:
-        if (this.state.newTag.length === 0) {
-          this.removeLastTag()
-        }
+      this.value = value
+      this.props.onChange()
     }
   }
 
-  onSuggestionsClearRequested () {
-    this.setState({
-      suggestions: []
-    })
-  }
-
-  onSuggestionsFetchRequested ({ value }) {
-    const valueLC = value.toLowerCase()
-    const suggestions = _.filter(
-      this.suggestions,
-      tag => !_.includes(this.value, tag.name) && tag.nameLC.indexOf(valueLC) !== -1
-    )
-
-    this.setState({
-      suggestions
-    })
-  }
-
-  onSuggestionSelected (event, { suggestion, suggestionValue }) {
-    this.addNewTag(suggestionValue)
-  }
-
-  removeLastTag () {
-    this.removeTagByCallback((value) => {
-      value.pop()
-    })
-  }
-
-  removeTagByCallback (callback, tag = null) {
-    let { value } = this.props
-
-    value = _.isArray(value)
-      ? value.slice()
-      : []
-    callback(value, tag)
-    value = _.uniq(value)
-
-    this.value = value
-    this.props.onChange()
-  }
-
-  reset () {
-    this.buildSuggestions()
-
-    this.setState({
-      newTag: ''
-    })
-  }
-
-  submitNewTag () {
-    this.addNewTag(this.refs.newTag.input.value)
-  }
-
   render () {
-    const { value, className, showTagsAlphabetically } = this.props
+    const { value, className } = this.props
 
     const tagList = _.isArray(value)
-      ? (showTagsAlphabetically ? _.sortBy(value) : value).map((tag) => {
+      ? value.map((tag) => {
         return (
           <span styleName='tag'
             key={tag}
           >
-            <span styleName='tag-label' onClick={(e) => this.handleTagLabelClick(tag)}>#{tag}</span>
+            <span styleName='tag-label'>#{tag}</span>
             <button styleName='tag-removeButton'
-              onClick={(e) => this.handleTagRemoveButtonClick(tag)}
+              onClick={(e) => this.handleTagRemoveButtonClick(tag)(e)}
             >
               <img className='tag-removeButton-icon' src='../resources/icon/icon-x.svg' width='8px' />
             </button>
@@ -198,8 +126,6 @@ class TagSelect extends React.Component {
       })
       : []
 
-    const { newTag, suggestions } = this.state
-
     return (
       <div className={_.isString(className)
           ? 'TagSelect ' + className
@@ -208,39 +134,24 @@ class TagSelect extends React.Component {
         styleName='root'
       >
         {tagList}
-        <Autosuggest
+        <input styleName='newTag'
           ref='newTag'
-          suggestions={suggestions}
-          onSuggestionsFetchRequested={this.onSuggestionsFetchRequested}
-          onSuggestionsClearRequested={this.onSuggestionsClearRequested}
-          onSuggestionSelected={this.onSuggestionSelected}
-          getSuggestionValue={suggestion => suggestion.name}
-          renderSuggestion={suggestion => (
-            <div>
-              {suggestion.name}
-            </div>
-          )}
-          inputProps={{
-            placeholder: i18n.__('Add tag...'),
-            value: newTag,
-            onChange: this.onInputChange,
-            onKeyDown: this.onInputKeyDown,
-            onBlur: this.onInputBlur
-          }}
+          value={this.state.newTag}
+          placeholder='Add tag...'
+          onChange={(e) => this.handleNewTagInputChange(e)}
+          onKeyDown={(e) => this.handleNewTagInputKeyDown(e)}
+          onBlur={(e) => this.handleNewTagBlur(e)}
         />
       </div>
     )
   }
 }
 
-TagSelect.contextTypes = {
-  router: PropTypes.shape({})
-}
-
 TagSelect.propTypes = {
   className: PropTypes.string,
   value: PropTypes.arrayOf(PropTypes.string),
   onChange: PropTypes.func
+
 }
 
 export default CSSModules(TagSelect, styles)

browser/main/Detail/TagSelect.styl

@@ -39,9 +39,16 @@
 
 .tag-label
   font-size 13px
-  color $ui-text-color
+  color: $ui-text-color
   padding 4px 16px 4px 8px
-  cursor pointer
+
+.newTag
+  box-sizing border-box
+  border none
+  background-color transparent
+  outline none
+  padding 0 4px
+  font-size 13px
 
 body[data-theme="dark"]
   .tag
@@ -55,6 +62,11 @@ body[data-theme="dark"]
   .tag-label
     color $ui-dark-text-color
 
+  .newTag
+    border-color none
+    background-color transparent
+    color $ui-dark-text-color
+    
 body[data-theme="solarized-dark"]
   .tag
     background-color $ui-solarized-dark-tag-backgroundColor
@@ -66,24 +78,7 @@ body[data-theme="solarized-dark"]
   .tag-label
     color $ui-solarized-dark-text-color
 
-body[data-theme="monokai"]
-  .tag
-    background-color $ui-monokai-tag-backgroundColor
-
-  .tag-removeButton
-    border-color $ui-button--focus-borderColor
+  .newTag
+    border-color none
     background-color transparent
-
-  .tag-label
-    color $ui-monokai-text-color
-
-body[data-theme="dracula"]
-  .tag
-    background-color $ui-dracula-tag-backgroundColor
-
-  .tag-removeButton
-    border-color $ui-dracula-button--focus-borderColor
-    background-color transparent
-
-  .tag-label
-    color $ui-dracula-borderColor
+    color $ui-solarized-dark-text-color

browser/main/Detail/ToggleModeButton.js

@@ -1,26 +1,25 @@
-import PropTypes from 'prop-types'
-import React from 'react'
-import CSSModules from 'browser/lib/CSSModules'
-import styles from './ToggleModeButton.styl'
-import i18n from 'browser/lib/i18n'
-
-const ToggleModeButton = ({
-  onClick, editorType
-}) => (
-  <div styleName='control-toggleModeButton'>
-    <div styleName={editorType === 'SPLIT' ? 'active' : 'non-active'} onClick={() => onClick('SPLIT')}>
-      <img styleName='item-star' src={editorType === 'EDITOR_PREVIEW' ? '../resources/icon/icon-mode-markdown-off-active.svg' : ''} />
-    </div>
-    <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>
-  </div>
-)
-
-ToggleModeButton.propTypes = {
-  onClick: PropTypes.func.isRequired,
-  editorType: PropTypes.string.Required
-}
-
-export default CSSModules(ToggleModeButton, styles)
+import PropTypes from 'prop-types'
+import React from 'react'
+import CSSModules from 'browser/lib/CSSModules'
+import styles from './ToggleModeButton.styl'
+
+const ToggleModeButton = ({
+  onClick, editorType
+}) => (
+  <div styleName='control-toggleModeButton'>
+    <div styleName={editorType === 'SPLIT' ? 'active' : 'non-active'} onClick={() => onClick('SPLIT')}>
+      <img styleName='item-star' src={editorType === 'EDITOR_PREVIEW' ? '../resources/icon/icon-mode-markdown-off-active.svg' : ''} />
+    </div>
+    <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'>Toggle Mode</span>
+  </div>
+)
+
+ToggleModeButton.propTypes = {
+  onClick: PropTypes.func.isRequired,
+  editorType: PropTypes.string.Required
+}
+
+export default CSSModules(ToggleModeButton, styles)

browser/main/Detail/ToggleModeButton.styl

@@ -5,8 +5,8 @@
   width 52px
   display flex
   align-items center
-  position: relative
-  top 2px
+  position absolute
+  right 165px
   .active
     background-color #1EC38B
     width 33px
@@ -55,18 +55,4 @@ body[data-theme="solarized-dark"]
       background-color #002B36
     .active
       background-color #1EC38B
-      box-shadow 2px 0px 7px #222222
-
-body[data-theme="monokai"]
-  .control-toggleModeButton
-      background-color #373831
-    .active
-      background-color #f92672
-      box-shadow 2px 0px 7px #222222
-
-body[data-theme="dracula"]
-  .control-toggleModeButton
-      background-color #44475a
-    .active
-      background-color #bd93f9
-      box-shadow 2px 0px 7px #222222
+      box-shadow 2px 0px 7px #222222

browser/main/Detail/TrashButton.js

@@ -2,7 +2,6 @@ import PropTypes from 'prop-types'
 import React from 'react'
 import CSSModules from 'browser/lib/CSSModules'
 import styles from './TrashButton.styl'
-import i18n from 'browser/lib/i18n'
 
 const TrashButton = ({
   onClick
@@ -11,7 +10,7 @@ const TrashButton = ({
     onClick={(e) => onClick(e)}
   >
     <img styleName='iconInfo' src='../resources/icon/icon-trash.svg' />
-    <span styleName='tooltip'>{i18n.__('Trash')}</span>
+    <span styleName='tooltip'>Trash</span>
   </button>
 )
 

browser/main/Detail/index.js

@@ -7,9 +7,6 @@ import MarkdownNoteDetail from './MarkdownNoteDetail'
 import SnippetNoteDetail from './SnippetNoteDetail'
 import ee from 'browser/main/lib/eventEmitter'
 import StatusBar from '../StatusBar'
-import i18n from 'browser/lib/i18n'
-import debounceRender from 'react-debounce-render'
-import searchFromNotes from 'browser/lib/search'
 
 const OSX = global.process.platform === 'darwin'
 
@@ -35,39 +32,35 @@ class Detail extends React.Component {
     ee.off('detail:delete', this.deleteHandler)
   }
 
+  confirmDeletion (permanent) {
+    if (this.props.config.ui.confirmDeletion || permanent) {
+      const electron = require('electron')
+      const { remote } = electron
+      const { dialog } = remote
+
+      const alertConfig = {
+        type: 'warning',
+        message: 'Confirm note deletion',
+        detail: 'This will permanently remove this note.',
+        buttons: ['Confirm', 'Cancel']
+      }
+
+      const dialogueButtonIndex = dialog.showMessageBox(remote.getCurrentWindow(), alertConfig)
+      return dialogueButtonIndex === 0
+    }
+
+    return true
+  }
+
   render () {
-    const { location, data, params, config } = this.props
+    const { location, data, config } = this.props
     let note = null
-
     if (location.query.key != null) {
-      const noteKey = location.query.key
-      const allNotes = data.noteMap.map(note => note)
-      const trashedNotes = data.trashedSet.toJS().map(uniqueKey => data.noteMap.get(uniqueKey))
-      let displayedNotes = allNotes
+      const splitted = location.query.key.split('-')
+      const storageKey = splitted.shift()
+      const noteKey = splitted.shift()
 
-      if (location.pathname.match(/\/searched/)) {
-        const searchStr = params.searchword
-        displayedNotes = searchStr === undefined || searchStr === '' ? allNotes
-          : searchFromNotes(allNotes, searchStr)
-      }
-
-      if (location.pathname.match(/\/tags/)) {
-        const listOfTags = params.tagname.split(' ')
-        displayedNotes = data.noteMap.map(note => note).filter(note =>
-          listOfTags.every(tag => note.tags.includes(tag))
-        )
-      }
-
-      if (location.pathname.match(/\/trashed/)) {
-        displayedNotes = trashedNotes
-      } else {
-        displayedNotes = _.differenceWith(displayedNotes, trashedNotes, (note, trashed) => note.key === trashed.key)
-      }
-
-      const noteKeys = displayedNotes.map(note => note.key)
-      if (noteKeys.includes(noteKey)) {
-        note = data.noteMap.get(noteKey)
-      }
+      note = data.noteMap.get(storageKey + '-' + noteKey)
     }
 
     if (note == null) {
@@ -77,7 +70,7 @@ class Detail extends React.Component {
           tabIndex='0'
         >
           <div styleName='empty'>
-            <div styleName='empty-message'>{OSX ? i18n.__('Command(⌘)') : i18n.__('Ctrl(^)')} + N<br />{i18n.__('to create a new note')}</div>
+            <div styleName='empty-message'>{OSX ? 'Command(⌘)' : 'Ctrl(^)'} + N<br />to create a new note</div>
           </div>
           <StatusBar
             {..._.pick(this.props, ['config', 'location', 'dispatch'])}
@@ -91,6 +84,7 @@ class Detail extends React.Component {
         <SnippetNoteDetail
           note={note}
           config={config}
+          confirmDeletion={(permanent) => this.confirmDeletion(permanent)}
           ref='root'
           {..._.pick(this.props, [
             'dispatch',
@@ -107,6 +101,7 @@ class Detail extends React.Component {
       <MarkdownNoteDetail
         note={note}
         config={config}
+        confirmDeletion={(permanent) => this.confirmDeletion(permanent)}
         ref='root'
         {..._.pick(this.props, [
           'dispatch',
@@ -128,4 +123,4 @@ Detail.propTypes = {
   ignorePreviewPointerEvents: PropTypes.bool
 }
 
-export default debounceRender(CSSModules(Detail, styles))
+export default CSSModules(Detail, styles)

browser/main/Main.js

@@ -14,14 +14,12 @@ import mobileAnalytics from 'browser/main/lib/AwsMobileAnalyticsConfig'
 import eventEmitter from 'browser/main/lib/eventEmitter'
 import { hashHistory } from 'react-router'
 import store from 'browser/main/store'
-import i18n from 'browser/lib/i18n'
-import { getLocales } from 'browser/lib/Languages'
-import applyShortcuts from 'browser/main/lib/shortcutManager'
 const path = require('path')
 const electron = require('electron')
 const { remote } = electron
 
 class Main extends React.Component {
+
   constructor (props) {
     super(props)
 
@@ -56,13 +54,13 @@ class Main extends React.Component {
   init () {
     dataApi
       .addStorage({
-        name: 'My Storage Location',
+        name: 'My Storage',
         path: path.join(remote.app.getPath('home'), 'Boostnote')
       })
-      .then(data => {
+      .then((data) => {
         return data
       })
-      .then(data => {
+      .then((data) => {
         if (data.storage.folders[0] != null) {
           return data
         } else {
@@ -71,7 +69,7 @@ class Main extends React.Component {
               color: '#1278BD',
               name: 'Default'
             })
-            .then(_data => {
+            .then((_data) => {
               return {
                 storage: _data.storage,
                 notes: data.notes
@@ -79,7 +77,8 @@ class Main extends React.Component {
             })
         }
       })
-      .then(data => {
+      .then((data) => {
+        console.log(data)
         store.dispatch({
           type: 'ADD_STORAGE',
           storage: data.storage,
@@ -96,16 +95,16 @@ 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>'
               },
               {
                 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)'
               }
             ]
           })
-          .then(note => {
+          .then((note) => {
             store.dispatch({
               type: 'UPDATE_NOTE',
               note: note
@@ -118,7 +117,7 @@ class Main extends React.Component {
             title: 'Welcome to Boostnote!',
             content: '# Welcome to Boostnote!\n## Click here to edit markdown :wave:\n\n<iframe width="560" height="315" src="https://www.youtube.com/embed/L0qNPLsvmyM" frameborder="0" allowfullscreen></iframe>\n\n## Docs :memo:\n- [Boostnote | Boost your happiness, productivity and creativity.](https://hackernoon.com/boostnote-boost-your-happiness-productivity-and-creativity-315034efeebe)\n- [Cloud Syncing & Backups](https://github.com/BoostIO/Boostnote/wiki/Cloud-Syncing-and-Backup)\n- [How to sync your data across Desktop and Mobile apps](https://github.com/BoostIO/Boostnote/wiki/Sync-Data-Across-Desktop-and-Mobile-apps)\n- [Convert data from **Evernote** to Boostnote.](https://github.com/BoostIO/Boostnote/wiki/Evernote)\n- [Keyboard Shortcuts](https://github.com/BoostIO/Boostnote/wiki/Keyboard-Shortcuts)\n- [Keymaps in Editor mode](https://github.com/BoostIO/Boostnote/wiki/Keymaps-in-Editor-mode)\n- [How to set syntax highlight in Snippet note](https://github.com/BoostIO/Boostnote/wiki/Syntax-Highlighting)\n\n---\n\n## Article Archive :books:\n- [Reddit English](http://bit.ly/2mOJPu7)\n- [Reddit Spanish](https://www.reddit.com/r/boostnote_es/)\n- [Reddit Chinese](https://www.reddit.com/r/boostnote_cn/)\n- [Reddit Japanese](https://www.reddit.com/r/boostnote_jp/)\n\n---\n\n## Community :beers:\n- [GitHub](http://bit.ly/2AWWzkD)\n- [Twitter](http://bit.ly/2z8BUJZ)\n- [Facebook Group](http://bit.ly/2jcca8t)'
           })
-          .then(note => {
+          .then((note) => {
             store.dispatch({
               type: 'UPDATE_NOTE',
               note: note
@@ -129,10 +128,10 @@ class Main extends React.Component {
           .then(defaultMarkdownNote)
           .then(() => data.storage)
       })
-      .then(storage => {
+      .then((storage) => {
         hashHistory.push('/storages/' + storage.key)
       })
-      .catch(err => {
+      .catch((err) => {
         throw err
       })
   }
@@ -140,35 +139,30 @@ class Main extends React.Component {
   componentDidMount () {
     const { dispatch, config } = this.props
 
-    const supportedThemes = ['dark', 'white', 'solarized-dark', 'monokai', 'dracula']
-
-    if (supportedThemes.indexOf(config.ui.theme) !== -1) {
-      document.body.setAttribute('data-theme', config.ui.theme)
+    if (config.ui.theme === 'dark') {
+      document.body.setAttribute('data-theme', 'dark')
+    } else if (config.ui.theme === 'white') {
+      document.body.setAttribute('data-theme', 'white')
+    } else if (config.ui.theme === 'solarized-dark') {
+      document.body.setAttribute('data-theme', 'solarized-dark')
     } else {
       document.body.setAttribute('data-theme', 'default')
     }
 
-    if (getLocales().indexOf(config.ui.language) !== -1) {
-      i18n.setLocale(config.ui.language)
-    } else {
-      i18n.setLocale('en')
-    }
-    applyShortcuts()
     // Reload all data
-    dataApi.init().then(data => {
-      dispatch({
-        type: 'INIT_ALL',
-        storages: data.storages,
-        notes: data.notes
+    dataApi.init()
+      .then((data) => {
+        dispatch({
+          type: 'INIT_ALL',
+          storages: data.storages,
+          notes: data.notes
+        })
+
+        if (data.storages.length < 1) {
+          this.init()
+        }
       })
 
-      if (data.storages.length < 1) {
-        this.init()
-      }
-    })
-
-    delete CodeMirror.keyMap.emacs['Ctrl-V']
-
     eventEmitter.on('editor:fullscreen', this.toggleFullScreen)
   }
 
@@ -193,40 +187,34 @@ class Main extends React.Component {
   handleMouseUp (e) {
     // Change width of NoteList component.
     if (this.state.isRightSliderFocused) {
-      this.setState(
-        {
-          isRightSliderFocused: false
-        },
-        () => {
-          const { dispatch } = this.props
-          const newListWidth = this.state.listWidth
-          // TODO: ConfigManager should dispatch itself.
-          ConfigManager.set({ listWidth: newListWidth })
-          dispatch({
-            type: 'SET_LIST_WIDTH',
-            listWidth: newListWidth
-          })
-        }
-      )
+      this.setState({
+        isRightSliderFocused: false
+      }, () => {
+        const { dispatch } = this.props
+        const newListWidth = this.state.listWidth
+        // TODO: ConfigManager should dispatch itself.
+        ConfigManager.set({listWidth: newListWidth})
+        dispatch({
+          type: 'SET_LIST_WIDTH',
+          listWidth: newListWidth
+        })
+      })
     }
 
     // Change width of SideNav component.
     if (this.state.isLeftSliderFocused) {
-      this.setState(
-        {
-          isLeftSliderFocused: false
-        },
-        () => {
-          const { dispatch } = this.props
-          const navWidth = this.state.navWidth
-          // TODO: ConfigManager should dispatch itself.
-          ConfigManager.set({ navWidth })
-          dispatch({
-            type: 'SET_NAV_WIDTH',
-            navWidth
-          })
-        }
-      )
+      this.setState({
+        isLeftSliderFocused: false
+      }, () => {
+        const { dispatch } = this.props
+        const navWidth = this.state.navWidth
+        // TODO: ConfigManager should dispatch itself.
+        ConfigManager.set({ navWidth })
+        dispatch({
+          type: 'SET_NAV_WIDTH',
+          navWidth
+        })
+      })
     }
   }
 
@@ -271,8 +259,8 @@ class Main extends React.Component {
   }
 
   hideLeftLists (noteDetail, noteList, mainBody) {
-    this.setState({ noteDetailWidth: noteDetail.style.left })
-    this.setState({ mainBodyWidth: mainBody.style.left })
+    this.setState({noteDetailWidth: noteDetail.style.left})
+    this.setState({mainBodyWidth: mainBody.style.left})
     noteDetail.style.left = '0px'
     mainBody.style.left = '0px'
     noteList.style.display = 'none'
@@ -294,36 +282,33 @@ class Main extends React.Component {
       <div
         className='Main'
         styleName='root'
-        onMouseMove={e => this.handleMouseMove(e)}
-        onMouseUp={e => this.handleMouseUp(e)}
+        onMouseMove={(e) => this.handleMouseMove(e)}
+        onMouseUp={(e) => this.handleMouseUp(e)}
       >
         <SideNav
-          {..._.pick(this.props, ['dispatch', 'data', 'config', 'params', 'location'])}
+          {..._.pick(this.props, [
+            'dispatch',
+            'data',
+            'config',
+            'location'
+          ])}
           width={this.state.navWidth}
         />
         {!config.isSideNavFolded &&
-          <div
-            styleName={
-              this.state.isLeftSliderFocused ? 'slider--active' : 'slider'
-            }
-            style={{ left: this.state.navWidth }}
-            onMouseDown={e => this.handleLeftSlideMouseDown(e)}
+          <div styleName={this.state.isLeftSliderFocused ? 'slider--active' : 'slider'}
+            style={{left: this.state.navWidth}}
+            onMouseDown={(e) => this.handleLeftSlideMouseDown(e)}
             draggable='false'
           >
             <div styleName='slider-hitbox' />
-          </div>}
-        <div
-          styleName={config.isSideNavFolded ? 'body--expanded' : 'body'}
+          </div>
+        }
+        <div styleName={config.isSideNavFolded ? 'body--expanded' : 'body'}
           id='main-body'
           ref='body'
-          style={{
-            left: config.isSideNavFolded
-              ? foldedNavigationWidth
-              : this.state.navWidth
-          }}
+          style={{left: config.isSideNavFolded ? foldedNavigationWidth : this.state.navWidth}}
         >
-          <TopBar
-            style={{ width: this.state.listWidth }}
+          <TopBar style={{width: this.state.listWidth}}
             {..._.pick(this.props, [
               'dispatch',
               'config',
@@ -332,8 +317,7 @@ class Main extends React.Component {
               'location'
             ])}
           />
-          <NoteList
-            style={{ width: this.state.listWidth }}
+          <NoteList style={{width: this.state.listWidth}}
             {..._.pick(this.props, [
               'dispatch',
               'data',
@@ -342,20 +326,15 @@ class Main extends React.Component {
               'location'
             ])}
           />
-          <div
-            styleName={
-              this.state.isRightSliderFocused
-                ? 'slider-right--active'
-                : 'slider-right'
-            }
-            style={{ left: this.state.listWidth - 1 }}
-            onMouseDown={e => this.handleRightSlideMouseDown(e)}
+          <div styleName={this.state.isRightSliderFocused ? 'slider-right--active' : 'slider-right'}
+            style={{left: this.state.listWidth - 1}}
+            onMouseDown={(e) => this.handleRightSlideMouseDown(e)}
             draggable='false'
           >
             <div styleName='slider-hitbox' />
           </div>
           <Detail
-            style={{ left: this.state.listWidth }}
+            style={{left: this.state.listWidth}}
             {..._.pick(this.props, [
               'dispatch',
               'data',
@@ -383,4 +362,4 @@ Main.propTypes = {
   data: PropTypes.shape({}).isRequired
 }
 
-export default connect(x => x)(CSSModules(Main, styles))
+export default connect((x) => x)(CSSModules(Main, styles))

browser/main/NewNoteButton/NewNoteButton.styl

@@ -74,12 +74,4 @@ body[data-theme="dark"]
 
 body[data-theme="solarized-dark"]
   .root, .root--expanded
-    background-color $ui-solarized-dark-noteList-backgroundColor
-
-body[data-theme="monokai"]
-  .root, .root--expanded
-    background-color $ui-monokai-noteList-backgroundColor
-
-body[data-theme="dracula"]
-  .root, .root--expanded
-    background-color $ui-dracula-noteList-backgroundColor
+    background-color $ui-solarized-dark-noteList-backgroundColor

browser/main/NewNoteButton/index.js

@@ -6,8 +6,6 @@ import _ from 'lodash'
 import modal from 'browser/main/lib/modal'
 import NewNoteModal from 'browser/main/modals/NewNoteModal'
 import eventEmitter from 'browser/main/lib/eventEmitter'
-import i18n from 'browser/lib/i18n'
-import { createMarkdownNote, createSnippetNote } from 'browser/lib/newNote'
 
 const { remote } = require('electron')
 const { dialog } = remote
@@ -35,23 +33,15 @@ class NewNoteButton extends React.Component {
   }
 
   handleNewNoteButtonClick (e) {
-    const { location, params, dispatch, config } = this.props
+    const { location, dispatch } = this.props
     const { storage, folder } = this.resolveTargetFolder()
 
-    if (config.ui.defaultNote === 'MARKDOWN_NOTE') {
-      createMarkdownNote(storage.key, folder.key, dispatch, location, params, config)
-    } else if (config.ui.defaultNote === 'SNIPPET_NOTE') {
-      createSnippetNote(storage.key, folder.key, dispatch, location, params, config)
-    } else {
-      modal.open(NewNoteModal, {
-        storage: storage.key,
-        folder: folder.key,
-        dispatch,
-        location,
-        params,
-        config
-      })
-    }
+    modal.open(NewNoteModal, {
+      storage: storage.key,
+      folder: folder.key,
+      dispatch,
+      location
+    })
   }
 
   resolveTargetFolder () {
@@ -66,9 +56,9 @@ class NewNoteButton extends React.Component {
       }
     }
 
-    if (storage == null) this.showMessageBox(i18n.__('No storage to create a note'))
+    if (storage == null) this.showMessageBox('No storage to create a note')
     const folder = _.find(storage.folders, {key: params.folderKey}) || storage.folders[0]
-    if (folder == null) this.showMessageBox(i18n.__('No folder to create a note'))
+    if (folder == null) this.showMessageBox('No folder to create a note')
 
     return {
       storage,
@@ -96,7 +86,7 @@ class NewNoteButton extends React.Component {
             onClick={(e) => this.handleNewNoteButtonClick(e)}>
             <img styleName='iconTag' src='../resources/icon/icon-newnote.svg' />
             <span styleName='control-newNoteButton-tooltip'>
-              {i18n.__('Make a note')} {OSX ? '⌘' : i18n.__('Ctrl')} + N
+              Make a note {OSX ? '⌘' : 'Ctrl'} + N
             </span>
           </button>
         </div>

browser/main/NoteList/NoteList.styl

@@ -84,7 +84,7 @@ body[data-theme="dark"]
     color $ui-dark-inactive-text-color
     &:hover
       color $ui-dark-text-color
-
+  
   .control-button--active
     color $ui-dark-text-color
     &:active
@@ -109,56 +109,8 @@ body[data-theme="solarized-dark"]
     color $ui-solarized-dark-inactive-text-color
     &:hover
       color $ui-solarized-dark-text-color
-
+  
   .control-button--active
     color $ui-solarized-dark-text-color
     &:active
-      color $ui-solarized-dark-text-color
-
-body[data-theme="monokai"]
-  .root
-    border-color $ui-monokai-borderColor
-    background-color $ui-monokai-noteList-backgroundColor
-
-  .control
-    background-color $ui-monokai-noteList-backgroundColor
-    border-color $ui-monokai-borderColor
-
-  .control-sortBy-select
-    &:hover
-      transition 0.2s
-      color $ui-monokai-text-color
-
-  .control-button
-    color $ui-monokai-inactive-text-color
-    &:hover
-      color $ui-monokai-text-color
-
-  .control-button--active
-    color $ui-monokai-text-color
-    &:active
-      color $ui-monokai-text-color
-
-body[data-theme="dracula"]
-  .root
-    border-color $ui-dracula-borderColor
-    background-color $ui-dracula-noteList-backgroundColor
-
-  .control
-    background-color $ui-dracula-noteList-backgroundColor
-    border-color $ui-dracula-borderColor
-
-  .control-sortBy-select
-    &:hover
-      transition 0.2s
-      color $ui-dracula-text-color
-
-  .control-button
-    color $ui-dracula-inactive-text-color
-    &:hover
-      color $ui-dracula-text-color
-
-  .control-button--active
-    color $ui-dracula-text-color
-    &:active
-      color $ui-dracula-text-color
+      color $ui-solarized-dark-text-color

browser/main/NoteList/index.js

@@ -1,14 +1,11 @@
-/* global electron */
 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'
 import ee from 'browser/main/lib/eventEmitter'
 import dataApi from 'browser/main/lib/dataApi'
-import attachmentManagement from 'browser/main/lib/dataApi/attachmentManagement'
 import ConfigManager from 'browser/main/lib/ConfigManager'
 import NoteItem from 'browser/components/NoteItem'
 import NoteItemSimple from 'browser/components/NoteItemSimple'
@@ -16,16 +13,10 @@ import searchFromNotes from 'browser/lib/search'
 import fs from 'fs'
 import path from 'path'
 import { hashHistory } from 'react-router'
-import copy from 'copy-to-clipboard'
 import AwsMobileAnalyticsConfig from 'browser/main/lib/AwsMobileAnalyticsConfig'
-import Markdown from '../../lib/markdown'
-import i18n from 'browser/lib/i18n'
-import { confirmDeleteNote } from 'browser/lib/confirmDeleteNote'
-import context from 'browser/lib/context'
 
 const { remote } = require('electron')
-const { dialog } = remote
-const WP_POST_PATH = '/wp/v2/posts'
+const { Menu, MenuItem, dialog } = remote
 
 function sortByCreatedAt (a, b) {
   return new Date(b.createdAt) - new Date(a.createdAt)
@@ -40,7 +31,7 @@ function sortByUpdatedAt (a, b) {
 }
 
 function findNoteByKey (notes, noteKey) {
-  return notes.find((note) => note.key === noteKey)
+  return notes.find((note) => `${note.storage}-${note.key}` === noteKey)
 }
 
 function findNotesByKeys (notes, noteKeys) {
@@ -48,7 +39,7 @@ function findNotesByKeys (notes, noteKeys) {
 }
 
 function getNoteKey (note) {
-  return note.key
+  return `${note.storage}-${note.key}`
 }
 
 class NoteList extends React.Component {
@@ -56,6 +47,7 @@ class NoteList extends React.Component {
     super(props)
 
     this.selectNextNoteHandler = () => {
+      console.log('fired next')
       this.selectNextNote()
     }
     this.selectPriorNoteHandler = () => {
@@ -64,29 +56,20 @@ class NoteList extends React.Component {
     this.focusHandler = () => {
       this.refs.list.focus()
     }
-    this.alertIfSnippetHandler = (event, msg) => {
-      this.alertIfSnippet(msg)
+    this.alertIfSnippetHandler = () => {
+      this.alertIfSnippet()
     }
     this.importFromFileHandler = this.importFromFile.bind(this)
     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)
-    this.getNoteStorage = this.getNoteStorage.bind(this)
-    this.getNoteFolder = this.getNoteFolder.bind(this)
-    this.getViewType = this.getViewType.bind(this)
-    this.restoreNote = this.restoreNote.bind(this)
-    this.copyNoteLink = this.copyNoteLink.bind(this)
-    this.navigate = this.navigate.bind(this)
 
     // TODO: not Selected noteKeys but SelectedNote(for reusing)
     this.state = {
-      ctrlKeyDown: false,
       shiftKeyDown: false,
-      prevShiftNoteIndex: -1,
       selectedNoteKeys: []
     }
 
@@ -97,12 +80,10 @@ 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)
     ee.on('list:jump', this.jumpNoteByHash)
-    ee.on('list:navigate', this.navigate)
   }
 
   componentWillReceiveProps (nextProps) {
@@ -120,7 +101,6 @@ 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)
@@ -129,27 +109,14 @@ class NoteList extends React.Component {
 
   componentDidUpdate (prevProps) {
     const { location } = this.props
-    const { selectedNoteKeys } = this.state
-    const visibleNoteKeys = this.notes.map(note => note.key)
-    const note = this.notes[0]
-    const prevKey = prevProps.location.query.key
-    const noteKey = visibleNoteKeys.includes(prevKey) ? prevKey : note && note.key
 
-    if (note && location.query.key == null) {
+    if (this.notes.length > 0 && location.query.key == null) {
       const { router } = this.context
       if (!location.pathname.match(/\/searched/)) this.contextNotes = this.getContextNotes()
-
-      // A visible note is an active note
-      if (!selectedNoteKeys.includes(noteKey)) {
-        if (selectedNoteKeys.length === 1) selectedNoteKeys.pop()
-        selectedNoteKeys.push(noteKey)
-        ee.emit('list:moved')
-      }
-
       router.replace({
         pathname: location.pathname,
         query: {
-          key: noteKey
+          key: this.notes[0].storage + '-' + this.notes[0].key
         }
       })
       return
@@ -176,15 +143,16 @@ class NoteList extends React.Component {
     }
   }
 
-  focusNote (selectedNoteKeys, noteKey, pathname) {
+  focusNote (selectedNoteKeys, noteKey) {
     const { router } = this.context
+    const { location } = this.props
 
     this.setState({
       selectedNoteKeys
     })
 
     router.push({
-      pathname,
+      pathname: location.pathname,
       query: {
         key: noteKey
       }
@@ -203,7 +171,6 @@ class NoteList extends React.Component {
     }
     let { selectedNoteKeys } = this.state
     const { shiftKeyDown } = this.state
-    const { location } = this.props
 
     let targetIndex = this.getTargetIndex()
 
@@ -220,7 +187,7 @@ class NoteList extends React.Component {
       selectedNoteKeys.push(priorNoteKey)
     }
 
-    this.focusNote(selectedNoteKeys, priorNoteKey, location.pathname)
+    this.focusNote(selectedNoteKeys, priorNoteKey)
 
     ee.emit('list:moved')
   }
@@ -231,7 +198,6 @@ 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
@@ -254,7 +220,7 @@ class NoteList extends React.Component {
       selectedNoteKeys.push(nextNoteKey)
     }
 
-    this.focusNote(selectedNoteKeys, nextNoteKey, location.pathname)
+    this.focusNote(selectedNoteKeys, nextNoteKey)
 
     ee.emit('list:moved')
   }
@@ -266,48 +232,41 @@ class NoteList extends React.Component {
     }
 
     const selectedNoteKeys = [noteHash]
-    this.focusNote(selectedNoteKeys, noteHash, '/home')
+    this.focusNote(selectedNoteKeys, noteHash)
 
     ee.emit('list:moved')
   }
 
   handleNoteListKeyDown (e) {
-    if (e.metaKey) return true
+    if (e.metaKey || e.ctrlKey) return true
 
-    // A key
     if (e.keyCode === 65 && !e.shiftKey) {
       e.preventDefault()
       ee.emit('top:new-note')
     }
 
-    // E key
+    if (e.keyCode === 68) {
+      e.preventDefault()
+      this.deleteNote()
+    }
+
     if (e.keyCode === 69) {
       e.preventDefault()
       ee.emit('detail:focus')
     }
 
-    // L or S key
-    if (e.keyCode === 76 || e.keyCode === 83) {
-      e.preventDefault()
-      ee.emit('top:focus-search')
-    }
-
-    // UP or K key
-    if (e.keyCode === 38 || e.keyCode === 75) {
+    if (e.keyCode === 38) {
       e.preventDefault()
       this.selectPriorNote()
     }
 
-    // DOWN or J key
-    if (e.keyCode === 40 || e.keyCode === 74) {
+    if (e.keyCode === 40) {
       e.preventDefault()
       this.selectNextNote()
     }
 
     if (e.shiftKey) {
       this.setState({ shiftKeyDown: true })
-    } else if (e.ctrlKey) {
-      this.setState({ ctrlKeyDown: true })
     }
   }
 
@@ -315,10 +274,6 @@ class NoteList extends React.Component {
     if (!e.shiftKey) {
       this.setState({ shiftKeyDown: false })
     }
-
-    if (!e.ctrlKey) {
-      this.setState({ ctrlKeyDown: false })
-    }
   }
 
   getNotes () {
@@ -337,10 +292,8 @@ class NoteList extends React.Component {
     }
 
     if (location.pathname.match(/\/searched/)) {
-      const searchInputText = params.searchword
-      const allNotes = data.noteMap.map((note) => note)
-      this.contextNotes = allNotes
-      if (searchInputText === undefined || searchInputText === '') {
+      const searchInputText = document.getElementsByClassName('searchInput')[0].value
+      if (searchInputText === '') {
         return this.sortByPin(this.contextNotes)
       }
       return searchFromNotes(this.contextNotes, searchInputText)
@@ -353,10 +306,11 @@ class NoteList extends React.Component {
     }
 
     if (location.pathname.match(/\/tags/)) {
-      const listOfTags = params.tagname.split(' ')
       return data.noteMap.map(note => {
         return note
-      }).filter(note => listOfTags.every(tag => note.tags.includes(tag)))
+      }).filter(note => {
+        return note.tags.includes(params.tagname)
+      })
     }
 
     return this.getContextNotes()
@@ -395,65 +349,25 @@ class NoteList extends React.Component {
     return pinnedNotes.concat(unpinnedNotes)
   }
 
-  getNoteIndexByKey (noteKey) {
-    return this.notes.findIndex((note) => {
-      if (!note) return -1
-
-      return note.key === noteKey
-    })
-  }
-
   handleNoteClick (e, uniqueKey) {
     const { router } = this.context
     const { location } = this.props
-    let { selectedNoteKeys, prevShiftNoteIndex } = this.state
-    const { ctrlKeyDown, shiftKeyDown } = this.state
-    const hasSelectedNoteKey = selectedNoteKeys.length > 0
+    let { selectedNoteKeys } = this.state
+    const { shiftKeyDown } = this.state
 
-    if (ctrlKeyDown && selectedNoteKeys.includes(uniqueKey)) {
+    if (shiftKeyDown && selectedNoteKeys.includes(uniqueKey)) {
       const newSelectedNoteKeys = selectedNoteKeys.filter((noteKey) => noteKey !== uniqueKey)
       this.setState({
         selectedNoteKeys: newSelectedNoteKeys
       })
       return
     }
-    if (!ctrlKeyDown && !shiftKeyDown) {
-      selectedNoteKeys = []
-    }
-
     if (!shiftKeyDown) {
-      prevShiftNoteIndex = -1
-    }
-
-    selectedNoteKeys.push(uniqueKey)
-
-    if (shiftKeyDown && hasSelectedNoteKey) {
-      let firstShiftNoteIndex = this.getNoteIndexByKey(selectedNoteKeys[0])
-      // Shift selection can either start from first note in the exisiting selectedNoteKeys
-      // or previous first shift note index
-      firstShiftNoteIndex = firstShiftNoteIndex > prevShiftNoteIndex
-        ? firstShiftNoteIndex : prevShiftNoteIndex
-
-      const lastShiftNoteIndex = this.getNoteIndexByKey(uniqueKey)
-
-      const startIndex = firstShiftNoteIndex < lastShiftNoteIndex
-        ? firstShiftNoteIndex : lastShiftNoteIndex
-      const endIndex = firstShiftNoteIndex > lastShiftNoteIndex
-        ? firstShiftNoteIndex : lastShiftNoteIndex
-
       selectedNoteKeys = []
-      for (let i = startIndex; i <= endIndex; i++) {
-        selectedNoteKeys.push(this.notes[i].key)
-      }
-
-      if (prevShiftNoteIndex < 0) {
-        prevShiftNoteIndex = firstShiftNoteIndex
-      }
     }
-
+    selectedNoteKeys.push(uniqueKey)
     this.setState({
-      selectedNoteKeys,
-      prevShiftNoteIndex
+      selectedNoteKeys
     })
 
     router.push({
@@ -465,10 +379,10 @@ class NoteList extends React.Component {
   }
 
   handleSortByChange (e) {
-    const { dispatch, params: { folderKey } } = this.props
+    const { dispatch } = this.props
 
     const config = {
-      [folderKey]: { sortBy: e.target.value }
+      sortBy: e.target.value
     }
 
     ConfigManager.set(config)
@@ -492,39 +406,25 @@ class NoteList extends React.Component {
     })
   }
 
-  alertIfSnippet (msg) {
-    const warningMessage = (msg) => ({
-      'export-txt': 'Text export',
-      'export-md': 'Markdown export',
-      'export-html': 'HTML export',
-      'print': 'Print'
-    })[msg]
-
+  alertIfSnippet () {
     const targetIndex = this.getTargetIndex()
     if (this.notes[targetIndex].type === 'SNIPPET_NOTE') {
       dialog.showMessageBox(remote.getCurrentWindow(), {
         type: 'warning',
-        message: i18n.__('Sorry!'),
-        detail: i18n.__(warningMessage(msg) + ' is available only in markdown notes.'),
-        buttons: [i18n.__('OK')]
+        message: 'Sorry!',
+        detail: 'md/text import is available only a markdown note.',
+        buttons: ['OK', 'Cancel']
       })
     }
   }
 
   handleDragStart (e, note) {
-    let { selectedNoteKeys } = this.state
-    const noteKey = getNoteKey(note)
-
-    if (!selectedNoteKeys.includes(noteKey)) {
-      selectedNoteKeys = []
-      selectedNoteKeys.push(noteKey)
-    }
-
+    const { selectedNoteKeys } = this.state
     const notes = this.notes.map((note) => Object.assign({}, note))
     const selectedNotes = findNotesByKeys(notes, selectedNoteKeys)
     const noteData = JSON.stringify(selectedNotes)
     e.dataTransfer.setData('note', noteData)
-    this.selectNextNote()
+    this.setState({ selectedNoteKeys: [] })
   }
 
   handleNoteContextMenu (e, uniqueKey) {
@@ -537,106 +437,50 @@ class NoteList extends React.Component {
       this.handleNoteClick(e, uniqueKey)
     }
 
-    const pinLabel = note.isPinned ? i18n.__('Remove pin') : i18n.__('Pin to Top')
-    const deleteLabel = i18n.__('Delete Note')
-    const cloneNote = i18n.__('Clone Note')
-    const restoreNote = i18n.__('Restore Note')
-    const copyNoteLink = i18n.__('Copy Note Link')
-    const publishLabel = i18n.__('Publish Blog')
-    const updateLabel = i18n.__('Update Blog')
-    const openBlogLabel = i18n.__('Open Blog')
+    const pinLabel = note.isPinned ? 'Remove pin' : 'Pin to Top'
+    const deleteLabel = 'Delete Note'
+    const cloneNote = 'Clone Note'
 
-    const templates = []
-
-    if (location.pathname.match(/\/trash/)) {
-      templates.push({
-        label: restoreNote,
-        click: this.restoreNote
-      }, {
-        label: deleteLabel,
-        click: this.deleteNote
-      })
-    } else {
-      if (!location.pathname.match(/\/starred/)) {
-        templates.push({
-          label: pinLabel,
-          click: this.pinToTop
-        })
-      }
-      templates.push({
-        label: deleteLabel,
-        click: this.deleteNote
-      }, {
-        label: cloneNote,
-        click: this.cloneNote.bind(this)
-      }, {
-        label: copyNoteLink,
-        click: this.copyNoteLink.bind(this, note)
-      })
-      if (note.type === 'MARKDOWN_NOTE') {
-        if (note.blog && note.blog.blogLink && note.blog.blogId) {
-          templates.push({
-            label: updateLabel,
-            click: this.publishMarkdown.bind(this)
-          }, {
-            label: openBlogLabel,
-            click: () => this.openBlog.bind(this)(note)
-          })
-        } else {
-          templates.push({
-            label: publishLabel,
-            click: this.publishMarkdown.bind(this)
-          })
-        }
-      }
+    const menu = new Menu()
+    if (!location.pathname.match(/\/home|\/starred|\/trash/)) {
+      menu.append(new MenuItem({
+        label: pinLabel,
+        click: this.pinToTop
+      }))
     }
-    context.popup(templates)
+    menu.append(new MenuItem({
+      label: deleteLabel,
+      click: this.deleteNote
+    }))
+    menu.append(new MenuItem({
+      label: cloneNote,
+      click: this.cloneNote.bind(this)
+    }))
+    menu.popup()
   }
 
-  updateSelectedNotes (updateFunc, cleanSelection = true) {
+  pinToTop () {
     const { selectedNoteKeys } = this.state
     const { dispatch } = this.props
     const notes = this.notes.map((note) => Object.assign({}, note))
     const selectedNotes = findNotesByKeys(notes, selectedNoteKeys)
 
-    if (!_.isFunction(updateFunc)) {
-      console.warn('Update function is not defined. No update will happen')
-      updateFunc = (note) => { return note }
-    }
-
     Promise.all(
-        selectedNotes.map((note) => {
-          note = updateFunc(note)
-          return dataApi
-              .updateNote(note.storage, note.key, note)
-        })
+      selectedNotes.map((note) => {
+        note.isPinned = !note.isPinned
+        return dataApi
+          .updateNote(note.storage, note.key, note)
+      })
     )
-        .then((updatedNotes) => {
-          updatedNotes.forEach((note) => {
-            dispatch({
-              type: 'UPDATE_NOTE',
-              note
-            })
-          })
+    .then((updatedNotes) => {
+      updatedNotes.forEach((note) => {
+        dispatch({
+          type: 'UPDATE_NOTE',
+          note
         })
-
-    if (cleanSelection) {
-      this.selectNextNote()
-    }
-  }
-
-  pinToTop () {
-    this.updateSelectedNotes((note) => {
-      note.isPinned = !note.isPinned
-      return note
-    })
-  }
-
-  restoreNote () {
-    this.updateSelectedNotes((note) => {
-      note.isTrashed = false
-      return note
+      })
     })
+    this.setState({ selectedNoteKeys: [] })
   }
 
   deleteNote () {
@@ -645,15 +489,22 @@ class NoteList extends React.Component {
     const notes = this.notes.map((note) => Object.assign({}, note))
     const selectedNotes = findNotesByKeys(notes, selectedNoteKeys)
     const firstNote = selectedNotes[0]
-    const { confirmDeletion } = this.props.config.ui
 
     if (firstNote.isTrashed) {
-      if (!confirmDeleteNote(confirmDeletion, true)) return
-
+      const noteExp = selectedNotes.length > 1 ? 'notes' : 'note'
+      const dialogueButtonIndex = dialog.showMessageBox(remote.getCurrentWindow(), {
+        type: 'warning',
+        message: 'Confirm note deletion',
+        detail: `This will permanently remove ${selectedNotes.length} ${noteExp}.`,
+        buttons: ['Confirm', 'Cancel']
+      })
+      if (dialogueButtonIndex === 1) return
       Promise.all(
-        selectedNotes.map((note) => {
+        selectedNoteKeys.map((uniqueKey) => {
+          const storageKey = uniqueKey.split('-')[0]
+          const noteKey = uniqueKey.split('-')[1]
           return dataApi
-            .deleteNote(note.storage, note.key)
+            .deleteNote(storageKey, noteKey)
         })
       )
       .then((data) => {
@@ -668,9 +519,8 @@ class NoteList extends React.Component {
       .catch((err) => {
         console.error('Cannot Delete note: ' + err)
       })
+      console.log('Notes were all deleted')
     } else {
-      if (!confirmDeleteNote(confirmDeletion, false)) return
-
       Promise.all(
         selectedNotes.map((note) => {
           note.isTrashed = true
@@ -687,6 +537,7 @@ class NoteList extends React.Component {
           })
         })
         AwsMobileAnalyticsConfig.recordDynamicCustomEvent('EDIT_NOTE')
+        console.log('Notes went to trash')
       })
       .catch((err) => {
         console.error('Notes could not go to trash: ' + err)
@@ -710,152 +561,27 @@ class NoteList extends React.Component {
       .createNote(storage.key, {
         type: firstNote.type,
         folder: folder.key,
-        title: firstNote.title + ' ' + i18n.__('copy'),
+        title: firstNote.title + ' copy',
         content: firstNote.content
       })
       .then((note) => {
-        attachmentManagement.cloneAttachments(firstNote, note)
-        return note
-      })
-      .then((note) => {
+        const uniqueKey = note.storage + '-' + note.key
         dispatch({
           type: 'UPDATE_NOTE',
           note: note
         })
 
         this.setState({
-          selectedNoteKeys: [note.key]
+          selectedNoteKeys: [uniqueKey]
         })
 
         hashHistory.push({
           pathname: location.pathname,
-          query: {key: note.key}
+          query: {key: uniqueKey}
         })
       })
   }
 
-  copyNoteLink (note) {
-    const noteLink = `[${note.title}](:note:${note.key})`
-    return copy(noteLink)
-  }
-
-  navigate (sender, pathname) {
-    const { router } = this.context
-    router.push({
-      pathname,
-      query: {
-        // key: noteKey
-      }
-    })
-  }
-
-  save (note) {
-    const { dispatch } = this.props
-    dataApi
-      .updateNote(note.storage, note.key, note)
-      .then((note) => {
-        dispatch({
-          type: 'UPDATE_NOTE',
-          note: note
-        })
-      })
-  }
-
-  publishMarkdown () {
-    if (this.pendingPublish) {
-      clearTimeout(this.pendingPublish)
-    }
-    this.pendingPublish = setTimeout(() => {
-      this.publishMarkdownNow()
-    }, 1000)
-  }
-
-  publishMarkdownNow () {
-    const {selectedNoteKeys} = this.state
-    const notes = this.notes.map((note) => Object.assign({}, note))
-    const selectedNotes = findNotesByKeys(notes, selectedNoteKeys)
-    const firstNote = selectedNotes[0]
-    const config = ConfigManager.get()
-    const {address, token, authMethod, username, password} = config.blog
-    let authToken = ''
-    if (authMethod === 'USER') {
-      authToken = `Basic ${window.btoa(`${username}:${password}`)}`
-    } else {
-      authToken = `Bearer ${token}`
-    }
-    const contentToRender = firstNote.content.replace(`# ${firstNote.title}`, '')
-    const markdown = new Markdown()
-    const data = {
-      title: firstNote.title,
-      content: markdown.render(contentToRender),
-      status: 'publish'
-    }
-
-    let url = ''
-    let method = ''
-    if (firstNote.blog && firstNote.blog.blogId) {
-      url = `${address}${WP_POST_PATH}/${firstNote.blog.blogId}`
-      method = 'PUT'
-    } else {
-      url = `${address}${WP_POST_PATH}`
-      method = 'POST'
-    }
-    // eslint-disable-next-line no-undef
-    fetch(url, {
-      method: method,
-      body: JSON.stringify(data),
-      headers: {
-        'Authorization': authToken,
-        'Content-Type': 'application/json'
-      }
-    }).then(res => res.json())
-      .then(response => {
-        if (_.isNil(response.link) || _.isNil(response.id)) {
-          return Promise.reject()
-        }
-        firstNote.blog = {
-          blogLink: response.link,
-          blogId: response.id
-        }
-        this.save(firstNote)
-        this.confirmPublish(firstNote)
-      })
-      .catch((error) => {
-        console.error(error)
-        this.confirmPublishError()
-      })
-  }
-
-  confirmPublishError () {
-    const { remote } = electron
-    const { dialog } = remote
-    const alertError = {
-      type: 'warning',
-      message: i18n.__('Publish Failed'),
-      detail: i18n.__('Check and update your blog setting and try again.'),
-      buttons: [i18n.__('Confirm')]
-    }
-    dialog.showMessageBox(remote.getCurrentWindow(), alertError)
-  }
-
-  confirmPublish (note) {
-    const buttonIndex = dialog.showMessageBox(remote.getCurrentWindow(), {
-      type: 'warning',
-      message: i18n.__('Publish Succeeded'),
-      detail: `${note.title} is published at ${note.blog.blogLink}`,
-      buttons: [i18n.__('Confirm'), i18n.__('Open Blog')]
-    })
-
-    if (buttonIndex === 1) {
-      this.openBlog(note)
-    }
-  }
-
-  openBlog (note) {
-    const { shell } = electron
-    shell.openExternal(note.blog.blogLink)
-  }
-
   importFromFile () {
     const options = {
       filters: [
@@ -948,39 +674,20 @@ class NoteList extends React.Component {
     dialog.showMessageBox(remote.getCurrentWindow(), {
       type: 'warning',
       message: message,
-      buttons: [i18n.__('OK')]
+      buttons: ['OK']
     })
   }
 
-  getNoteStorage (note) { // note.storage = storage key
-    return this.props.data.storageMap.toJS()[note.storage]
-  }
-
-  getNoteFolder (note) { // note.folder = folder key
-    return _.find(this.getNoteStorage(note).folders, ({ key }) => key === note.folder)
-  }
-
-  getViewType () {
-    const { pathname } = this.props.location
-    const folder = /\/folders\/[a-zA-Z0-9]+/.test(pathname)
-    const storage = /\/storages\/[a-zA-Z0-9]+/.test(pathname) && !folder
-    const allNotes = pathname === '/home'
-    if (allNotes) return 'ALL'
-    if (folder) return 'FOLDER'
-    if (storage) return 'STORAGE'
-  }
-
   render () {
-    const { location, config, params: { folderKey } } = this.props
+    const { location, config } = this.props
     let { notes } = this.props
     const { selectedNoteKeys } = this.state
-    const sortBy = _.get(config, [folderKey, 'sortBy'], config.sortBy.default)
-    const sortFunc = sortBy === 'CREATED_AT'
+    const sortFunc = config.sortBy === 'CREATED_AT'
       ? sortByCreatedAt
-      : sortBy === 'ALPHABETICAL'
+      : config.sortBy === 'ALPHABETICAL'
       ? sortByAlphabetical
       : sortByUpdatedAt
-    const sortedNotes = location.pathname.match(/\/starred|\/trash/)
+    const sortedNotes = location.pathname.match(/\/home|\/starred|\/trash/)
         ? this.getNotes().sort(sortFunc)
         : this.sortByPin(this.getNotes().sort(sortFunc))
     this.notes = notes = sortedNotes.filter((note) => {
@@ -988,7 +695,7 @@ class NoteList extends React.Component {
       if (note.isTrashed !== true || location.pathname === '/trashed') return true
     })
 
-    moment.updateLocale('en', {
+    moment.locale('en', {
       relativeTime: {
         future: 'in %s',
         past: '%s ago',
@@ -1007,28 +714,17 @@ class NoteList extends React.Component {
       }
     })
 
-    const viewType = this.getViewType()
-
-    const autoSelectFirst =
-      notes.length === 1 ||
-      selectedNoteKeys.length === 0 ||
-      notes.every(note => !selectedNoteKeys.includes(note.key))
-
     const noteList = notes
-      .map((note, index) => {
+      .map(note => {
         if (note == null) {
           return null
         }
 
         const isDefault = config.listStyle === 'DEFAULT'
         const uniqueKey = getNoteKey(note)
-
-        const isActive =
-          selectedNoteKeys.includes(uniqueKey) ||
-          notes.length === 1 ||
-          (autoSelectFirst && index === 0)
+        const isActive = selectedNoteKeys.includes(uniqueKey)
         const dateDisplay = moment(
-          sortBy === 'CREATED_AT'
+          config.sortBy === 'CREATED_AT'
             ? note.createdAt : note.updatedAt
         ).fromNow('D')
 
@@ -1043,10 +739,6 @@ class NoteList extends React.Component {
               handleNoteClick={this.handleNoteClick.bind(this)}
               handleDragStart={this.handleDragStart.bind(this)}
               pathname={location.pathname}
-              folderName={this.getNoteFolder(note).name}
-              storageName={this.getNoteStorage(note).name}
-              viewType={viewType}
-              showTagsAlphabetically={config.ui.showTagsAlphabetically}
             />
           )
         }
@@ -1060,9 +752,6 @@ class NoteList extends React.Component {
             handleNoteClick={this.handleNoteClick.bind(this)}
             handleDragStart={this.handleDragStart.bind(this)}
             pathname={location.pathname}
-            folderName={this.getNoteFolder(note).name}
-            storageName={this.getNoteStorage(note).name}
-            viewType={viewType}
           />
         )
       })
@@ -1077,17 +766,16 @@ class NoteList extends React.Component {
           <div styleName='control-sortBy'>
             <i className='fa fa-angle-down' />
             <select styleName='control-sortBy-select'
-              title={i18n.__('Select filter mode')}
-              value={sortBy}
+              value={config.sortBy}
               onChange={(e) => this.handleSortByChange(e)}
             >
-              <option title='Sort by update time' value='UPDATED_AT'>{i18n.__('Updated')}</option>
-              <option title='Sort by create time' value='CREATED_AT'>{i18n.__('Created')}</option>
-              <option title='Sort alphabetically' value='ALPHABETICAL'>{i18n.__('Alphabetically')}</option>
+              <option value='UPDATED_AT'>Updated</option>
+              <option value='CREATED_AT'>Created</option>
+              <option value='ALPHABETICAL'>Alphabetically</option>
             </select>
           </div>
           <div styleName='control-button-area'>
-            <button title={i18n.__('Default View')} styleName={config.listStyle === 'DEFAULT'
+            <button styleName={config.listStyle === 'DEFAULT'
                 ? 'control-button--active'
                 : 'control-button'
               }
@@ -1095,7 +783,7 @@ class NoteList extends React.Component {
             >
               <img styleName='iconTag' src='../resources/icon/icon-column.svg' />
             </button>
-            <button title={i18n.__('Compressed View')} styleName={config.listStyle === 'SMALL'
+            <button styleName={config.listStyle === 'SMALL'
                 ? 'control-button--active'
                 : 'control-button'
               }
@@ -1129,4 +817,4 @@ NoteList.propTypes = {
   })
 }
 
-export default debounceRender(CSSModules(NoteList, styles))
+export default CSSModules(NoteList, styles)

browser/main/SideNav/ListButton.js

@@ -2,7 +2,6 @@ import PropTypes from 'prop-types'
 import React from 'react'
 import CSSModules from 'browser/lib/CSSModules'
 import styles from './SwitchButton.styl'
-import i18n from 'browser/lib/i18n'
 
 const ListButton = ({
   onClick, isTagActive
@@ -13,7 +12,7 @@ const ListButton = ({
         : '../resources/icon/icon-list-active.svg'
     }
     />
-    <span styleName='tooltip'>{i18n.__('Notes')}</span>
+    <span styleName='tooltip'>Notes</span>
   </button>
 )
 

browser/main/SideNav/PreferenceButton.js

@@ -2,14 +2,13 @@ import PropTypes from 'prop-types'
 import React from 'react'
 import CSSModules from 'browser/lib/CSSModules'
 import styles from './PreferenceButton.styl'
-import i18n from 'browser/lib/i18n'
 
 const PreferenceButton = ({
   onClick
 }) => (
   <button styleName='top-menu-preference' onClick={(e) => onClick(e)}>
     <img styleName='iconTag' src='../resources/icon/icon-setting.svg' />
-    <span styleName='tooltip'>{i18n.__('Preferences')}</span>
+    <span styleName='tooltip'>Preferences</span>
   </button>
 )
 

browser/main/SideNav/PreferenceButton.styl

@@ -48,5 +48,4 @@ body[data-theme="dark"]
   line-height normal
   border-radius 2px
   opacity 0
-  transition 0.1s
-  white-space nowrap
+  transition 0.1s

browser/main/SideNav/SideNav.styl

@@ -19,7 +19,7 @@
   text-align center
 
 
-
+  
 .top-menu-label
   margin-left 5px
   overflow ellipsis
@@ -30,33 +30,11 @@
   display flex
   flex-direction column
 
-.tag-control
-  display flex
-  height 30px
-  line-height 25px
-  overflow hidden
-  .tag-control-title
-    padding-left 15px
-    padding-bottom 13px
-    flex 1
-    p
-      color $ui-button-default-color
-  .tag-control-sortTagsBy
-    user-select none
-    font-size 12px
-    color $ui-inactive-text-color
-    margin-left 12px
-    margin-right 12px
-    .tag-control-sortTagsBy-select
-      appearance: none;
-      margin-left 5px
-      color $ui-inactive-text-color
-      padding 0
-      border none
-      background-color transparent
-      outline none
-      cursor pointer
-      font-size 12px
+.tag-title
+  padding-left 15px
+  padding-bottom 13px
+  p
+    color $ui-button-default-color
 
 .tagList
   overflow-y auto
@@ -117,13 +95,3 @@ body[data-theme="solarized-dark"]
   .root, .root--folded
     background-color $ui-solarized-dark-backgroundColor
     border-right 1px solid $ui-solarized-dark-borderColor
-
-body[data-theme="monokai"]
-  .root, .root--folded
-    background-color $ui-monokai-backgroundColor
-    border-right 1px solid $ui-monokai-borderColor
-
-body[data-theme="dracula"]
-  .root, .root--folded
-    background-color $ui-dracula-backgroundColor
-    border-right 1px solid $ui-dracula-borderColor

browser/main/SideNav/StorageItem.js

@@ -9,65 +9,43 @@ import RenameFolderModal from 'browser/main/modals/RenameFolderModal'
 import dataApi from 'browser/main/lib/dataApi'
 import StorageItemChild from 'browser/components/StorageItem'
 import _ from 'lodash'
-import { SortableElement } from 'react-sortable-hoc'
-import i18n from 'browser/lib/i18n'
-import context from 'browser/lib/context'
 
 const { remote } = require('electron')
-const { dialog } = remote
-const escapeStringRegexp = require('escape-string-regexp')
-const path = require('path')
+const { Menu, dialog } = remote
 
 class StorageItem extends React.Component {
   constructor (props) {
     super(props)
 
-    const { storage } = this.props
-
     this.state = {
-      isOpen: !!storage.isOpen,
-      draggedOver: null
+      isOpen: true
     }
   }
 
   handleHeaderContextMenu (e) {
-    context.popup([
+    const menu = Menu.buildFromTemplate([
       {
-        label: i18n.__('Add Folder'),
+        label: 'Add Folder',
         click: (e) => this.handleAddFolderButtonClick(e)
       },
       {
         type: 'separator'
       },
       {
-        label: i18n.__('Export Storage'),
-        submenu: [
-          {
-            label: i18n.__('Export as txt'),
-            click: (e) => this.handleExportStorageClick(e, 'txt')
-          },
-          {
-            label: i18n.__('Export as md'),
-            click: (e) => this.handleExportStorageClick(e, 'md')
-          }
-        ]
-      },
-      {
-        type: 'separator'
-      },
-      {
-        label: i18n.__('Unlink Storage'),
+        label: 'Unlink Storage',
         click: (e) => this.handleUnlinkStorageClick(e)
       }
     ])
+
+    menu.popup()
   }
 
   handleUnlinkStorageClick (e) {
     const index = dialog.showMessageBox(remote.getCurrentWindow(), {
       type: 'warning',
-      message: i18n.__('Unlink Storage'),
-      detail: i18n.__('This work will just detatches a storage from Boostnote. (Any data won\'t be deleted.)'),
-      buttons: [i18n.__('Confirm'), i18n.__('Cancel')]
+      message: 'Unlink Storage',
+      detail: 'This work will just detatches a storage from Boostnote. (Any data won\'t be deleted.)',
+      buttons: ['Confirm', 'Cancel']
     })
 
     if (index === 0) {
@@ -85,43 +63,9 @@ class StorageItem extends React.Component {
     }
   }
 
-  handleExportStorageClick (e, fileType) {
-    const options = {
-      properties: ['openDirectory', 'createDirectory'],
-      buttonLabel: i18n.__('Select directory'),
-      title: i18n.__('Select a folder to export the files to'),
-      multiSelections: false
-    }
-    dialog.showOpenDialog(remote.getCurrentWindow(), options,
-      (paths) => {
-        if (paths && paths.length === 1) {
-          const { storage, dispatch } = this.props
-          dataApi
-            .exportStorage(storage.key, fileType, paths[0])
-            .then(data => {
-              dispatch({
-                type: 'EXPORT_STORAGE',
-                storage: data.storage,
-                fileType: data.fileType
-              })
-            })
-        }
-      })
-  }
-
   handleToggleButtonClick (e) {
-    const { storage, dispatch } = this.props
-    const isOpen = !this.state.isOpen
-    dataApi.toggleStorage(storage.key, isOpen)
-      .then((storage) => {
-        dispatch({
-          type: 'EXPAND_STORAGE',
-          storage,
-          isOpen
-        })
-      })
     this.setState({
-      isOpen: isOpen
+      isOpen: !this.state.isOpen
     })
   }
 
@@ -146,23 +90,23 @@ class StorageItem extends React.Component {
   }
 
   handleFolderButtonContextMenu (e, folder) {
-    context.popup([
+    const menu = Menu.buildFromTemplate([
       {
-        label: i18n.__('Rename Folder'),
+        label: 'Rename Folder',
         click: (e) => this.handleRenameFolderClick(e, folder)
       },
       {
         type: 'separator'
       },
       {
-        label: i18n.__('Export Folder'),
+        label: 'Export Folder',
         submenu: [
           {
-            label: i18n.__('Export as txt'),
+            label: 'Export as txt',
             click: (e) => this.handleExportFolderClick(e, folder, 'txt')
           },
           {
-            label: i18n.__('Export as md'),
+            label: 'Export as md',
             click: (e) => this.handleExportFolderClick(e, folder, 'md')
           }
         ]
@@ -171,10 +115,12 @@ class StorageItem extends React.Component {
         type: 'separator'
       },
       {
-        label: i18n.__('Delete Folder'),
+        label: 'Delete Folder',
         click: (e) => this.handleFolderDeleteClick(e, folder)
       }
     ])
+
+    menu.popup()
   }
 
   handleRenameFolderClick (e, folder) {
@@ -188,8 +134,8 @@ class StorageItem extends React.Component {
   handleExportFolderClick (e, folder, fileType) {
     const options = {
       properties: ['openDirectory', 'createDirectory'],
-      buttonLabel: i18n.__('Select directory'),
-      title: i18n.__('Select a folder to export the files to'),
+      buttonLabel: 'Select directory',
+      title: 'Select a folder to export the files to',
       multiSelections: false
     }
     dialog.showOpenDialog(remote.getCurrentWindow(), options,
@@ -205,20 +151,6 @@ 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
           })
       }
     })
@@ -227,9 +159,9 @@ class StorageItem extends React.Component {
   handleFolderDeleteClick (e, folder) {
     const index = dialog.showMessageBox(remote.getCurrentWindow(), {
       type: 'warning',
-      message: i18n.__('Delete Folder'),
-      detail: i18n.__('This will delete all notes in the folder and can not be undone.'),
-      buttons: [i18n.__('Confirm'), i18n.__('Cancel')]
+      message: 'Delete Folder',
+      detail: 'This will delete all notes in the folder and can not be undone.',
+      buttons: ['Confirm', 'Cancel']
     })
 
     if (index === 0) {
@@ -246,35 +178,46 @@ class StorageItem extends React.Component {
     }
   }
 
-  handleDragEnter (e, key) {
-    e.preventDefault()
-    if (this.state.draggedOver === key) { return }
-    this.setState({
-      draggedOver: key
-    })
+  handleDragEnter (e) {
+    e.dataTransfer.setData('defaultColor', e.target.style.backgroundColor)
+    e.target.style.backgroundColor = 'rgba(129, 130, 131, 0.08)'
   }
 
   handleDragLeave (e) {
-    e.preventDefault()
-    if (this.state.draggedOver === null) { return }
-    this.setState({
-      draggedOver: null
-    })
+    e.target.style.opacity = '1'
+    e.target.style.backgroundColor = e.dataTransfer.getData('defaultColor')
   }
 
   dropNote (storage, folder, dispatch, location, noteData) {
     noteData = noteData.filter((note) => folder.key !== note.folder)
     if (noteData.length === 0) return
+    const newNoteData = noteData.map((note) => Object.assign({}, note, {storage: storage, folder: folder.key}))
 
     Promise.all(
-      noteData.map((note) => dataApi.moveNote(note.storage, note.key, storage.key, folder.key))
+      newNoteData.map((note) => dataApi.createNote(storage.key, note))
     )
     .then((createdNoteData) => {
-      createdNoteData.forEach((newNote) => {
+      createdNoteData.forEach((note) => {
         dispatch({
-          type: 'MOVE_NOTE',
-          originNote: noteData.find((note) => note.content === newNote.oldContent),
-          note: newNote
+          type: 'UPDATE_NOTE',
+          note: note
+        })
+      })
+    })
+    .catch((err) => {
+      console.error(`error on create notes: ${err}`)
+    })
+    .then(() => {
+      return Promise.all(
+        noteData.map((note) => dataApi.deleteNote(note.storage, note.key))
+      )
+    })
+    .then((deletedNoteData) => {
+      deletedNoteData.forEach((note) => {
+        dispatch({
+          type: 'DELETE_NOTE',
+          storageKey: note.storageKey,
+          noteKey: note.noteKey
         })
       })
     })
@@ -284,12 +227,8 @@ class StorageItem extends React.Component {
   }
 
   handleDrop (e, storage, folder, dispatch, location) {
-    e.preventDefault()
-    if (this.state.draggedOver !== null) {
-      this.setState({
-        draggedOver: null
-      })
-    }
+    e.target.style.opacity = '1'
+    e.target.style.backgroundColor = e.dataTransfer.getData('defaultColor')
     const noteData = JSON.parse(e.dataTransfer.getData('note'))
     this.dropNote(storage, folder, dispatch, location, noteData)
   }
@@ -297,10 +236,8 @@ class StorageItem extends React.Component {
   render () {
     const { storage, location, isFolded, data, dispatch } = this.props
     const { folderNoteMap, trashedSet } = data
-    const SortableStorageItemChild = SortableElement(StorageItemChild)
-    const folderList = storage.folders.map((folder, index) => {
-      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 folderList = storage.folders.map((folder) => {
+      const isActive = !!(location.pathname.match(new RegExp('\/storages\/' + storage.key + '\/folders\/' + folder.key)))
       const noteSet = folderNoteMap.get(storage.key + '-' + folder.key)
 
       let noteCount = 0
@@ -313,39 +250,32 @@ class StorageItem extends React.Component {
         noteCount = noteSet.size - trashedNoteCount
       }
       return (
-        <SortableStorageItemChild
+        <StorageItemChild
           key={folder.key}
-          index={index}
-          isActive={isActive || folder.key === this.state.draggedOver}
+          isActive={isActive}
           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={(e) => {
-            this.handleDragEnter(e, folder.key)
-          }}
-          handleDragLeave={(e) => {
-            this.handleDragLeave(e, folder)
-          }}
+          handleDrop={(e) => this.handleDrop(e, storage, folder, dispatch, location)}
+          handleDragEnter={this.handleDragEnter}
+          handleDragLeave={this.handleDragLeave}
         />
       )
     })
 
-    const isActive = location.pathname.match(new RegExp(escapeStringRegexp(path.sep) + 'storages' + escapeStringRegexp(path.sep) + storage.key + '$'))
+    const isActive = location.pathname.match(new RegExp('\/storages\/' + storage.key + '$'))
 
     return (
       <div styleName={isFolded ? 'root--folded' : 'root'}
         key={storage.key}
       >
         <div styleName={isActive
-          ? 'header--active'
-          : 'header'
-        }
+            ? 'header--active'
+            : 'header'
+          }
           onContextMenu={(e) => this.handleHeaderContextMenu(e)}
         >
           <button styleName='header-toggleButton'
@@ -354,7 +284,7 @@ class StorageItem extends React.Component {
             <img src={this.state.isOpen
               ? '../resources/icon/icon-down.svg'
               : '../resources/icon/icon-right.svg'
-            }
+              }
             />
           </button>
 

browser/main/SideNav/StorageItem.styl

@@ -44,7 +44,7 @@
   height 36px
   padding-left 25px
   padding-right 15px
-  line-height 36px
+  line-height 22px
   cursor pointer
   font-size 14px
   border none
@@ -147,7 +147,7 @@ body[data-theme="dark"]
       background-color $ui-dark-button--active-backgroundColor
       &:active
         color $ui-dark-text-color
-        background-color $ui-dark-button--active-backgroundColor
+        background-color $ui-dark-button--active-backgroundColor  
 
   .header--active
     .header-addFolderButton
@@ -180,7 +180,7 @@ body[data-theme="dark"]
     &:active, &:active:hover
       color $ui-dark-text-color
       background-color $ui-dark-button--active-backgroundColor
-
+      
 
 
 

browser/main/SideNav/SwitchButton.styl

@@ -29,7 +29,6 @@
   border-radius 2px
   opacity 0
   transition 0.1s
-  white-space nowrap
 
 body[data-theme="white"]
   .non-active-button

browser/main/SideNav/TagButton.js

@@ -2,7 +2,6 @@ import PropTypes from 'prop-types'
 import React from 'react'
 import CSSModules from 'browser/lib/CSSModules'
 import styles from './SwitchButton.styl'
-import i18n from 'browser/lib/i18n'
 
 const TagButton = ({
   onClick, isTagActive
@@ -13,7 +12,7 @@ const TagButton = ({
         : '../resources/icon/icon-tag.svg'
     }
     />
-    <span styleName='tooltip'>{i18n.__('Tags')}</span>
+    <span styleName='tooltip'>Tags</span>
   </button>
 )
 

browser/main/SideNav/index.js

@@ -1,7 +1,6 @@
 import PropTypes from 'prop-types'
 import React from 'react'
 import CSSModules from 'browser/lib/CSSModules'
-import dataApi from 'browser/main/lib/dataApi'
 import styles from './SideNav.styl'
 import { openModal } from 'browser/main/lib/modal'
 import PreferencesModal from '../modals/PreferencesModal'
@@ -15,15 +14,6 @@ import EventEmitter from 'browser/main/lib/eventEmitter'
 import PreferenceButton from './PreferenceButton'
 import ListButton from './ListButton'
 import TagButton from './TagButton'
-import {SortableContainer} from 'react-sortable-hoc'
-import i18n from 'browser/lib/i18n'
-import context from 'browser/lib/context'
-import { remote } from 'electron'
-import { confirmDeleteNote } from 'browser/lib/confirmDeleteNote'
-
-function matchActiveTags (tags, activeTags) {
-  return _.every(activeTags, v => tags.indexOf(v) >= 0)
-}
 
 class SideNav extends React.Component {
   // TODO: should not use electron stuff v0.7
@@ -36,52 +26,6 @@ class SideNav extends React.Component {
     EventEmitter.off('side:preferences', this.handleMenuButtonClick)
   }
 
-  deleteTag (tag) {
-    const selectedButton = remote.dialog.showMessageBox(remote.getCurrentWindow(), {
-      ype: 'warning',
-      message: i18n.__('Confirm tag deletion'),
-      detail: i18n.__('This will permanently remove this tag.'),
-      buttons: [i18n.__('Confirm'), i18n.__('Cancel')]
-    })
-
-    if (selectedButton === 0) {
-      const { data, dispatch, location, params } = this.props
-
-      const notes = data.noteMap
-        .map(note => note)
-        .filter(note => note.tags.indexOf(tag) !== -1)
-        .map(note => {
-          note = Object.assign({}, note)
-          note.tags = note.tags.slice()
-
-          note.tags.splice(note.tags.indexOf(tag), 1)
-
-          return note
-        })
-
-      Promise
-        .all(notes.map(note => dataApi.updateNote(note.storage, note.key, note)))
-        .then(updatedNotes => {
-          updatedNotes.forEach(note => {
-            dispatch({
-              type: 'UPDATE_NOTE',
-              note
-            })
-          })
-
-          if (location.pathname.match('/tags')) {
-            const tags = params.tagname.split(' ')
-            const index = tags.indexOf(tag)
-            if (index !== -1) {
-              tags.splice(index, 1)
-
-              this.context.router.push(`/tags/${tags.map(tag => encodeURIComponent(tag)).join(' ')}`)
-            }
-          }
-        })
-    }
-  }
-
   handleMenuButtonClick (e) {
     openModal(PreferencesModal)
   }
@@ -96,17 +40,6 @@ class SideNav extends React.Component {
     router.push('/starred')
   }
 
-  handleTagContextMenu (e, tag) {
-    const menu = []
-
-    menu.push({
-      label: i18n.__('Delete Tag'),
-      click: this.deleteTag.bind(this, tag)
-    })
-
-    context.popup(menu)
-  }
-
   handleToggleButtonClick (e) {
     const { dispatch, config } = this.props
 
@@ -132,19 +65,8 @@ class SideNav extends React.Component {
     router.push('/alltags')
   }
 
-  onSortEnd (storage) {
-    return ({oldIndex, newIndex}) => {
-      const { dispatch } = this.props
-      dataApi
-        .reorderFolder(storage.key, oldIndex, newIndex)
-        .then((data) => {
-          dispatch({ type: 'REORDER_FOLDER', storage: data.storage })
-        })
-    }
-  }
-
   SideNavComponent (isFolded, storageList) {
-    const { location, data, config } = this.props
+    const { location, data } = this.props
 
     const isHomeActive = !!location.pathname.match(/^\/home$/)
     const isStarredActive = !!location.pathname.match(/^\/starred$/)
@@ -164,36 +86,20 @@ class SideNav extends React.Component {
             isTrashedActive={isTrashedActive}
             handleStarredButtonClick={(e) => this.handleStarredButtonClick(e)}
             handleTrashedButtonClick={(e) => this.handleTrashedButtonClick(e)}
-            counterTotalNote={data.noteMap._map.size - data.trashedSet._set.size}
+            counterTotalNote={data.noteMap._map.size}
             counterStarredNote={data.starredSet._set.size}
             counterDelNote={data.trashedSet._set.size}
-            handleFilterButtonContextMenu={this.handleFilterButtonContextMenu.bind(this)}
           />
 
-          <StorageList storageList={storageList} isFolded={isFolded} />
+          <StorageList storageList={storageList} />
           <NavToggleButton isFolded={isFolded} handleToggleButtonClick={this.handleToggleButtonClick.bind(this)} />
         </div>
       )
     } else {
       component = (
         <div styleName='tabBody'>
-          <div styleName='tag-control'>
-            <div styleName='tag-control-title'>
-              <p>{i18n.__('Tags')}</p>
-            </div>
-            <div styleName='tag-control-sortTagsBy'>
-              <i className='fa fa-angle-down' />
-              <select styleName='tag-control-sortTagsBy-select'
-                title={i18n.__('Select filter mode')}
-                value={config.sortTagsBy}
-                onChange={(e) => this.handleSortTagsByChange(e)}
-              >
-                <option title='Sort alphabetically'
-                  value='ALPHABETICAL'>{i18n.__('Alphabetically')}</option>
-                <option title='Sort by update time'
-                  value='COUNTER'>{i18n.__('Counter')}</option>
-              </select>
-            </div>
+          <div styleName='tag-title'>
+            <p>Tags</p>
           </div>
           <div styleName='tagList'>
             {this.tagListComponent(data)}
@@ -206,129 +112,31 @@ class SideNav extends React.Component {
   }
 
   tagListComponent () {
-    const { data, location, config } = this.props
-    const activeTags = this.getActiveTags(location.pathname)
-    const relatedTags = this.getRelatedTags(activeTags, data.noteMap)
-    let tagList = _.sortBy(data.tagNoteMap.map(
-      (tag, name) => ({ name, size: tag.size, related: relatedTags.has(name) })
-    ).filter(
-      tag => tag.size > 0
-    ), ['name'])
-    if (config.ui.enableLiveNoteCounts && activeTags.length !== 0) {
-      const notesTags = data.noteMap.map(note => note.tags)
-      tagList = tagList.map(tag => {
-        tag.size = notesTags.filter(tags => tags.includes(tag.name) && matchActiveTags(tags, activeTags)).length
-        return tag
-      })
-    }
-    if (config.sortTagsBy === 'COUNTER') {
-      tagList = _.sortBy(tagList, item => (0 - item.size))
-    }
-    if (config.ui.showOnlyRelatedTags && (relatedTags.size > 0)) {
-      tagList = tagList.filter(
-        tag => tag.related
-      )
-    }
+    const { data, location } = this.props
+    const tagList = data.tagNoteMap.map((tag, key) => {
+      return key
+    })
     return (
-      tagList.map(tag => {
-        return (
-          <TagListItem
-            name={tag.name}
-            handleClickTagListItem={this.handleClickTagListItem.bind(this)}
-            handleClickNarrowToTag={this.handleClickNarrowToTag.bind(this)}
-            handleContextMenu={this.handleTagContextMenu.bind(this)}
-            isActive={this.getTagActive(location.pathname, tag.name)}
-            isRelated={tag.related}
-            key={tag.name}
-            count={tag.size}
-          />
-        )
-      })
+      tagList.map(tag => (
+        <TagListItem
+          name={tag}
+          handleClickTagListItem={this.handleClickTagListItem.bind(this)}
+          isActive={this.getTagActive(location.pathname, tag)}
+          key={tag}
+        />
+      ))
     )
   }
 
-  getRelatedTags (activeTags, noteMap) {
-    if (activeTags.length === 0) {
-      return new Set()
-    }
-    const relatedNotes = noteMap.map(
-      note => ({key: note.key, tags: note.tags})
-    ).filter(
-      note => activeTags.every(tag => note.tags.includes(tag))
-    )
-    const relatedTags = new Set()
-    relatedNotes.forEach(note => note.tags.map(tag => relatedTags.add(tag)))
-    return relatedTags
-  }
-
   getTagActive (path, tag) {
-    return this.getActiveTags(path).includes(tag)
-  }
-
-  getActiveTags (path) {
     const pathSegments = path.split('/')
-    const tags = pathSegments[pathSegments.length - 1]
-    return (tags === 'alltags')
-      ? []
-      : decodeURIComponent(tags).split(' ')
+    const pathTag = pathSegments[pathSegments.length - 1]
+    return pathTag === tag
   }
 
   handleClickTagListItem (name) {
     const { router } = this.context
-    router.push(`/tags/${encodeURIComponent(name)}`)
-  }
-
-  handleSortTagsByChange (e) {
-    const { dispatch } = this.props
-
-    const config = {
-      sortTagsBy: e.target.value
-    }
-
-    ConfigManager.set(config)
-    dispatch({
-      type: 'SET_CONFIG',
-      config
-    })
-  }
-
-  handleClickNarrowToTag (tag) {
-    const { router } = this.context
-    const { location } = this.props
-    const listOfTags = this.getActiveTags(location.pathname)
-    const indexOfTag = listOfTags.indexOf(tag)
-    if (indexOfTag > -1) {
-      listOfTags.splice(indexOfTag, 1)
-    } else {
-      listOfTags.push(tag)
-    }
-    router.push(`/tags/${encodeURIComponent(listOfTags.join(' '))}`)
-  }
-
-  emptyTrash (entries) {
-    const { dispatch } = this.props
-    const deletionPromises = entries.map((note) => {
-      return dataApi.deleteNote(note.storage, note.key)
-    })
-    const { confirmDeletion } = this.props.config.ui
-    if (!confirmDeleteNote(confirmDeletion, true)) return
-    Promise.all(deletionPromises)
-    .then((arrayOfStorageAndNoteKeys) => {
-      arrayOfStorageAndNoteKeys.forEach(({ storageKey, noteKey }) => {
-        dispatch({ type: 'DELETE_NOTE', storageKey, noteKey })
-      })
-    })
-    .catch((err) => {
-      console.error('Cannot Delete note: ' + err)
-    })
-  }
-
-  handleFilterButtonContextMenu (event) {
-    const { data } = this.props
-    const trashedNotes = data.trashedSet.toJS().map((uniqueKey) => data.noteMap.get(uniqueKey))
-    context.popup([
-      { label: i18n.__('Empty Trash'), click: () => this.emptyTrash(trashedNotes) }
-    ])
+    router.push(`/tags/${name}`)
   }
 
   render () {
@@ -337,16 +145,13 @@ class SideNav extends React.Component {
     const isFolded = config.isSideNavFolded
 
     const storageList = data.storageMap.map((storage, key) => {
-      const SortableStorageItem = SortableContainer(StorageItem)
-      return <SortableStorageItem
+      return <StorageItem
         key={storage.key}
         storage={storage}
         data={data}
         location={location}
         isFolded={isFolded}
         dispatch={dispatch}
-        onSortEnd={this.onSortEnd.bind(this)(storage)}
-        useDragHandle
       />
     })
     const style = {}

browser/main/StatusBar/StatusBar.styl

@@ -21,20 +21,21 @@
     color white
 
 .zoom
-  navButtonColor()
-  color rgba(0,0,0,.54)
-  height 20px
-  display flex
-  padding 0
-  align-items center
-  background-color transparent
-  &:hover
-    color $ui-active-color
-  &:active
-    color $ui-active-color
-  span
-    margin-left 5px
-
+  display none
+  // navButtonColor()
+  // color rgba(0,0,0,.54)
+  // height 20px
+  // display flex
+  // padding 0
+  // align-items center
+  // background-color transparent
+  // &:hover
+  //   color $ui-active-color
+  // &:active
+  //   color $ui-active-color
+  // span
+  //   margin-left 5px
+  
 .update
   navButtonColor()
   height 24px
@@ -47,14 +48,6 @@
 .update-icon
   color $brand-color
 
-body[data-theme="default"]
-  .zoom
-    color $ui-text-color
-
-body[data-theme="white"]
-  .zoom
-    color $ui-text-color
-
 body[data-theme="dark"]
   .root
     border-color $ui-dark-borderColor
@@ -77,25 +70,3 @@ body[data-theme="dark"]
     navDarkButtonColor()
     border-color $ui-dark-borderColor
     border-left 1px solid $ui-dark-borderColor
-
-body[data-theme="monokai"]
-   navButtonColor()
-  .zoom
-    border-color $ui-dark-borderColor
-    color $ui-monokai-text-color
-    &:hover
-      transition 0.15s
-      color $ui-monokai-active-color
-    &:active
-      color $ui-monokai-active-color
-
-body[data-theme="dracula"]
-   navButtonColor()
-  .zoom
-    border-color $ui-dark-borderColor
-    color $ui-dracula-text-color
-    &:hover
-      transition 0.15s
-      color $ui-dracula-active-color
-    &:active
-      color $ui-dracula-active-color

browser/main/StatusBar/index.js

@@ -3,43 +3,20 @@ import React from 'react'
 import CSSModules from 'browser/lib/CSSModules'
 import styles from './StatusBar.styl'
 import ZoomManager from 'browser/main/lib/ZoomManager'
-import i18n from 'browser/lib/i18n'
-import context from 'browser/lib/context'
-import EventEmitter from 'browser/main/lib/eventEmitter'
 
 const electron = require('electron')
 const { remote, ipcRenderer } = electron
-const { dialog } = remote
+const { Menu, MenuItem, dialog } = remote
 
 const zoomOptions = [0.8, 0.9, 1, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7, 1.8, 1.9, 2.0]
 
 class StatusBar extends React.Component {
-
-  constructor (props) {
-    super(props)
-    this.handleZoomInMenuItem = this.handleZoomInMenuItem.bind(this)
-    this.handleZoomOutMenuItem = this.handleZoomOutMenuItem.bind(this)
-    this.handleZoomResetMenuItem = this.handleZoomResetMenuItem.bind(this)
-  }
-
-  componentDidMount () {
-    EventEmitter.on('status:zoomin', this.handleZoomInMenuItem)
-    EventEmitter.on('status:zoomout', this.handleZoomOutMenuItem)
-    EventEmitter.on('status:zoomreset', this.handleZoomResetMenuItem)
-  }
-
-  componentWillUnmount () {
-    EventEmitter.off('status:zoomin', this.handleZoomInMenuItem)
-    EventEmitter.off('status:zoomout', this.handleZoomOutMenuItem)
-    EventEmitter.off('status:zoomreset', this.handleZoomResetMenuItem)
-  }
-
   updateApp () {
     const index = dialog.showMessageBox(remote.getCurrentWindow(), {
       type: 'warning',
-      message: i18n.__('Update Boostnote'),
-      detail: i18n.__('New Boostnote is ready to be installed.'),
-      buttons: [i18n.__('Restart & Install'), i18n.__('Not Now')]
+      message: 'Update Boostnote',
+      detail: 'New Boostnote is ready to be installed.',
+      buttons: ['Restart & Install', 'Not Now']
     })
 
     if (index === 0) {
@@ -48,16 +25,16 @@ class StatusBar extends React.Component {
   }
 
   handleZoomButtonClick (e) {
-    const templates = []
+    const menu = new Menu()
 
     zoomOptions.forEach((zoom) => {
-      templates.push({
+      menu.append(new MenuItem({
         label: Math.floor(zoom * 100) + '%',
         click: () => this.handleZoomMenuItemClick(zoom)
-      })
+      }))
     })
 
-    context.popup(templates)
+    menu.popup(remote.getCurrentWindow())
   }
 
   handleZoomMenuItemClick (zoomFactor) {
@@ -69,20 +46,6 @@ class StatusBar extends React.Component {
     })
   }
 
-  handleZoomInMenuItem () {
-    const zoomFactor = ZoomManager.getZoom() + 0.1
-    this.handleZoomMenuItemClick(zoomFactor)
-  }
-
-  handleZoomOutMenuItem () {
-    const zoomFactor = ZoomManager.getZoom() - 0.1
-    this.handleZoomMenuItemClick(zoomFactor)
-  }
-
-  handleZoomResetMenuItem () {
-    this.handleZoomMenuItemClick(1.0)
-  }
-
   render () {
     const { config, status } = this.context
 
@@ -99,7 +62,7 @@ class StatusBar extends React.Component {
 
         {status.updateReady
           ? <button onClick={this.updateApp} styleName='update'>
-            <i styleName='update-icon' className='fa fa-cloud-download' /> {i18n.__('Ready to Update!')}
+            <i styleName='update-icon' className='fa fa-cloud-download' /> Ready to Update!
           </button>
           : null
         }