From 60daafe1367fc6c9caa3e304be640bf8863b1658 Mon Sep 17 00:00:00 2001 From: Dick Choi Date: Wed, 25 May 2016 16:49:21 +0900 Subject: [PATCH] clean lib --- browser/components/ExternalLink.js | 20 ---------- browser/lib/clientKey.js | 2 +- browser/lib/openExternal.js | 7 ---- browser/lib/search.js | 40 ------------------- browser/main/lib/ConfigManager.js | 1 - browser/main/modals/Preferences/ContactTab.js | 3 +- lib/main.html | 6 +-- 7 files changed, 4 insertions(+), 75 deletions(-) delete mode 100644 browser/components/ExternalLink.js delete mode 100644 browser/lib/openExternal.js delete mode 100644 browser/lib/search.js diff --git a/browser/components/ExternalLink.js b/browser/components/ExternalLink.js deleted file mode 100644 index ec190ecc..00000000 --- a/browser/components/ExternalLink.js +++ /dev/null @@ -1,20 +0,0 @@ -import React, { PropTypes } from 'react' -const electron = require('electron') -const shell = electron.shell - -export default class ExternalLink extends React.Component { - handleClick (e) { - shell.openExternal(this.props.href) - e.preventDefault() - } - - render () { - return ( - this.handleClick(e)} {...this.props}/> - ) - } -} - -ExternalLink.propTypes = { - href: PropTypes.string -} diff --git a/browser/lib/clientKey.js b/browser/lib/clientKey.js index e827b2d8..5d5c1f3c 100644 --- a/browser/lib/clientKey.js +++ b/browser/lib/clientKey.js @@ -4,7 +4,7 @@ import keygen from './keygen' function getClientKey () { let clientKey = localStorage.getItem('clientKey') if (!_.isString(clientKey) || clientKey.length !== 40) { - clientKey = keygen() + clientKey = keygen(20) setClientKey(clientKey) } diff --git a/browser/lib/openExternal.js b/browser/lib/openExternal.js deleted file mode 100644 index 7d4d2e55..00000000 --- a/browser/lib/openExternal.js +++ /dev/null @@ -1,7 +0,0 @@ -const electron = require('electron') -const shell = electron.shell - -export default function (e) { - shell.openExternal(e.currentTarget.href) - e.preventDefault() -} diff --git a/browser/lib/search.js b/browser/lib/search.js deleted file mode 100644 index 0a8d7a3a..00000000 --- a/browser/lib/search.js +++ /dev/null @@ -1,40 +0,0 @@ -'use strict' - -var _ = require('lodash') - -const TEXT_FILTER = 'TEXT_FILTER' -const FOLDER_FILTER = 'FOLDER_FILTER' -const TAG_FILTER = 'TAG_FILTER' - -export default function search (articles, search) { - let filters = search.split(' ').map(key => key.trim()).filter(key => key.length > 0 && !key.match(/^#$/)).map(key => { - if (key.match(/^in:.+$/)) { - return {type: FOLDER_FILTER, value: key.match(/^in:(.+)$/)[1]} - } - if (key.match(/^#(.+)/)) { - return {type: TAG_FILTER, value: key.match(/^#(.+)$/)[1]} - } - return {type: TEXT_FILTER, value: key} - }) - // let folderFilters = filters.filter(filter => filter.type === FOLDER_FILTER) - let textFilters = filters.filter(filter => filter.type === TEXT_FILTER) - let tagFilters = filters.filter(filter => filter.type === TAG_FILTER) - - if (textFilters.length > 0) { - articles = textFilters.reduce((articles, textFilter) => { - return articles.filter(article => { - return article.title.match(new RegExp(textFilter.value, 'i')) || article.content.match(new RegExp(textFilter.value, 'i')) - }) - }, articles) - } - - if (tagFilters.length > 0) { - articles = tagFilters.reduce((articles, tagFilter) => { - return articles.filter(article => { - return _.find(article.Tags, tag => tag.name.match(new RegExp(tagFilter.value, 'i'))) - }) - }, articles) - } - - return articles -} diff --git a/browser/main/lib/ConfigManager.js b/browser/main/lib/ConfigManager.js index 692bf3c9..e715da61 100644 --- a/browser/main/lib/ConfigManager.js +++ b/browser/main/lib/ConfigManager.js @@ -7,7 +7,6 @@ const defaultConfig = { } function validate (config) { - console.log(config) if (!_.isObject(config)) return false if (!_.isNumber(config.zoom) || config.zoom < 0) return false if (!_.isBoolean(config.isSideNavFolded)) return false diff --git a/browser/main/modals/Preferences/ContactTab.js b/browser/main/modals/Preferences/ContactTab.js index 47e6bf31..edc1dd9a 100644 --- a/browser/main/modals/Preferences/ContactTab.js +++ b/browser/main/modals/Preferences/ContactTab.js @@ -1,6 +1,5 @@ import React from 'react' import ReactDOM from 'react-dom' -import ExternalLink from 'browser/components/ExternalLink' export default class ContactTab extends React.Component { componentDidMount () { @@ -13,7 +12,7 @@ export default class ContactTab extends React.Component {
Contact

- - Issues: https://github.com/BoostIO/Boostnote/issues + - Issues: https://github.com/BoostIO/Boostnote/issues

) diff --git a/lib/main.html b/lib/main.html index 834c295f..6803dea8 100644 --- a/lib/main.html +++ b/lib/main.html @@ -9,7 +9,6 @@ Boostnote -