configuring zoomfactor with Ctrl + Wheelscroll only works on windows and linux

* master:
  add Link of Trello Kanban to readme.md

LICENSE

@@ -1,2 +1,16 @@
-本製品をインストール、または使用することによって、お客様は利用規約（
-https://b00st.io/regulations.html）より拘束されることに承諾されたものとします。利用規約に同意されない場合、Boostnoteは、お客様に本製品のインストール、使用のいずれも許諾できません。
+Boostnote - the simplest note app
+
+Copyright (C) 2016 MAISIN&CO.
+
+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
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.

browser/components/CodeEditor.js

@@ -35,6 +35,52 @@ export default class CodeEditor extends React.Component {
 
       if (this.props.onBlur) this.props.onBlur(e)
     }
+
+    this.killedBuffer = ''
+    this.execHandler = (e) => {
+      console.log(e.command.name)
+      switch (e.command.name) {
+        case 'gotolinestart':
+          e.preventDefault()
+          {
+            let position = this.editor.getCursorPosition()
+            this.editor.navigateTo(position.row, 0)
+          }
+          break
+        case 'gotolineend':
+          e.preventDefault()
+          let position = this.editor.getCursorPosition()
+          this.editor.navigateTo(position.row, this.editor.getSession().getLine(position.row).length)
+          break
+        case 'jumptomatching':
+          e.preventDefault()
+          this.editor.navigateUp()
+          break
+        case 'removetolineend':
+          e.preventDefault()
+          let range = this.editor.getSelectionRange()
+          let session = this.editor.getSession()
+          if (range.isEmpty()) {
+            range.setEnd(range.start.row, session.getLine(range.start.row).length)
+            this.killedBuffer = session.getTextRange(range)
+            if (this.killedBuffer.length > 0) {
+              console.log('remove to lineend')
+              session.remove(range)
+            } else {
+              if (session.getLength() === range.start.row) {
+                return
+              }
+              range.setStart(range.start.row, range.end.col)
+              range.setEnd(range.start.row + 1, 0)
+              this.killedBuffer = '\n'
+              session.remove(range)
+            }
+          } else {
+            this.killedBuffer = session.getTextRange(range)
+            session.remove(range)
+          }
+      }
+    }
     this.afterExecHandler = (e) => {
       switch (e.command.name) {
         case 'find':
@@ -42,6 +88,7 @@ export default class CodeEditor extends React.Component {
             el.removeEventListener('blur', this.blurHandler)
             el.addEventListener('blur', this.blurHandler)
           })
+          break
       }
     }
 
@@ -83,15 +130,28 @@ export default class CodeEditor extends React.Component {
       },
       readOnly: true
     })
+    editor.commands.addCommand({
+      name: 'Emacs cursor up',
+      bindKey: {mac: 'Ctrl-Y'},
+      exec: function (editor) {
+        editor.insert(this.killedBuffer)
+      }.bind(this),
+      readOnly: true
+    })
     editor.commands.addCommand({
       name: 'Focus title',
       bindKey: {win: 'Esc', mac: 'Esc'},
       exec: function (editor, e) {
-        remote.getCurrentWebContents().send('list-focus')
+        let currentWindow = remote.getCurrentWebContents()
+        if (config['switch-preview'] === 'rightclick') {
+          currentWindow.send('detail-preview')
+        }
+        currentWindow.send('list-focus')
       },
       readOnly: true
     })
 
+    editor.commands.on('exec', this.execHandler)
     editor.commands.on('afterExec', this.afterExecHandler)
 
     var session = editor.getSession()
@@ -116,6 +176,7 @@ export default class CodeEditor extends React.Component {
     ipc.removeListener('config-apply', this.configApplyHandler)
     this.editor.getSession().removeListener('change', this.changeHandler)
     this.editor.removeListener('blur', this.blurHandler)
+    this.editor.commands.removeListener('exec', this.execHandler)
     this.editor.commands.removeListener('afterExec', this.afterExecHandler)
   }
 

browser/components/MarkdownPreview.js

@@ -49,13 +49,13 @@ const sanitizeOpts = {
 }
 
 function handleAnchorClick (e) {
-  if (e.target.attributes.href && e.target.attributes.href.nodeValue.match(/#.+/)) {
+  if (this.attributes.href && this.attributes.href.nodeValue.match(/^#.+/)) {
     return
   }
   e.preventDefault()
   e.stopPropagation()
-  let href = e.target.href
-  if (href.match(/^http:\/\/|https:\/\/|mailto:\/\//)) {
+  let href = this.href
+  if (href && href.match(/^http:\/\/|https:\/\/|mailto:\/\//)) {
     shell.openExternal(href)
   }
 }

browser/finder/index.js

@@ -29,7 +29,6 @@ function hideFinder () {
 function notify (title, options) {
   if (process.platform === 'win32') {
     options.icon = path.join('file://', global.__dirname, '../../resources/app.png')
-    options.silent = false
   }
   return new window.Notification(title, options)
 }
@@ -96,7 +95,8 @@ class FinderMain extends React.Component {
 
     ipcRenderer.send('copy-finder')
     notify('Saved to Clipboard!', {
-      body: 'Paste it wherever you want!'
+      body: 'Paste it wherever you want!',
+      silent: true
     })
     hideFinder()
   }

browser/lib/activityRecord.js

@@ -108,7 +108,7 @@ export function emit (type, data = {}) {
   }
 
   // Count ARTICLE_CREATE and ARTICLE_UPDATE again by syntax
-  if ((type === 'ARTICLE_CREATE' || type === 'ARTICLE_UPDATE') && data.mode != null) {
+  if (type === 'ARTICLE_UPDATE' && data.mode != null) {
     let recordKey = type + '_BY_SYNTAX'
     if (todayRecord[recordKey] == null) todayRecord[recordKey] = {}
 

browser/lib/fetchConfig.js

@@ -5,6 +5,17 @@ const jetpack = require('fs-jetpack')
 const userDataPath = remote.app.getPath('userData')
 const configFile = 'config.json'
 
-export default function fetchConfig () {
-  return Object.assign({}, JSON.parse(jetpack.cwd(userDataPath).read(configFile, 'utf-8')))
+const defaultConfig = {
+  'editor-font-size': '14',
+  'editor-font-family': 'Monaco, Consolas',
+  'editor-indent-type': 'space',
+  'editor-indent-size': '4',
+  'preview-font-size': '14',
+  'preview-font-family': 'Lato',
+  'switch-preview': 'blur',
+  'disable-direct-write': false
+}
+
+export default function fetchConfig () {
+  return Object.assign({}, defaultConfig, JSON.parse(jetpack.cwd(userDataPath).read(configFile, 'utf-8')))
 }

browser/lib/markdown.js

@@ -14,7 +14,7 @@ var md = markdownit({
         return hljs.highlight(lang, str).value
       } catch (e) {}
     }
-    return str
+    return str.replace(/\&/g, '&amp;').replace(/\</g, '&lt;').replace(/\>/g, '&gt;').replace(/\"/g, '&quot;')
   }
 })
 md.use(emoji, {

browser/main/HomePage/ArticleDetail/ArticleEditor.js

@@ -32,7 +32,6 @@ export default class ArticleEditor extends React.Component {
   }
 
   componentDidMount () {
-    console.log(this.state.switchPreview)
     ipc.on('config-apply', this.configApplyHandler)
   }
 
@@ -65,6 +64,7 @@ export default class ArticleEditor extends React.Component {
   }
 
   switchPreviewMode (isTemporary = false) {
+    if (this.props.article.mode !== 'markdown') return true
     let cursorPosition = this.refs.editor.getCursorPosition()
     let firstVisibleRow = this.refs.editor.getFirstVisibleRow()
     this.setState({

browser/main/HomePage/ArticleDetail/index.js

@@ -4,10 +4,7 @@ import moment from 'moment'
 import _ from 'lodash'
 import {
   switchFolder,
-  updateArticle,
-  // cacheArticle,
-  // saveArticle,
-  // uncacheArticle
+  updateArticle
 } from '../../actions'
 import linkState from 'browser/lib/linkState'
 import TagSelect from 'browser/components/TagSelect'
@@ -18,22 +15,12 @@ import DeleteArticleModal from '../../modal/DeleteArticleModal'
 import ArticleEditor from './ArticleEditor'
 const electron = require('electron')
 const ipc = electron.ipcRenderer
+import fetchConfig from 'browser/lib/fetchConfig'
 
-// const remote = electron.remote
-// const { Menu, MenuItem } = remote
-// const othersMenu = new Menu()
-// othersMenu.append(new MenuItem({
-//   label: 'Delete Post',
-//   click: function () {
-//     remote.getCurrentWebContents().send('detail-delete')
-//   }
-// }))
-// othersMenu.append(new MenuItem({
-//   label: 'Discard Change',
-//   click: function (item) {
-//     remote.getCurrentWebContents().send('detail-uncache')
-//   }
-// }))
+let config = fetchConfig()
+ipc.on('config-apply', function (e, newConfig) {
+  config = newConfig
+})
 
 const BRAND_COLOR = '#18AF90'
 const OSX = global.process.platform === 'darwin'
@@ -80,10 +67,6 @@ export default class ArticleDetail extends React.Component {
   constructor (props) {
     super(props)
 
-    this.saveHandler = e => {
-      if (isModalOpen()) return true
-      this.handleSaveButtonClick()
-    }
     this.deleteHandler = e => {
       if (isModalOpen()) return true
       this.handleDeleteButtonClick()
@@ -102,10 +85,16 @@ export default class ArticleDetail extends React.Component {
       if (isModalOpen()) return true
       if (this.refs.editor) this.refs.editor.switchEditMode()
     }
+    this.previewHandler = e => {
+      if (isModalOpen()) return true
+      if (this.refs.editor) this.refs.editor.switchPreviewMode()
+    }
+    this.configApplyHandler = (e, config) => this.handleConfigApply(e, config)
 
     this.state = {
       article: Object.assign({content: ''}, props.activeArticle),
-      openShareDropdown: false
+      openShareDropdown: false,
+      fontFamily: config['editor-font-family']
     }
   }
 
@@ -115,21 +104,22 @@ export default class ArticleDetail extends React.Component {
       e.stopPropagation()
     }
 
-    // ipc.on('detail-save', this.saveHandler)
     ipc.on('detail-delete', this.deleteHandler)
     ipc.on('detail-uncache', this.uncacheHandler)
     ipc.on('detail-title', this.titleHandler)
     ipc.on('detail-edit', this.editHandler)
+    ipc.on('detail-preview', this.previewHandler)
+    ipc.on('config-apply', this.configApplyHandler)
   }
 
   componentWillUnmount () {
     clearInterval(this.refreshTimer)
 
-    // ipc.removeListener('detail-save', this.saveHandler)
     ipc.removeListener('detail-delete', this.deleteHandler)
     ipc.removeListener('detail-uncache', this.uncacheHandler)
     ipc.removeListener('detail-title', this.titleHandler)
     ipc.removeListener('detail-edit', this.editHandler)
+    ipc.removeListener('detail-preview', this.previewHandler)
   }
 
   componentDidUpdate (prevProps, prevState) {
@@ -142,6 +132,12 @@ export default class ArticleDetail extends React.Component {
     }
   }
 
+  handleConfigApply (e, config) {
+    this.setState({
+      fontFamily: config['editor-font-family']
+    })
+  }
+
   renderEmpty () {
     return (
       <div className='ArticleDetail empty'>
@@ -328,6 +324,9 @@ export default class ArticleDetail extends React.Component {
                 ref='title'
                 value={activeArticle.title}
                 onChange={e => this.handleTitleChange(e)}
+                style={{
+                  fontFamily: this.state.fontFamily
+                }}
               />
             </div>
             <ModeSelect

browser/main/HomePage/ArticleTopBar.js

@@ -4,6 +4,7 @@ import ExternalLink from 'browser/components/ExternalLink'
 import { setSearchFilter, clearSearch, toggleTutorial, saveArticle, switchFolder } from '../actions'
 import { isModalOpen } from 'browser/lib/modal'
 import keygen from 'browser/lib/keygen'
+import activityRecord from 'browser/lib/activityRecord'
 
 const electron = require('electron')
 const remote = electron.remote
@@ -167,6 +168,7 @@ export default class ArticleTopBar extends React.Component {
     dispatch(saveArticle(newArticle.key, newArticle, true))
     if (isFolderFilterApplied) dispatch(switchFolder(targetFolders[0].name))
     remote.getCurrentWebContents().send('detail-title')
+    activityRecord.emit('ARTICLE_CREATE')
   }
 
   handleTutorialButtonClick (e) {

browser/main/MainPage.js

@@ -19,9 +19,27 @@ export default class MainContainer extends React.Component {
     ipc.send('update-app', 'Deal with it.')
   }
 
+  handleWheel (e) {
+    if (e.ctrlKey && global.process.platform !== 'darwin') {
+      if (window.document.body.style.zoom == null) {
+        window.document.body.style.zoom = 1
+      }
+
+      let zoom = Number(window.document.body.style.zoom)
+      if (e.deltaY > 0 && zoom < 4) {
+        document.body.style.zoom = zoom + 0.05
+      } else if (e.deltaY < 0 && zoom > 0.5) {
+        document.body.style.zoom = zoom - 0.05
+      }
+    }
+  }
+
   render () {
     return (
-      <div className='Main'>
+      <div
+        className='Main'
+        onWheel={(e) => this.handleWheel(e)}
+      >
         {this.state.updateAvailable ? (
         <button onClick={this.updateApp} className='appUpdateButton'><i className='fa fa-cloud-download'/> Update available!</button>
         ) : null}

browser/styles/main/ArticleDetail.styl

@@ -257,9 +257,10 @@ infoButton()
           width 150px
           max-height 150px
           background-color white
-          z-index 5
+          z-index 50
           border 1px solid borderColor
           border-radius 5px
+          overflow-y auto
           &>button
             width 100%
             display block

browser/styles/main/ArticleList.styl

@@ -16,7 +16,7 @@ articleItemColor = #777
     .ArticleList-item
       border solid 2px transparent
       position relative
-      height 110px
+      min-height 110px
       width 100%
       cursor pointer
       transition 0.1s
@@ -68,18 +68,27 @@ articleItemColor = #777
           code
             font-family Monaco, Menlo, 'Ubuntu Mono', Consolas, source-code-pro, monospace
       .ArticleList-item-bottom
-        overflow-x auto
-        white-space nowrap
-        padding-top 6px
+        padding-bottom 5px
         .tags
           color articleItemColor
-          height 14px
+          line-height 18px
+          word-wrap break-word
+          clearfix()
+          i.fa-tags
+            display inline
+            float left
+            padding 2px 2px 0 0
+            height 14px
+            line-height 13px
           a
             background-color brandColor
+            float left
             color white
             border-radius 2px
             padding 1px 5px
             margin 2px
+            height 14px
+            line-height 13px
             font-size 10px
             opacity 0.8
             &:hover

browser/styles/mixins/marked.styl

@@ -26,6 +26,8 @@ marked()
     margin -5px
     transition .1s
     display inline-block
+    img
+      vertical-align sub
     &:hover
       color lighten(brandColor, 5%)
       text-decoration underline
@@ -48,12 +50,12 @@ marked()
   *:not(a.lineAnchor) + h1, *:not(a.lineAnchor) + h2, *:not(a.lineAnchor) + h3, *:not(a.lineAnchor) + h4, *:not(a.lineAnchor) + h5, *:not(a.lineAnchor) + h6
     margin-top 25px
   h1
-    font-size 2em
+    font-size 1.8em
     border-bottom solid 2px borderColor
-    line-height 2.333em
+    line-height 2em
   h2
     font-size 1.66em
-    line-height 2.07em
+    line-height 1.8em
   h3
     font-size 1.33em
     line-height 1.6625em

contributing.md

@@ -0,0 +1,35 @@
+# Contributing to Boostnote
+
+> English below.
+
+## About Pull Request
+
+### やり方
+
+現状特に`dev`ブランチを用意しないつもりなので、最新VersionのブランチにPullrequestを送ってください。
+
+### Pull requsetの著作権
+
+Pull requestをすることはその変化分のコードの著作権をMAISIN&CO.に譲渡することに同意することになります。
+
+アプリケーションのLicenseのをいつでも変える選択肢を残したいからです。
+しかし、これはいずれかBoostnoteが有料の商用アプリになる可能性がある話ではありません。
+もし、このアプリケーションで金を稼ごうとするならBoostnote専用のCloud storageの提供やMobile appとの連動、何か特殊なプレミアム機能の提供など形になると思います。
+現在考えられているのは、GPL v3の場合、他のライセンスとの互換が不可能であるため、もしより自由なLicense(BSD, MIT)に変える時に改めて著作権者としてライセンスし直す選択肢を残したいぐらいのイメージです。
+
+---
+
+# Contributing to Boostnote(ENG)
+
+## About Pull Request
+
+### How to
+
+Make a new PR to the branch named latest version. This is because there is no `dev` branch currently.
+
+### Copyright of Pull Request
+
+If you make a pull request, It means you agree to transfer the copyright of the code changes to MAISIN&CO.
+
+It doesn't mean Boostnote will become a paid app. If we want to earn some money, We will try other way, which is some kind of cloud storage, Mobile app integration or some SPECIAL features.
+Because GPL v3 is too strict to be compatible with any other License, We thought this is needed to replace the license with much freer one(like BSD, MIT) somewhen.

lib/finder-window.js

@@ -79,12 +79,12 @@ var config = {
   show: false,
   frame: false,
   resizable: false,
-  'zoom-factor': 1.0,
-  'web-preferences': {
-    'overlay-scrollbars': true,
-    'skip-taskbar': true
+  zoomFactor: 1.0,
+  webPreferences: {
+    blinkFeatures: 'OverlayScrollbars'
   },
-  'standard-window': false
+  skipTaskbar: true,
+  standardWindow: false
 }
 
 if (process.platform === 'darwin') {

lib/finder.html

@@ -39,7 +39,7 @@
     var scriptEl=document.createElement('script')
     scriptEl.setAttribute("type","text/javascript")
     scriptEl.setAttribute("src", scriptUrl)
-    document.getElementsByTagName("head")[0].appendChild(scriptEl)
+    document.body.appendChild(scriptEl)
   </script>
 </body>
 </html>

lib/hotkey.js

@@ -6,6 +6,7 @@ const globalShortcut = electron.globalShortcut
 const jetpack = require('fs-jetpack')
 const mainWindow = require('./main-window')
 const nodeIpc = require('@rokt33r/node-ipc')
+const _ = require('lodash')
 
 const OSX = global.process.platform === 'darwin'
 
@@ -66,35 +67,43 @@ function toggleMain () {
       mainWindow.minimize()
       mainWindow.restore()
     }
-    mainWindow.webContents.send('list-focus')
+    mainWindow.webContents.send('top-focus-search')
   }
 }
 
 // Init
 global.keymap = Object.assign({}, defaultKeymap, getKeymap())
 
-function registerKey (name, callback, broadcast) {
-  if (broadcast == null) broadcast = true
-
-  try {
+function registerKey (name, callback) {
+  if (_.isString(global.keymap[name]) && global.keymap[name].trim().length > 0) {
     globalShortcut.register(global.keymap[name], callback)
-    if (broadcast) {
-      mainWindow.webContents.send('APP_SETTING_DONE', {})
-    }
-  } catch (err) {
-    console.log(err)
-    if (broadcast) {
-      mainWindow.webContents.send('APP_SETTING_ERROR', {
-        message: 'Failed to apply hotkey: Invalid format'
-      })
-    }
   }
 }
 
 function registerAllKeys (broadcast) {
   if (broadcast == null) broadcast = true
-  registerKey('toggleFinder', toggleFinder, broadcast)
-  registerKey('toggleMain', toggleMain, broadcast)
+
+  var errors = []
+  try {
+    registerKey('toggleFinder', toggleFinder)
+  } catch (err) {
+    errors.push('toggleFinder')
+  }
+  try {
+    registerKey('toggleMain', toggleMain)
+  } catch (err) {
+    errors.push('toggleMain')
+  }
+
+  if (broadcast) {
+    if (errors.length === 0) {
+      mainWindow.webContents.send('APP_SETTING_DONE', {})
+    } else {
+      mainWindow.webContents.send('APP_SETTING_ERROR', {
+        message: 'Failed to apply hotkey: ' + errors.join(' ')
+      })
+    }
+  }
 }
 
 registerAllKeys(false)
@@ -105,4 +114,3 @@ ipc.on('hotkeyUpdated', function (event, newKeymap) {
   globalShortcut.unregisterAll()
   registerAllKeys()
 })
-

lib/main-window.js

@@ -6,11 +6,11 @@ const path = require('path')
 var mainWindow = new BrowserWindow({
   width: 1080,
   height: 720,
-  'zoom-factor': 1.0,
-  'web-preferences': {
-    'overlay-scrollbars': true
+  zoomFactor: 1.0,
+  webPreferences: {
+    blinkFeatures: 'OverlayScrollbars'
   },
-  'standard-window': false
+  standardWindow: false
 })
 
 const url = path.resolve(__dirname, './main.html')

lib/main.html

@@ -68,7 +68,7 @@
     var scriptEl = document.createElement('script')
     scriptEl.setAttribute("type","text/javascript")
     scriptEl.setAttribute("src", scriptUrl)
-    document.getElementsByTagName("head")[0].appendChild(scriptEl)
+    document.body.appendChild(scriptEl)
   </script>
 </body>
 </html>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "boost",
-  "version": "0.5.2",
+  "version": "0.5.5",
   "description": "Boostnote",
   "main": "index.js",
   "scripts": {
@@ -9,7 +9,7 @@
     "webpack": "webpack-dev-server --hot --inline --config webpack.config.js"
   },
   "config": {
-    "electron-version": "0.35.4"
+    "electron-version": "0.36.11"
   },
   "repository": {
     "type": "git",
@@ -56,7 +56,7 @@
     "babel-preset-react-hmre": "^1.0.1",
     "css-loader": "^0.19.0",
     "electron-packager": "^5.1.0",
-    "electron-prebuilt": "^0.35.1",
+    "electron-prebuilt": "^0.36.11",
     "electron-release": "^2.2.0",
     "grunt": "^0.4.5",
     "grunt-electron-installer": "^1.2.0",

readme.md

@@ -1,8 +1,16 @@
 # Boostnote
 
-Hack your memory
+Simple note app
 
-## Develope
+## Progress Kanban
+
+https://trello.com/b/wJlinZJx/boostnote-todo-list
+
+This is a public Kanban board. Also everyone can comment here.
+
+If you want to join us, ask me to add you.
+
+## Develop
 
 1. turn on HMR server
 
@@ -18,8 +26,12 @@ npm run hot
 
 > `npm start` is using compiled scripts. see [Build](#Build) to compile scripts.
 
+
 ## Build
 
+> '3. Codesign' and '4. Create' installer are needed to deploy this app.
+> You can skip these steps.
+
 1. Compile scripts
 
 compile all browser stuff(Javascript, Stylus).
@@ -78,15 +90,18 @@ grunt zip:osx
 - Webpack
 ... check [`package.json`](./package.json)
 
+
 ## Codestyle
 
 [![js-standard-style](https://cdn.rawgit.com/feross/standard/master/badge.svg)](https://github.com/feross/standard)
 
 ## Author
 
-[Rokt33r(Dick Choi)](https://github.com/rokt33r)
+[Rokt33r(Dick Choi of MAISIN&CO.)](https://github.com/rokt33r)
 
-## License
+## Copyright & License
+
+Copyright (C) 2016 MAISIN&CO.
 
 [Check here](./LICENSE).