Merge branch 'master' into attachment_refactoring

2026-01-27 23:57:17 +00:00 · 2018-04-26 16:24:58 -07:00
parent d2163dacf9 ea27a3b449
commit 05009d40c4
25 changed files with 835 additions and 329 deletions
--- a/browser/components/MarkdownPreview.js
+++ b/browser/components/MarkdownPreview.js
@@ -517,6 +517,15 @@ export default class MarkdownPreview extends React.Component {
  }

  handlelinkClick (e) {
+    e.preventDefault()
+    e.stopPropagation()
+
+    const href = e.target.href
+    if (href.match(/^http/i)) {
+      shell.openExternal(href)
+      return
+    }
+
    const noteHash = e.target.href.split('/').pop()
    // this will match the new uuid v4 hash and the old hash
    // e.g.
--- a/browser/components/SideNavFilter.js
+++ b/browser/components/SideNavFilter.js
@@ -51,7 +51,7 @@ const SideNavFilter = ({
    </button>

    <button styleName={isTrashedActive ? 'menu-button-trash--active' : 'menu-button'}
-      onClick={handleTrashedButtonClick}
+      onClick={handleTrashedButtonClick} onContextMenu={handleFilterButtonContextMenu}
    >
      <div styleName='iconWrap'>
        <img src={isTrashedActive
@@ -60,7 +60,7 @@ const SideNavFilter = ({
        }
        />
      </div>
-      <span onContextMenu={handleFilterButtonContextMenu} styleName='menu-button-label'>{i18n.__('Trash')}</span>
+      <span styleName='menu-button-label'>{i18n.__('Trash')}</span>
      <span styleName='counters'>{counterDelNote}</span>
    </button>

--- a/browser/components/TagListItem.js
+++ b/browser/components/TagListItem.js
@@ -9,16 +9,26 @@ 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, isActive, count}) => (
-  <button styleName={isActive ? 'tagList-item-active' : 'tagList-item'} onClick={() => handleClickTagListItem(name)}>
-    <span styleName='tagList-item-name'>
-      {`# ${name}`}
-      <span styleName='tagList-item-count'> {count}</span>
-    </span>
-  </button>
+const TagListItem = ({name, handleClickTagListItem, handleClickNarrowToTag, isActive, isRelated, count}) => (
+  <div styleName='tagList-itemContainer'>
+    {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}</span>
+      </span>
+    </button>
+  </div>
 )

 TagListItem.propTypes = {
--- a/browser/components/TagListItem.styl
+++ b/browser/components/TagListItem.styl
@@ -1,5 +1,9 @@
+.tagList-itemContainer
+  display flex
+
 .tagList-item
  display flex
+  flex 1
  width 100%
  height 26px
  background-color transparent
@@ -20,9 +24,16 @@
    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
@@ -36,10 +47,16 @@
    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 15px
+  padding 0 8px 0 4px
  height 26px
  line-height 26px
  border-width 0 0 0 2px
@@ -49,7 +66,10 @@
  text-overflow ellipsis

 .tagList-item-count
-  padding 0 3px
+  float right
+  line-height 26px
+  padding-right 15px
+  font-size 13px

 body[data-theme="white"]
  .tagList-item
--- a/browser/lib/Languages.js
+++ b/browser/lib/Languages.js
@@ -0,0 +1,75 @@
+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',
+    locale: 'pt'
+  },
+  {
+    name: 'Russian',
+    locale: 'ru'
+  },
+  {
+    name: 'Spanish',
+    locale: 'es-ES'
+  }
+]
+
+module.exports = {
+  getLocales () {
+    return languages.reduce(function (localeList, locale) {
+      localeList.push(locale.locale)
+      return localeList
+    }, [])
+  },
+  getLanguages () {
+    return languages
+  }
+}
+
--- a/browser/lib/confirmDeleteNote.js
+++ b/browser/lib/confirmDeleteNote.js
@@ -0,0 +1,23 @@
+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
+}
--- a/browser/lib/i18n.js
+++ b/browser/lib/i18n.js
@@ -1,11 +1,12 @@
 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: ['en', 'sq', 'zh-CN', 'zh-TW', 'da', 'fr', 'de', 'hu', 'ja', 'ko', 'no', 'pl', 'pt', 'es-ES'],
+  locales: getLocales(),
  extension: '.json',
  directory: process.env.NODE_ENV === 'production'
    ? path.join(app.getAppPath(), './locales')
--- a/browser/main/Detail/MarkdownNoteDetail.js
+++ b/browser/main/Detail/MarkdownNoteDetail.js
@@ -28,6 +28,7 @@ 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'

 class MarkdownNoteDetail extends React.Component {
  constructor (props) {
@@ -181,10 +182,10 @@ class MarkdownNoteDetail extends React.Component {
  handleTrashButtonClick (e) {
    const { note } = this.state
    const { isTrashed } = note
-    const { confirmDeletion } = this.props
+    const { confirmDeletion } = this.props.config.ui

    if (isTrashed) {
-      if (confirmDeletion(true)) {
+      if (confirmDeleteNote(confirmDeletion, true)) {
        const {note, dispatch} = this.props
        dataApi
          .deleteNote(note.storage, note.key)
@@ -201,7 +202,7 @@ class MarkdownNoteDetail extends React.Component {
          .then(() => ee.emit('list:next'))
      }
    } else {
-      if (confirmDeletion()) {
+      if (confirmDeleteNote(confirmDeletion, false)) {
        note.isTrashed = true

        this.setState({
@@ -439,8 +440,7 @@ MarkdownNoteDetail.propTypes = {
  style: PropTypes.shape({
    left: PropTypes.number
  }),
-  ignorePreviewPointerEvents: PropTypes.bool,
-  confirmDeletion: PropTypes.bool.isRequired
+  ignorePreviewPointerEvents: PropTypes.bool
 }

 export default CSSModules(MarkdownNoteDetail, styles)
--- a/browser/main/Detail/SnippetNoteDetail.js
+++ b/browser/main/Detail/SnippetNoteDetail.js
@@ -27,6 +27,7 @@ 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'

 function pass (name) {
  switch (name) {
@@ -197,10 +198,10 @@ class SnippetNoteDetail extends React.Component {
  handleTrashButtonClick (e) {
    const { note } = this.state
    const { isTrashed } = note
-    const { confirmDeletion } = this.props
+    const { confirmDeletion } = this.props.config.ui

    if (isTrashed) {
-      if (confirmDeletion(true)) {
+      if (confirmDeleteNote(confirmDeletion, true)) {
        const {note, dispatch} = this.props
        dataApi
          .deleteNote(note.storage, note.key)
@@ -217,7 +218,7 @@ class SnippetNoteDetail extends React.Component {
          .then(() => ee.emit('list:next'))
      }
    } else {
-      if (confirmDeletion()) {
+      if (confirmDeleteNote(confirmDeletion, false)) {
        note.isTrashed = true

        this.setState({
@@ -883,8 +884,7 @@ SnippetNoteDetail.propTypes = {
  style: PropTypes.shape({
    left: PropTypes.number
  }),
-  ignorePreviewPointerEvents: PropTypes.bool,
-  confirmDeletion: PropTypes.bool.isRequired
+  ignorePreviewPointerEvents: PropTypes.bool
 }

 export default CSSModules(SnippetNoteDetail, styles)
--- a/browser/main/Detail/index.js
+++ b/browser/main/Detail/index.js
@@ -33,26 +33,6 @@ 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: i18n.__('Confirm note deletion'),
-        detail: i18n.__('This will permanently remove this note.'),
-        buttons: [i18n.__('Confirm'), i18n.__('Cancel')]
-      }
-
-      const dialogueButtonIndex = dialog.showMessageBox(remote.getCurrentWindow(), alertConfig)
-      return dialogueButtonIndex === 0
-    }
-
-    return true
-  }
-
  render () {
    const { location, data, config } = this.props
    let note = null
@@ -82,7 +62,6 @@ class Detail extends React.Component {
        <SnippetNoteDetail
          note={note}
          config={config}
-          confirmDeletion={(permanent) => this.confirmDeletion(permanent)}
          ref='root'
          {..._.pick(this.props, [
            'dispatch',
@@ -99,7 +78,6 @@ class Detail extends React.Component {
      <MarkdownNoteDetail
        note={note}
        config={config}
-        confirmDeletion={(permanent) => this.confirmDeletion(permanent)}
        ref='root'
        {..._.pick(this.props, [
          'dispatch',
--- a/browser/main/Main.js
+++ b/browser/main/Main.js
@@ -15,6 +15,7 @@ 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'
 const path = require('path')
 const electron = require('electron')
 const { remote } = electron
@@ -152,24 +153,7 @@ class Main extends React.Component {
      document.body.setAttribute('data-theme', 'default')
    }

-    const supportedLanguages = [
-      'sq',
-      'zh-CN',
-      'zh-TW',
-      'da',
-      'fr',
-      'de',
-      'hu',
-      'ja',
-      'ko',
-      'no',
-      'pl',
-      'pt',
-      'ru',
-      'es-ES'
-    ]
-
-    if (supportedLanguages.indexOf(config.ui.language) !== -1) {
+    if (getLocales().indexOf(config.ui.language) !== -1) {
      i18n.setLocale(config.ui.language)
    } else {
      i18n.setLocale('en')
--- a/browser/main/NoteList/index.js
+++ b/browser/main/NoteList/index.js
@@ -18,6 +18,7 @@ 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'

 const { remote } = require('electron')
 const { Menu, MenuItem, dialog } = remote
@@ -281,8 +282,8 @@ class NoteList extends React.Component {
      ee.emit('detail:focus')
    }

-    // F or S key
-    if (e.keyCode === 70 || e.keyCode === 83) {
+    // L or S key
+    if (e.keyCode === 76 || e.keyCode === 83) {
      e.preventDefault()
      ee.emit('top:focus-search')
    }
@@ -342,11 +343,10 @@ class NoteList extends React.Component {
    }

    if (location.pathname.match(/\/tags/)) {
+      const listOfTags = params.tagname.split(' ')
      return data.noteMap.map(note => {
        return note
-      }).filter(note => {
-        return note.tags.includes(params.tagname)
-      })
+      }).filter(note => listOfTags.every(tag => note.tags.includes(tag)))
    }

    return this.getContextNotes()
@@ -585,16 +585,11 @@ 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) {
-      const noteExp = selectedNotes.length > 1 ? 'notes' : 'note'
-      const dialogueButtonIndex = dialog.showMessageBox(remote.getCurrentWindow(), {
-        type: 'warning',
-        message: i18n.__('Confirm note deletion'),
-        detail: `This will permanently remove ${selectedNotes.length} ${noteExp}.`,
-        buttons: [i18n.__('Confirm'), i18n.__('Cancel')]
-      })
-      if (dialogueButtonIndex === 1) return
+      if (!confirmDeleteNote(confirmDeletion, true)) return
+
      Promise.all(
        selectedNotes.map((note) => {
          return dataApi
@@ -615,6 +610,8 @@ class NoteList extends React.Component {
      })
      console.log('Notes were all deleted')
    } else {
+      if (!confirmDeleteNote(confirmDeletion, false)) return
+
      Promise.all(
        selectedNotes.map((note) => {
          note.isTrashed = true
@@ -918,7 +915,7 @@ class NoteList extends React.Component {
      if (note.isTrashed !== true || location.pathname === '/trashed') return true
    })

-    moment.locale('en', {
+    moment.updateLocale('en', {
      relativeTime: {
        future: 'in %s',
        past: '%s ago',
--- a/browser/main/SideNav/index.js
+++ b/browser/main/SideNav/index.js
@@ -145,20 +145,27 @@ class SideNav extends React.Component {

  tagListComponent () {
    const { data, location, config } = this.props
+    const relatedTags = this.getRelatedTags(this.getActiveTags(location.pathname), data.noteMap)
    let tagList = _.sortBy(data.tagNoteMap.map(
-      (tag, name) => ({name, size: tag.size})),
-      ['name']
-    )
+      (tag, name) => ({ name, size: tag.size, related: relatedTags.has(name) })
+    ), ['name'])
    if (config.sortTagsBy === 'COUNTER') {
      tagList = _.sortBy(tagList, item => (0 - item.size))
    }
+    if (config.ui.showOnlyRelatedTags && (relatedTags.size > 0)) {
+      tagList = tagList.filter(
+        tag => tag.related
+      )
+    }
    return (
      tagList.map(tag => {
        return (
          <TagListItem
            name={tag.name}
            handleClickTagListItem={this.handleClickTagListItem.bind(this)}
+            handleClickNarrowToTag={this.handleClickNarrowToTag.bind(this)}
            isActive={this.getTagActive(location.pathname, tag.name)}
+            isRelated={tag.related}
            key={tag.name}
            count={tag.size}
          />
@@ -167,10 +174,30 @@ class SideNav extends React.Component {
    )
  }

+  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))
+    )
+    let 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 pathTag = pathSegments[pathSegments.length - 1]
-    return pathTag === tag
+    const tags = pathSegments[pathSegments.length - 1]
+    return (tags === 'alltags')
+      ? []
+      : tags.split(' ')
  }

  handleClickTagListItem (name) {
@@ -192,6 +219,19 @@ class SideNav extends React.Component {
    })
  }

+  handleClickNarrowToTag (tag) {
+    const { router } = this.context
+    const { location } = this.props
+    let listOfTags = this.getActiveTags(location.pathname)
+    const indexOfTag = listOfTags.indexOf(tag)
+    if (indexOfTag > -1) {
+      listOfTags.splice(indexOfTag, 1)
+    } else {
+      listOfTags.push(tag)
+    }
+    router.push(`/tags/${listOfTags.join(' ')}`)
+  }
+
  emptyTrash (entries) {
    const { dispatch } = this.props
    const deletionPromises = entries.map((note) => {
--- a/browser/main/index.js
+++ b/browser/main/index.js
@@ -24,6 +24,45 @@ document.addEventListener('dragover', function (e) {
  e.stopPropagation()
 })

+// prevent menu from popup when alt pressed
+// but still able to toggle menu when only alt is pressed
+let isAltPressing = false
+let isAltWithMouse = false
+let isAltWithOtherKey = false
+let isOtherKey = false
+
+document.addEventListener('keydown', function (e) {
+  if (e.key === 'Alt') {
+    isAltPressing = true
+    if (isOtherKey) {
+      isAltWithOtherKey = true
+    }
+  } else {
+    if (isAltPressing) {
+      isAltWithOtherKey = true
+    }
+    isOtherKey = true
+  }
+})
+
+document.addEventListener('mousedown', function (e) {
+  if (isAltPressing) {
+    isAltWithMouse = true
+  }
+})
+
+document.addEventListener('keyup', function (e) {
+  if (e.key === 'Alt') {
+    if (isAltWithMouse || isAltWithOtherKey) {
+      e.preventDefault()
+    }
+    isAltWithMouse = false
+    isAltWithOtherKey = false
+    isAltPressing = false
+    isOtherKey = false
+  }
+})
+
 document.addEventListener('click', function (e) {
  const className = e.target.className
  if (!className && typeof (className) !== 'string') return
--- a/browser/main/lib/dataApi/copyImage.js
+++ b/browser/main/lib/dataApi/copyImage.js
@@ -23,8 +23,12 @@ function copyImage (filePath, storageKey, rename = true) {
      const imageDir = path.join(targetStorage.path, 'images')
      if (!fs.existsSync(imageDir)) fs.mkdirSync(imageDir)
      const outputImage = fs.createWriteStream(path.join(imageDir, basename))
+      outputImage.on('error', reject)
+      inputImage.on('error', reject)
+      inputImage.on('end', () => {
+        resolve(basename)
+      })
      inputImage.pipe(outputImage)
-      resolve(basename)
    } catch (e) {
      return reject(e)
    }
--- a/browser/main/lib/dataApi/moveNote.js
+++ b/browser/main/lib/dataApi/moveNote.js
@@ -68,6 +68,8 @@ function moveNote (storageKey, noteKey, newStorageKey, newFolderKey) {
          return noteData
        })
        .then(function moveImages (noteData) {
+          if (oldStorage.path === newStorage.path) return noteData
+
          const searchImagesRegex = /!\[.*?]\(\s*?\/:storage\/(.*\.\S*?)\)/gi
          let match = searchImagesRegex.exec(noteData.content)

--- a/browser/main/modals/PreferencesModal/UiTab.js
+++ b/browser/main/modals/PreferencesModal/UiTab.js
@@ -10,6 +10,7 @@ import CodeMirror from 'codemirror'
 import 'codemirror-mode-elixir'
 import _ from 'lodash'
 import i18n from 'browser/lib/i18n'
+import { getLanguages } from 'browser/lib/Languages'

 const OSX = global.process.platform === 'darwin'

@@ -65,6 +66,7 @@ class UiTab extends React.Component {
        language: this.refs.uiLanguage.value,
        showCopyNotification: this.refs.showCopyNotification.checked,
        confirmDeletion: this.refs.confirmDeletion.checked,
+        showOnlyRelatedTags: this.refs.showOnlyRelatedTags.checked,
        disableDirectWrite: this.refs.uiD2w != null
          ? this.refs.uiD2w.checked
          : false
@@ -182,21 +184,9 @@ class UiTab extends React.Component {
                onChange={(e) => this.handleUIChange(e)}
                ref='uiLanguage'
              >
-                <option value='sq'>{i18n.__('Albanian')}</option>
-                <option value='zh-CN'>{i18n.__('Chinese (zh-CN)')}</option>
-                <option value='zh-TW'>{i18n.__('Chinese (zh-TW)')}</option>
-                <option value='da'>{i18n.__('Danish')}</option>
-                <option value='en'>{i18n.__('English')}</option>
-                <option value='fr'>{i18n.__('French')}</option>
-                <option value='de'>{i18n.__('German')}</option>
-                <option value='hu'>{i18n.__('Hungarian')}</option>
-                <option value='ja'>{i18n.__('Japanese')}</option>
-                <option value='ko'>{i18n.__('Korean')}</option>
-                <option value='no'>{i18n.__('Norwegian')}</option>
-                <option value='pl'>{i18n.__('Polish')}</option>
-                <option value='pt'>{i18n.__('Portuguese')}</option>
-                <option value='ru'>{i18n.__('Russian')}</option>
-                <option value='es'>{i18n.__('Spanish')}</option>
+                {
+                  getLanguages().map((language) => <option value={language.locale} key={language.locale}>{i18n.__(language.name)}</option>)
+                }
              </select>
            </div>
          </div>
@@ -221,6 +211,16 @@ class UiTab extends React.Component {
              {i18n.__('Show a confirmation dialog when deleting notes')}
            </label>
          </div>
+          <div styleName='group-checkBoxSection'>
+            <label>
+              <input onChange={(e) => this.handleUIChange(e)}
+                checked={this.state.config.ui.showOnlyRelatedTags}
+                ref='showOnlyRelatedTags'
+                type='checkbox'
+              />&nbsp;
+              {i18n.__('Show only related tags')}
+            </label>
+          </div>
          {
            global.process.platform === 'win32'
            ? <div styleName='group-checkBoxSection'>