Merge branch 'master' into localization

2026-05-11 10:12:38 +00:00 · 2018-03-13 09:24:53 +01:00
parent ecabd37cbb f53c182cfb
commit 847ad2d781
27 changed files with 435 additions and 285 deletions
--- a/browser/main/Detail/MarkdownNoteDetail.js
+++ b/browser/main/Detail/MarkdownNoteDetail.js
@@ -139,7 +139,7 @@ class MarkdownNoteDetail extends React.Component {
          hashHistory.replace({
            pathname: location.pathname,
            query: {
-              key: newNote.storage + '-' + newNote.key
+              key: newNote.key
            }
          })
          this.setState({
@@ -393,7 +393,7 @@ class MarkdownNoteDetail extends React.Component {
        <InfoPanel
          storageName={currentOption.storage.name}
          folderName={currentOption.folder.name}
-          noteLink={`[${note.title}](${location.query.key})`}
+          noteLink={`[${note.title}](:note:${location.query.key})`}
          updatedAt={formatDate(note.updatedAt)}
          createdAt={formatDate(note.createdAt)}
          exportAsMd={this.exportAsMd}
--- a/browser/main/Detail/SnippetNoteDetail.js
+++ b/browser/main/Detail/SnippetNoteDetail.js
@@ -148,7 +148,7 @@ class SnippetNoteDetail extends React.Component {
          hashHistory.replace({
            pathname: location.pathname,
            query: {
-              key: newNote.storage + '-' + newNote.key
+              key: newNote.key
            }
          })
          this.setState({
@@ -651,7 +651,7 @@ class SnippetNoteDetail extends React.Component {
        <InfoPanel
          storageName={currentOption.storage.name}
          folderName={currentOption.folder.name}
-          noteLink={`[${note.title}](${location.query.key})`}
+          noteLink={`[${note.title}](:note:${location.query.key})`}
          updatedAt={formatDate(note.updatedAt)}
          createdAt={formatDate(note.createdAt)}
          exportAsMd={this.showWarning}
--- a/browser/main/Detail/index.js
+++ b/browser/main/Detail/index.js
@@ -57,11 +57,8 @@ class Detail extends React.Component {
    const { location, data, config } = this.props
    let note = null
    if (location.query.key != null) {
-      const splitted = location.query.key.split('-')
-      const storageKey = splitted.shift()
-      const noteKey = splitted.shift()
-
-      note = data.noteMap.get(storageKey + '-' + noteKey)
+      const noteKey = location.query.key
+      note = data.noteMap.get(noteKey)
    }

    if (note == null) {
--- a/browser/main/NoteList/index.js
+++ b/browser/main/NoteList/index.js
@@ -35,7 +35,7 @@ function sortByUpdatedAt (a, b) {
 }

 function findNoteByKey (notes, noteKey) {
-  return notes.find((note) => `${note.storage}-${note.key}` === noteKey)
+  return notes.find((note) => note.key === noteKey)
 }

 function findNotesByKeys (notes, noteKeys) {
@@ -43,7 +43,7 @@ function findNotesByKeys (notes, noteKeys) {
 }

 function getNoteKey (note) {
-  return `${note.storage}-${note.key}`
+  return note.key
 }

 class NoteList extends React.Component {
@@ -119,10 +119,10 @@ class NoteList extends React.Component {
  componentDidUpdate (prevProps) {
    const { location } = this.props
    const { selectedNoteKeys } = this.state
-    const visibleNoteKeys = this.notes.map(note => `${note.storage}-${note.key}`)
+    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.storage}-${note.key}`
+    const noteKey = visibleNoteKeys.includes(prevKey) ? prevKey : note && note.key

    if (note && location.query.key == null) {
      const { router } = this.context
@@ -590,11 +590,9 @@ class NoteList extends React.Component {
      })
      if (dialogueButtonIndex === 1) return
      Promise.all(
-        selectedNoteKeys.map((uniqueKey) => {
-          const storageKey = uniqueKey.split('-')[0]
-          const noteKey = uniqueKey.split('-')[1]
+        selectedNotes.map((note) => {
          return dataApi
-            .deleteNote(storageKey, noteKey)
+            .deleteNote(note.storage, note.key)
        })
      )
      .then((data) => {
@@ -655,19 +653,18 @@ class NoteList extends React.Component {
        content: firstNote.content
      })
      .then((note) => {
-        const uniqueKey = note.storage + '-' + note.key
        dispatch({
          type: 'UPDATE_NOTE',
          note: note
        })

        this.setState({
-          selectedNoteKeys: [uniqueKey]
+          selectedNoteKeys: [note.key]
        })

        hashHistory.push({
          pathname: location.pathname,
-          query: {key: uniqueKey}
+          query: {key: note.key}
        })
      })
  }
--- a/browser/main/SideNav/StorageItem.js
+++ b/browser/main/SideNav/StorageItem.js
@@ -9,6 +9,7 @@ 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'

 const { remote } = require('electron')
 const { Menu, dialog } = remote
@@ -219,7 +220,8 @@ class StorageItem extends React.Component {
  render () {
    const { storage, location, isFolded, data, dispatch } = this.props
    const { folderNoteMap, trashedSet } = data
-    const folderList = storage.folders.map((folder) => {
+    const SortableStorageItemChild = SortableElement(StorageItemChild)
+    const folderList = storage.folders.map((folder, index) => {
      const isActive = !!(location.pathname.match(new RegExp('\/storages\/' + storage.key + '\/folders\/' + folder.key)))
      const noteSet = folderNoteMap.get(storage.key + '-' + folder.key)

@@ -233,8 +235,9 @@ class StorageItem extends React.Component {
        noteCount = noteSet.size - trashedNoteCount
      }
      return (
-        <StorageItemChild
+        <SortableStorageItemChild
          key={folder.key}
+          index={index}
          isActive={isActive}
          handleButtonClick={(e) => this.handleFolderButtonClick(folder.key)(e)}
          handleContextMenu={(e) => this.handleFolderButtonContextMenu(e, folder)}
@@ -256,9 +259,9 @@ class StorageItem extends React.Component {
        key={storage.key}
      >
        <div styleName={isActive
-            ? 'header--active'
-            : 'header'
-          }
+          ? 'header--active'
+          : 'header'
+        }
          onContextMenu={(e) => this.handleHeaderContextMenu(e)}
        >
          <button styleName='header-toggleButton'
@@ -267,7 +270,7 @@ class StorageItem extends React.Component {
            <img src={this.state.isOpen
              ? '../resources/icon/icon-down.svg'
              : '../resources/icon/icon-right.svg'
-              }
+            }
            />
          </button>

--- a/browser/main/SideNav/index.js
+++ b/browser/main/SideNav/index.js
@@ -17,6 +17,7 @@ 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'

 class SideNav extends React.Component {
  // TODO: should not use electron stuff v0.7
@@ -68,6 +69,17 @@ 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 } = this.props

@@ -117,9 +129,9 @@ class SideNav extends React.Component {

  tagListComponent () {
    const { data, location } = this.props
-    const tagList = data.tagNoteMap.map((tag, name) => {
+    const tagList = _.sortBy(data.tagNoteMap.map((tag, name) => {
      return { name, size: tag.size }
-    })
+    }), ['name'])
    return (
      tagList.map(tag => {
        return (
@@ -148,10 +160,8 @@ class SideNav extends React.Component {

  emptyTrash (entries) {
    const { dispatch } = this.props
-    const deletionPromises = entries.map((storageAndNoteKey) => {
-      const storageKey = storageAndNoteKey.split('-')[0]
-      const noteKey = storageAndNoteKey.split('-')[1]
-      return dataApi.deleteNote(storageKey, noteKey)
+    const deletionPromises = entries.map((note) => {
+      return dataApi.deleteNote(note.storage, note.key)
    })
    Promise.all(deletionPromises)
    .then((arrayOfStorageAndNoteKeys) => {
@@ -167,9 +177,9 @@ class SideNav extends React.Component {

  handleFilterButtonContextMenu (event) {
    const { data } = this.props
-    const entries = data.trashedSet.toJS()
+    const trashedNotes = data.trashedSet.toJS().map((uniqueKey) => data.noteMap.get(uniqueKey))
    const menu = Menu.buildFromTemplate([
-      { label: 'Empty Trash', click: () => this.emptyTrash(entries) }
+      { label: 'Empty Trash', click: () => this.emptyTrash(trashedNotes) }
    ])
    menu.popup()
  }
@@ -180,13 +190,16 @@ class SideNav extends React.Component {
    const isFolded = config.isSideNavFolded

    const storageList = data.storageMap.map((storage, key) => {
-      return <StorageItem
+      const SortableStorageItem = SortableContainer(StorageItem)
+      return <SortableStorageItem
        key={storage.key}
        storage={storage}
        data={data}
        location={location}
        isFolded={isFolded}
        dispatch={dispatch}
+        onSortEnd={this.onSortEnd.bind(this)(storage)}
+        useDragHandle
      />
    })
    const style = {}
--- a/browser/main/lib/ConfigManager.js
+++ b/browser/main/lib/ConfigManager.js
@@ -50,7 +50,8 @@ export const DEFAULT_CONFIG = {
    latexInlineClose: '$',
    latexBlockOpen: '$$',
    latexBlockClose: '$$',
-    scrollPastEnd: false
+    scrollPastEnd: false,
+    smartQuotes: true
  },
  blog: {
    type: 'wordpress', // Available value: wordpress, add more types in the future plz
--- a/browser/main/lib/dataApi/createNote.js
+++ b/browser/main/lib/dataApi/createNote.js
@@ -52,12 +52,12 @@ function createNote (storageKey, input) {
      return storage
    })
    .then(function saveNote (storage) {
-      let key = keygen()
+      let key = keygen(true)
      let isUnique = false
      while (!isUnique) {
        try {
          sander.statSync(path.join(storage.path, 'notes', key + '.cson'))
-          key = keygen()
+          key = keygen(true)
        } catch (err) {
          if (err.code === 'ENOENT') {
            isUnique = true
--- a/browser/main/lib/dataApi/moveNote.js
+++ b/browser/main/lib/dataApi/moveNote.js
@@ -39,12 +39,12 @@ function moveNote (storageKey, noteKey, newStorageKey, newFolderKey) {
          return resolveStorageData(newStorage)
            .then(function findNewNoteKey (_newStorage) {
              newStorage = _newStorage
-              newNoteKey = keygen()
+              newNoteKey = keygen(true)
              let isUnique = false
              while (!isUnique) {
                try {
                  sander.statSync(path.join(newStorage.path, 'notes', newNoteKey + '.cson'))
-                  newNoteKey = keygen()
+                  newNoteKey = keygen(true)
                } catch (err) {
                  if (err.code === 'ENOENT') {
                    isUnique = true
--- a/browser/main/modals/NewNoteModal.js
+++ b/browser/main/modals/NewNoteModal.js
@@ -36,7 +36,7 @@ class NewNoteModal extends React.Component {
        content: ''
      })
      .then((note) => {
-        const noteHash = `${note.storage}-${note.key}`
+        const noteHash = note.key
        dispatch({
          type: 'UPDATE_NOTE',
          note: note
@@ -76,7 +76,7 @@ class NewNoteModal extends React.Component {
        }]
      })
      .then((note) => {
-        const noteHash = `${note.storage}-${note.key}`
+        const noteHash = note.key
        dispatch({
          type: 'UPDATE_NOTE',
          note: note
--- a/browser/main/modals/PreferencesModal/InfoTab.js
+++ b/browser/main/modals/PreferencesModal/InfoTab.js
@@ -43,7 +43,7 @@ class InfoTab extends React.Component {
      })
    } else {
      this.setState({
-        amaMessage: i18n.__('Thank\'s for trust us')
+        amaMessage: i18n.__('Thank\'s for trusting us')
      })
    }

--- a/browser/main/modals/PreferencesModal/UiTab.js
+++ b/browser/main/modals/PreferencesModal/UiTab.js
@@ -90,7 +90,8 @@ class UiTab extends React.Component {
        latexInlineClose: this.refs.previewLatexInlineClose.value,
        latexBlockOpen: this.refs.previewLatexBlockOpen.value,
        latexBlockClose: this.refs.previewLatexBlockClose.value,
-        scrollPastEnd: this.refs.previewScrollPastEnd.checked
+        scrollPastEnd: this.refs.previewScrollPastEnd.checked,
+        smartQuotes: this.refs.previewSmartQuotes.checked
      }
    }

@@ -429,6 +430,16 @@ class UiTab extends React.Component {
              {i18n.__('Show line numbers for preview code blocks')}
            </label>
          </div>
+          <div styleName='group-checkBoxSection'>
+            <label>
+              <input onChange={(e) => this.handleUIChange(e)}
+                checked={this.state.config.preview.smartQuotes}
+                ref='previewSmartQuotes'
+                type='checkbox'
+              />&nbsp;
+              Enable smart quotes
+            </label>
+          </div>
          <div styleName='group-section'>
            <div styleName='group-section-label'>
              {i18n.__('LaTeX Inline Open Delimiter')}
--- a/browser/main/store.js
+++ b/browser/main/store.js
@@ -27,7 +27,7 @@ function data (state = defaultDataMap(), action) {

      action.notes.some((note) => {
        if (note === undefined) return true
-        const uniqueKey = note.storage + '-' + note.key
+        const uniqueKey = note.key
        const folderKey = note.storage + '-' + note.folder
        state.noteMap.set(uniqueKey, note)

@@ -66,7 +66,7 @@ function data (state = defaultDataMap(), action) {
    case 'UPDATE_NOTE':
      {
        const note = action.note
-        const uniqueKey = note.storage + '-' + note.key
+        const uniqueKey = note.key
        const folderKey = note.storage + '-' + note.folder
        const oldNote = state.noteMap.get(uniqueKey)

@@ -162,9 +162,9 @@ function data (state = defaultDataMap(), action) {
    case 'MOVE_NOTE':
      {
        const originNote = action.originNote
-        const originKey = originNote.storage + '-' + originNote.key
+        const originKey = originNote.key
        const note = action.note
-        const uniqueKey = note.storage + '-' + note.key
+        const uniqueKey = note.key
        const folderKey = note.storage + '-' + note.folder
        const oldNote = state.noteMap.get(uniqueKey)

@@ -297,7 +297,7 @@ function data (state = defaultDataMap(), action) {
      }
    case 'DELETE_NOTE':
      {
-        const uniqueKey = action.storageKey + '-' + action.noteKey
+        const uniqueKey = action.noteKey
        const targetNote = state.noteMap.get(uniqueKey)

        state = Object.assign({}, state)
@@ -423,7 +423,7 @@ function data (state = defaultDataMap(), action) {
      state.folderNoteMap = new Map(state.folderNoteMap)
      state.tagNoteMap = new Map(state.tagNoteMap)
      action.notes.forEach((note) => {
-        const uniqueKey = note.storage + '-' + note.key
+        const uniqueKey = note.key
        const folderKey = note.storage + '-' + note.folder
        state.noteMap.set(uniqueKey, note)

@@ -483,7 +483,7 @@ function data (state = defaultDataMap(), action) {
        state.tagNoteMap = new Map(state.tagNoteMap)
        state.starredSet = new Set(state.starredSet)
        notes.forEach((note) => {
-          const noteKey = storage.key + '-' + note.key
+          const noteKey = note.key
          state.noteMap.delete(noteKey)
          state.starredSet.delete(noteKey)
          note.tags.forEach((tag) => {