diff --git a/browser/main/store.js b/browser/main/store.js
index a1b6b791..b8f13cc8 100644
--- a/browser/main/store.js
+++ b/browser/main/store.js
@@ -216,16 +216,10 @@ function data (state = defaultDataMap(), action) {
return state
}
case 'UPDATE_FOLDER':
- state = Object.assign({}, state)
- state.storageMap = new Map(state.storageMap)
- state.storageMap.set(action.storage.key, action.storage)
- return state
case 'REORDER_FOLDER':
- state = Object.assign({}, state)
- state.storageMap = new Map(state.storageMap)
- state.storageMap.set(action.storage.key, action.storage)
- return state
case 'EXPORT_FOLDER':
+ case 'RENAME_STORAGE':
+ case 'EXPORT_STORAGE':
state = Object.assign({}, state)
state.storageMap = new Map(state.storageMap)
state.storageMap.set(action.storage.key, action.storage)
@@ -355,11 +349,6 @@ function data (state = defaultDataMap(), action) {
})
}
return state
- case 'RENAME_STORAGE':
- state = Object.assign({}, state)
- state.storageMap = new Map(state.storageMap)
- state.storageMap.set(action.storage.key, action.storage)
- return state
case 'EXPAND_STORAGE':
state = Object.assign({}, state)
state.storageMap = new Map(state.storageMap)
diff --git a/browser/styles/Detail/TagSelect.styl b/browser/styles/Detail/TagSelect.styl
new file mode 100644
index 00000000..84fd74c2
--- /dev/null
+++ b/browser/styles/Detail/TagSelect.styl
@@ -0,0 +1,109 @@
+.TagSelect
+ .react-autosuggest__input
+ box-sizing border-box
+ border none
+ background-color transparent
+ outline none
+ padding 0 4px
+ font-size 13px
+
+ ul
+ position fixed
+ z-index 999
+ box-sizing border-box
+ list-style none
+ padding 0
+ margin 0
+
+ border-radius 4px
+ margin .2em 0 0
+ background-color $ui-noteList-backgroundColor
+ border 1px solid rgba(0,0,0,.3)
+ box-shadow .05em .2em .6em rgba(0,0,0,.2)
+ text-shadow none
+
+ &:empty,
+ &[hidden]
+ display none
+
+ &:before
+ content ""
+ position absolute
+ top -7px
+ left 14px
+ width 0 height 0
+ padding 6px
+ background-color $ui-noteList-backgroundColor
+ border inherit
+ border-right 0
+ border-bottom 0
+ -webkit-transform rotate(45deg)
+ transform rotate(45deg)
+
+ li
+ position relative
+ padding 6px 18px 6px 10px
+ cursor pointer
+
+ li[aria-selected="true"]
+ background-color alpha($ui-button--active-backgroundColor, 40%)
+ color $ui-text-color
+
+body[data-theme="dark"]
+ .TagSelect
+ .react-autosuggest__input
+ color $ui-dark-text-color
+
+ ul
+ border-color $ui-dark-borderColor
+ background-color $ui-dark-noteList-backgroundColor
+ color $ui-dark-text-color
+
+ &:before
+ background-color $ui-dark-noteList-backgroundColor
+
+ li[aria-selected="true"]
+ background-color $ui-dark-button--active-backgroundColor
+ color $ui-dark-text-color
+
+body[data-theme="monokai"]
+ .TagSelect
+ .react-autosuggest__input
+ color $ui-monokai-text-color
+
+ ul
+ border-color $ui-monokai-borderColor
+ background-color $ui-monokai-noteList-backgroundColor
+ color $ui-monokai-text-color
+
+ &:before
+ background-color $ui-dark-noteList-backgroundColor
+
+ li[aria-selected="true"]
+ background-color $ui-monokai-button-backgroundColor
+ color $ui-monokai-text-color
+
+body[data-theme="solarized-dark"]
+ .TagSelect
+ .react-autosuggest__input
+ color $ui-solarized-dark-text-color
+
+ ul
+ border-color $ui-solarized-dark-borderColor
+ background-color $ui-solarized-dark-noteList-backgroundColor
+ color $ui-solarized-dark-text-color
+
+ &:before
+ background-color $ui-solarized-dark-noteList-backgroundColor
+
+ li[aria-selected="true"]
+ background-color $ui-dark-button--active-backgroundColor
+ color $ui-solarized-dark-text-color
+
+body[data-theme="white"]
+ .TagSelect
+ ul
+ background-color $ui-white-noteList-backgroundColor
+
+ li[aria-selected="true"]
+ background-color $ui-button--active-backgroundColor
\ No newline at end of file
diff --git a/contributing.md b/contributing.md
index 867d4161..8260837b 100644
--- a/contributing.md
+++ b/contributing.md
@@ -86,4 +86,23 @@ Pull requestをすることはその変化分のコードの著作権をBoostIO
如果您提供了一个Pull Request，这表示您将您所修改的代码的著作权移交给BoostIO。
这并不表示Boostnote会成为一个需要付费的软件。如果我们想获得收益，我们会尝试一些其他的方法，比如说云存储、绑定手机软件等。
-因为GPLv3过于严格，不能和其他的一些协议兼容，所以我们有可能在将来会把BoostNote的协议改为一些较为宽松的协议，比如说BSD、MIT。
+因为GPLv3过于严格，不能和其他的一些协议兼容，所以我们有可能在将来会把BoostNote的协议改为一些较为宽松的协议，比如说BSD、MIT。
+
+---
+
+# Contributing to Boostnote (Français)
+
+### Lorsque vous signalez un problème ou un bug
+Il n'y a pas de modèle pour un signaler problème. Mais nous vous demandons :
+
+**Merci de founir une capture d'écran de Boostnote avec l'outil de développement ouvert**
+(vous pouvez l'ouvrir avec `Ctrl+Shift+I`)
+
+Merci en avance pour votre aide.
+
+### À propos des droits d'auteurs et des requêtes (`Pull Request`)
+
+Si vous faites une requête, vous acceptez de transmettre les modifications du code à BoostIO.
+
+Cela ne veut pas dire que Boostnote deviendra une application payante. Si nous voulons gagner de l'argent, nous trouverons un autre moyen, comme un service de sauvegarde sur le Cloud, une application mobile ou des options payantes.
+Puisque GPL v3 est trop strict pour être compatible avec n'importe quelle autre licence, nous pensons avoir un jour besoin de la remplacer avec une licence bien plus libre (comme BSD, MIT).
diff --git a/extra_scripts/codemirror/addon/hyperlink/hyperlink.js b/extra_scripts/codemirror/addon/hyperlink/hyperlink.js
new file mode 100755
index 00000000..3f548c51
--- /dev/null
+++ b/extra_scripts/codemirror/addon/hyperlink/hyperlink.js
@@ -0,0 +1,127 @@
+(function (mod) {
+ if (typeof exports === 'object' && typeof module === 'object') { // Common JS
+ mod(require('../codemirror/lib/codemirror'))
+ } else if (typeof define === 'function' && define.amd) { // AMD
+ define(['../codemirror/lib/codemirror'], mod)
+ } else { // Plain browser env
+ mod(CodeMirror)
+ }
+})(function (CodeMirror) {
+ 'use strict'
+
+ const shell = require('electron').shell
+ const yOffset = 2
+
+ const macOS = global.process.platform === 'darwin'
+ const modifier = macOS ? 'metaKey' : 'ctrlKey'
+
+ class HyperLink {
+ constructor(cm) {
+ this.cm = cm
+ this.lineDiv = cm.display.lineDiv
+
+ this.onMouseDown = this.onMouseDown.bind(this)
+ this.onMouseEnter = this.onMouseEnter.bind(this)
+ this.onMouseLeave = this.onMouseLeave.bind(this)
+ this.onMouseMove = this.onMouseMove.bind(this)
+
+ this.tooltip = document.createElement('div')
+ this.tooltipContent = document.createElement('div')
+ this.tooltipIndicator = document.createElement('div')
+ this.tooltip.setAttribute('class', 'CodeMirror-hover CodeMirror-matchingbracket CodeMirror-selected')
+ this.tooltip.setAttribute('cm-ignore-events', 'true')
+ this.tooltip.appendChild(this.tooltipContent)
+ this.tooltip.appendChild(this.tooltipIndicator)
+ this.tooltipContent.textContent = `${macOS ? 'Cmd(⌘)' : 'Ctrl(^)'} + click to follow link`
+
+ this.lineDiv.addEventListener('mousedown', this.onMouseDown)
+ this.lineDiv.addEventListener('mouseenter', this.onMouseEnter, {
+ capture: true,
+ passive: true
+ })
+ this.lineDiv.addEventListener('mouseleave', this.onMouseLeave, {
+ capture: true,
+ passive: true
+ })
+ this.lineDiv.addEventListener('mousemove', this.onMouseMove, {
+ passive: true
+ })
+ }
+ getUrl(el) {
+ const className = el.className.split(' ')
+
+ if (className.indexOf('cm-url') !== -1) {
+ const match = /^\((.*)\)|\[(.*)\]|(.*)$/.exec(el.textContent)
+ return match[1] || match[2] || match[3]
+ }
+
+ return null
+ }
+ onMouseDown(e) {
+ const { target } = e
+ if (!e[modifier]) {
+ return
+ }
+
+ const url = this.getUrl(target)
+ if (url) {
+ e.preventDefault()
+
+ shell.openExternal(url)
+ }
+ }
+ onMouseEnter(e) {
+ const { target } = e
+
+ const url = this.getUrl(target)
+ if (url) {
+ if (e[modifier]) {
+ target.classList.add('CodeMirror-activeline-background', 'CodeMirror-hyperlink')
+ }
+ else {
+ target.classList.add('CodeMirror-activeline-background')
+ }
+
+ this.showInfo(target)
+ }
+ }
+ onMouseLeave(e) {
+ if (this.tooltip.parentElement === this.lineDiv) {
+ e.target.classList.remove('CodeMirror-activeline-background', 'CodeMirror-hyperlink')
+
+ this.lineDiv.removeChild(this.tooltip)
+ }
+ }
+ onMouseMove(e) {
+ if (this.tooltip.parentElement === this.lineDiv) {
+ if (e[modifier]) {
+ e.target.classList.add('CodeMirror-hyperlink')
+ }
+ else {
+ e.target.classList.remove('CodeMirror-hyperlink')
+ }
+ }
+ }
+ showInfo(relatedTo) {
+ const b1 = relatedTo.getBoundingClientRect()
+ const b2 = this.lineDiv.getBoundingClientRect()
+ const tdiv = this.tooltip
+
+ tdiv.style.left = (b1.left - b2.left) + 'px'
+ this.lineDiv.appendChild(tdiv)
+
+ const b3 = tdiv.getBoundingClientRect()
+ const top = b1.top - b2.top - b3.height - yOffset
+ if (top < 0) {
+ tdiv.style.top = (b1.top - b2.top + b1.height + yOffset) + 'px'
+ }
+ else {
+ tdiv.style.top = top + 'px'
+ }
+ }
+ }
+
+ CodeMirror.defineOption('hyperlink', true, (cm) => {
+ const addon = new HyperLink(cm)
+ })
+})
\ No newline at end of file
diff --git a/lib/main-app.js b/lib/main-app.js
index 1f3f1320..1ab9f4ca 100644
--- a/lib/main-app.js
+++ b/lib/main-app.js
@@ -78,9 +78,11 @@ app.on('ready', function () {
var template = require('./main-menu')
var menu = Menu.buildFromTemplate(template)
+ var touchBarMenu = require('./touchbar-menu')
switch (process.platform) {
case 'darwin':
Menu.setApplicationMenu(menu)
+ mainWindow.setTouchBar(touchBarMenu)
break
case 'win32':
mainWindow.setMenu(menu)
diff --git a/lib/main-menu.js b/lib/main-menu.js
index cda964c5..fed5eb15 100644
--- a/lib/main-menu.js
+++ b/lib/main-menu.js
@@ -145,6 +145,16 @@ const file = {
{
type: 'separator'
},
+ {
+ label: 'Generate/Update Markdown TOC',
+ accelerator: 'Shift+Ctrl+T',
+ click () {
+ mainWindow.webContents.send('code:generate-toc')
+ }
+ },
+ {
+ type: 'separator'
+ },
{
label: 'Print',
accelerator: 'CommandOrControl+P',
diff --git a/lib/main.html b/lib/main.html
index 7366fa04..663c1d23 100644
--- a/lib/main.html
+++ b/lib/main.html
@@ -10,6 +10,7 @@
+
Boostnote