From 286739f770b6eb5a4c5a822811911a1dccdf7c0a Mon Sep 17 00:00:00 2001 From: Dick Choi Date: Sat, 23 Jul 2016 15:41:30 +0900 Subject: [PATCH] cleanup --- browser/main/Detail/index.js | 8 +++- browser/main/TopBar/index.js | 13 +++++++ lib/hotkey.js | 4 +- lib/main-app.js | 73 ++++++++++++++++++------------------ lib/main-menu.js | 29 ++------------ package.json | 2 - webpack-skeleton.js | 1 - 7 files changed, 61 insertions(+), 69 deletions(-) diff --git a/browser/main/Detail/index.js b/browser/main/Detail/index.js index 7368fe73..d2c96726 100644 --- a/browser/main/Detail/index.js +++ b/browser/main/Detail/index.js @@ -13,16 +13,21 @@ class Detail extends React.Component { super(props) this.focusHandler = () => { - this.refs.root.focus() + this.refs.root != null && this.refs.root.focus() + } + this.deleteHandler = () => { + this.refs.root != null && this.refs.root.handleDeleteMenuClick() } } componentDidMount () { ee.on('detail:focus', this.focusHandler) + ee.on('detail:delete', this.deleteHandler) } componentWillUnmount () { ee.off('detail:focus', this.focusHandler) + ee.off('detail:delete', this.deleteHandler) } render () { @@ -46,7 +51,6 @@ class Detail extends React.Component {
{OSX ? 'Command(⌘)' : 'Ctrl(^)'} + N
to create a new post
diff --git a/browser/main/TopBar/index.js b/browser/main/TopBar/index.js index cf435e93..e575056d 100644 --- a/browser/main/TopBar/index.js +++ b/browser/main/TopBar/index.js @@ -5,6 +5,7 @@ import _ from 'lodash' import modal from 'browser/main/lib/modal' import NewNoteModal from 'browser/main/modals/NewNoteModal' import { hashHistory } from 'react-router' +import ee from 'browser/main/lib/eventEmitter' const OSX = window.process.platform === 'darwin' @@ -17,6 +18,18 @@ class TopBar extends React.Component { searchOptions: [], searchPopupOpen: false } + + this.newNoteHandler = () => { + this.handleNewPostButtonClick() + } + } + + componentDidMount () { + ee.on('top:new-note', this.newNoteHandler) + } + + componentWillUnmount () { + ee.off('top:new-note', this.newNoteHandler) } handleNewPostButtonClick (e) { diff --git a/lib/hotkey.js b/lib/hotkey.js index 063305c4..4cb61ea4 100644 --- a/lib/hotkey.js +++ b/lib/hotkey.js @@ -3,7 +3,7 @@ const ipc = electron.ipcMain const Menu = electron.Menu const globalShortcut = electron.globalShortcut const mainWindow = require('./main-window') -const nodeIpc = require('@rokt33r/node-ipc') +// const nodeIpc = require('@rokt33r/node-ipc') function emitToFinder (type, data) { var payload = { @@ -11,7 +11,7 @@ function emitToFinder (type, data) { data: data } - nodeIpc.server.broadcast('message', payload) + // nodeIpc.server.broadcast('message', payload) } function toggleFinder () { diff --git a/lib/main-app.js b/lib/main-app.js index 991552cb..263ba7dd 100644 --- a/lib/main-app.js +++ b/lib/main-app.js @@ -6,7 +6,6 @@ const autoUpdater = electron.autoUpdater const path = require('path') const ChildProcess = require('child_process') const _ = require('lodash') -const nodeIpc = require('@rokt33r/node-ipc') const GhReleases = require('electron-gh-releases') // electron.crashReporter.start() @@ -154,37 +153,37 @@ updater.on('update-downloaded', (info) => { } }) -nodeIpc.config.id = 'node' -nodeIpc.config.retry = 1500 -nodeIpc.config.silent = true +// nodeIpc.config.id = 'node' +// nodeIpc.config.retry = 1500 +// nodeIpc.config.silent = true -nodeIpc.serve( - path.join(app.getPath('userData'), 'boost.service'), - function () { - nodeIpc.server.on( - 'connect', - function (socket) { - socket.on('close', function () { - console.log('socket dead') - if (!appQuit) spawnFinder() - }) - } - ) - nodeIpc.server.on( - 'message', - function (data, socket) { - console.log('>>', data) - handleIpcEvent(data) - } - ) - nodeIpc.server.on( - 'error', - function (err) { - console.log('>>', err) - } - ) - } -) +// nodeIpc.serve( +// path.join(app.getPath('userData'), 'boost.service'), +// function () { +// nodeIpc.server.on( +// 'connect', +// function (socket) { +// socket.on('close', function () { +// console.log('socket dead') +// if (!appQuit) spawnFinder() +// }) +// } +// ) +// nodeIpc.server.on( +// 'message', +// function (data, socket) { +// console.log('>>', data) +// handleIpcEvent(data) +// } +// ) +// nodeIpc.server.on( +// 'error', +// function (err) { +// console.log('>>', err) +// } +// ) +// } +// ) function handleIpcEvent (payload) { switch (payload.type) { @@ -303,12 +302,12 @@ app.on('ready', function () { // // Do nothing. // } - nodeIpc.server.start(function (err) { - if (err.code === 'EADDRINUSE') { - notify('Error occurs!', 'You have to kill other Boostnote processes.') - quitApp() - } - }) + // nodeIpc.server.start(function (err) { + // if (err.code === 'EADDRINUSE') { + // notify('Error occurs!', 'You have to kill other Boostnote processes.') + // quitApp() + // } + // }) require('./hotkey') }) diff --git a/lib/main-menu.js b/lib/main-menu.js index 767f5ac6..66d03bfe 100644 --- a/lib/main-menu.js +++ b/lib/main-menu.js @@ -49,14 +49,7 @@ var file = { label: 'New Post', accelerator: OSX ? 'Command + N' : 'Control + N', click: function () { - mainWindow.webContents.send('top-new-post') - } - }, - { - label: 'New Folder', - accelerator: OSX ? 'Command + Shift + N' : 'Control + Shift + N', - click: function () { - mainWindow.webContents.send('nav-new-folder') + mainWindow.webContents.send('top:new-note') } }, { @@ -66,7 +59,7 @@ var file = { label: 'Delete Post', accelerator: OSX ? 'Control + Backspace' : 'Control + Delete', click: function () { - mainWindow.webContents.send('detail-delete') + mainWindow.webContents.send('detail:delete') } } ] @@ -127,16 +120,6 @@ var edit = { var view = { label: 'View', submenu: [ - { - label: 'Focus Search', - accelerator: 'Control + Alt + F', - click: function () { - mainWindow.webContents.send('top-focus-search') - } - }, - { - type: 'separator' - }, { label: 'Reload', accelerator: (function () { @@ -192,12 +175,8 @@ var help = { click: function () { shell.openExternal('https://b00st.io/') } }, { - label: 'Tutorial page', - click: function () { shell.openExternal('https://b00st.io/tutorial.html') } - }, - { - label: 'Discussions', - click: function () { shell.openExternal('https://github.com/BoostIO/boost-app-discussions/issues') } + label: 'Issue Tracker', + click: function () { shell.openExternal('https://github.com/BoostIO/Boostnote/issues') } }, { label: 'Changelog', diff --git a/package.json b/package.json index fd60f8e8..42cb37df 100644 --- a/package.json +++ b/package.json @@ -38,8 +38,6 @@ "homepage": "https://b00st.io", "dependencies": { "@rokt33r/markdown-it-math": "^4.0.1", - "@rokt33r/node-ipc": "^5.0.4", - "@rokt33r/sanitize-html": "^1.11.2", "ace-builds": "git+https://git@github.com/ajaxorg/ace-builds.git", "devicon": "^2.0.0", "electron-gh-releases": "^2.0.2", diff --git a/webpack-skeleton.js b/webpack-skeleton.js index 063a5c01..ae3eec22 100644 --- a/webpack-skeleton.js +++ b/webpack-skeleton.js @@ -38,7 +38,6 @@ var config = { 'markdown-it-emoji', 'fs-jetpack', '@rokt33r/markdown-it-math', - '@rokt33r/sanitize-html', 'markdown-it-checkbox', 'season', 'devtron',