From fac0abaed6903a6c1d70879e3ebd54b976aa9460 Mon Sep 17 00:00:00 2001 From: sota1235 Date: Fri, 10 Mar 2017 10:12:23 +0900 Subject: [PATCH 1/8] modify: add prefer-const rule and fix code --- .eslintrc | 3 ++- lib/main-window.js | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.eslintrc b/.eslintrc index f4f88ad0..762f2ad1 100644 --- a/.eslintrc +++ b/.eslintrc @@ -1,6 +1,7 @@ { "extends": ["standard", "standard-jsx"], "rules": { - "no-useless-escape": 0 + "no-useless-escape": 0, + "prefer-const": "error" } } diff --git a/lib/main-window.js b/lib/main-window.js index c62108f4..dfe64281 100644 --- a/lib/main-window.js +++ b/lib/main-window.js @@ -6,9 +6,9 @@ const Config = require('electron-config') const config = new Config() var showMenu = process.platform !== 'win32' -let windowSize = config.get('windowsize') || { width: 1080, height: 720 } +const windowSize = config.get('windowsize') || { width: 1080, height: 720 } -let mainWindow = new BrowserWindow({ +const mainWindow = new BrowserWindow({ width: windowSize.width, height: windowSize.height, minWidth: 500, From b4e54fc14917af6761496690984b84f6769b7d33 Mon Sep 17 00:00:00 2001 From: sota1235 Date: Mon, 13 Mar 2017 18:26:39 +0900 Subject: [PATCH 2/8] modify: npm script --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 68d96835..10cedc2c 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "compile": "grunt compile", "test": "PWD=$(pwd) NODE_ENV=test ava", "fix": "npm run lint --fix", - "lint": "eslint ./**/*.js" + "lint": "eslint ." }, "config": { "electron-version": "1.2.8" From fda17e044ea8b86e62e802ac824bf0a8259273db Mon Sep 17 00:00:00 2001 From: sota1235 Date: Mon, 13 Mar 2017 18:26:56 +0900 Subject: [PATCH 3/8] modify: change warning level for prefer-const rule --- .eslintrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.eslintrc b/.eslintrc index 762f2ad1..16e51900 100644 --- a/.eslintrc +++ b/.eslintrc @@ -2,6 +2,6 @@ "extends": ["standard", "standard-jsx"], "rules": { "no-useless-escape": 0, - "prefer-const": "error" + "prefer-const": "warn" } } From df9d8ff735c04c00784131152991c4200af89c7e Mon Sep 17 00:00:00 2001 From: sota1235 Date: Mon, 13 Mar 2017 18:33:39 +0900 Subject: [PATCH 4/8] modify: change warning level for no-unused-var --- .eslintrc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.eslintrc b/.eslintrc index 16e51900..78f145d1 100644 --- a/.eslintrc +++ b/.eslintrc @@ -2,6 +2,7 @@ "extends": ["standard", "standard-jsx"], "rules": { "no-useless-escape": 0, - "prefer-const": "warn" + "prefer-const": "warn", + "no-unused-vars": "warn" } } From 93b15f2a7abd93ee0ea6c3f2ca32b790079c1a32 Mon Sep 17 00:00:00 2001 From: sota1235 Date: Mon, 13 Mar 2017 18:36:21 +0900 Subject: [PATCH 5/8] modify: change warning level for no-undef --- .eslintrc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.eslintrc b/.eslintrc index 78f145d1..7e363718 100644 --- a/.eslintrc +++ b/.eslintrc @@ -3,6 +3,7 @@ "rules": { "no-useless-escape": 0, "prefer-const": "warn", - "no-unused-vars": "warn" + "no-unused-vars": "warn", + "no-undef": "warn" } } From 6fcbca6b10a3950116af3158c581bb54da6e3dd3 Mon Sep 17 00:00:00 2001 From: sota1235 Date: Mon, 13 Mar 2017 18:40:12 +0900 Subject: [PATCH 6/8] refactor: by ESLint --- browser/components/MarkdownEditor.js | 2 +- browser/components/MarkdownPreview.js | 4 ++-- browser/finder/index.js | 2 +- browser/lib/markdown.js | 2 +- browser/main/Detail/MarkdownNoteDetail.js | 4 ++-- browser/main/NoteList/index.js | 2 +- browser/main/lib/ConfigManager.js | 2 +- browser/main/modals/DeleteArticleModal.js | 2 -- 8 files changed, 9 insertions(+), 11 deletions(-) diff --git a/browser/components/MarkdownEditor.js b/browser/components/MarkdownEditor.js index a00a87bf..d809524c 100644 --- a/browser/components/MarkdownEditor.js +++ b/browser/components/MarkdownEditor.js @@ -157,7 +157,7 @@ class MarkdownEditor extends React.Component { this.renderPreview(this.props.value) } - handleKeyDown(e) { + handleKeyDown (e) { const keyPressed = Object.assign(this.state.keyPressed, { [e.key]: true }) diff --git a/browser/components/MarkdownPreview.js b/browser/components/MarkdownPreview.js index c8e9374b..00a0523c 100644 --- a/browser/components/MarkdownPreview.js +++ b/browser/components/MarkdownPreview.js @@ -152,7 +152,7 @@ export default class MarkdownPreview extends React.Component { exportAsDocument (fileType) { const options = { filters: [ - { name: 'Documents', extensions: [fileType]} + { name: 'Documents', extensions: [fileType] } ], properties: ['openFile', 'createDirectory'] } @@ -329,7 +329,7 @@ export default class MarkdownPreview extends React.Component { } } - preventImageDroppedHandler(e) { + preventImageDroppedHandler (e) { e.preventDefault() e.stopPropagation() } diff --git a/browser/finder/index.js b/browser/finder/index.js index 1120fc8e..6c2b29d4 100644 --- a/browser/finder/index.js +++ b/browser/finder/index.js @@ -68,7 +68,7 @@ class FinderMain extends React.Component { handleWindowBlur (e) { this.setState({ - search: '', + search: '' }) } diff --git a/browser/lib/markdown.js b/browser/lib/markdown.js index c4939c06..8159884c 100644 --- a/browser/lib/markdown.js +++ b/browser/lib/markdown.js @@ -1,7 +1,7 @@ import markdownit from 'markdown-it' import emoji from 'markdown-it-emoji' import math from '@rokt33r/markdown-it-math' -import tocAndAnchor from "markdown-it-toc-and-anchor" +import tocAndAnchor from 'markdown-it-toc-and-anchor' import _ from 'lodash' const katex = window.katex diff --git a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/MarkdownNoteDetail.js index 8b5a15ed..a3391a30 100644 --- a/browser/main/Detail/MarkdownNoteDetail.js +++ b/browser/main/Detail/MarkdownNoteDetail.js @@ -266,13 +266,13 @@ class MarkdownNoteDetail extends React.Component {
{(() => { - const faClassName=`fa ${this.getToggleLockButton()}` + const faClassName = `fa ${this.getToggleLockButton()}` const lockButtonComponent = return ( this.state.editorStatus === 'CODE' ? lockButtonComponent : '' diff --git a/browser/main/NoteList/index.js b/browser/main/NoteList/index.js index 82c0bbc3..b8c9700d 100644 --- a/browser/main/NoteList/index.js +++ b/browser/main/NoteList/index.js @@ -310,7 +310,7 @@ class NoteList extends React.Component { }) } - alertIfSnippet() { + alertIfSnippet () { let { location } = this.props const targetIndex = _.findIndex(this.notes, (note) => { return `${note.storage}-${note.key}` === location.query.key diff --git a/browser/main/lib/ConfigManager.js b/browser/main/lib/ConfigManager.js index e398ecc9..1f7ab33d 100644 --- a/browser/main/lib/ConfigManager.js +++ b/browser/main/lib/ConfigManager.js @@ -16,7 +16,7 @@ export const DEFAULT_CONFIG = { listStyle: 'DEFAULT', // 'DEFAULT', 'SMALL' hotkey: { toggleFinder: OSX ? 'Cmd + Alt + S' : 'Super + Alt + S', - toggleMain: OSX ? 'Cmd + Alt + L' : 'Super + Alt + E', + toggleMain: OSX ? 'Cmd + Alt + L' : 'Super + Alt + E' }, ui: { theme: 'default', diff --git a/browser/main/modals/DeleteArticleModal.js b/browser/main/modals/DeleteArticleModal.js index 91546dd1..5069cda0 100644 --- a/browser/main/modals/DeleteArticleModal.js +++ b/browser/main/modals/DeleteArticleModal.js @@ -1,6 +1,5 @@ import React, { PropTypes } from 'react' import ReactDOM from 'react-dom' -import store from '../store' const electron = require('electron') const ipc = electron.ipcRenderer @@ -26,7 +25,6 @@ export default class DeleteArticleModal extends React.Component { } handleYesButtonClick (e) { - // store.dispatch(destroyArticle(this.props.articleKey)) this.props.close() } From 7065fad69ba431c95c43de56921cb6c07defe85e Mon Sep 17 00:00:00 2001 From: sota1235 Date: Mon, 13 Mar 2017 18:55:16 +0900 Subject: [PATCH 7/8] modify: change warning level for no-lone-blocks rule --- .eslintrc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.eslintrc b/.eslintrc index 7e363718..ac065a8b 100644 --- a/.eslintrc +++ b/.eslintrc @@ -4,6 +4,7 @@ "no-useless-escape": 0, "prefer-const": "warn", "no-unused-vars": "warn", - "no-undef": "warn" + "no-undef": "warn", + "no-lone-blocks": "warn" } } From 1d3e71cf494f191d1539e82d59a9e2559abbe153 Mon Sep 17 00:00:00 2001 From: sota1235 Date: Tue, 21 Mar 2017 15:14:03 +0900 Subject: [PATCH 8/8] fix: for ESLint --- browser/components/CodeEditor.js | 2 +- browser/components/MarkdownEditor.js | 4 ++-- browser/main/Detail/MarkdownNoteDetail.js | 22 +++++++++++----------- browser/main/Detail/SnippetNoteDetail.js | 6 +++--- browser/main/NoteList/index.js | 2 +- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/browser/components/CodeEditor.js b/browser/components/CodeEditor.js index a20807c0..68157530 100644 --- a/browser/components/CodeEditor.js +++ b/browser/components/CodeEditor.js @@ -86,7 +86,7 @@ export default class CodeEditor extends React.Component { Enter: (cm) => { const cursor = cm.getCursor() const line = cm.getLine(cursor.line) - let bulletType; + let bulletType if (line.trim().startsWith('- ')) { bulletType = 1 // dash } else if (line.trim().startsWith('* ')) { diff --git a/browser/components/MarkdownEditor.js b/browser/components/MarkdownEditor.js index 9bb50a87..f2d59c85 100644 --- a/browser/components/MarkdownEditor.js +++ b/browser/components/MarkdownEditor.js @@ -161,7 +161,7 @@ class MarkdownEditor extends React.Component { this.renderPreview(this.props.value) } - handleKeyDown(e) { + handleKeyDown (e) { if (this.state.status !== 'CODE') return false const keyPressed = Object.assign(this.state.keyPressed, { [e.key]: true @@ -183,7 +183,7 @@ class MarkdownEditor extends React.Component { const currentCaret = this.refs.code.editor.getCursor() const cmDoc = this.refs.code.editor.getDoc() cmDoc.replaceRange(mdElement, currentCaret) - this.refs.code.editor.setCursor({line: currentCaret.line, ch: currentCaret.ch + mdElement.length/2}) + this.refs.code.editor.setCursor({ line: currentCaret.line, ch: currentCaret.ch + mdElement.length / 2 }) } addMdBetweenWord (mdElement) { diff --git a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/MarkdownNoteDetail.js index 641582a6..4c0585f9 100644 --- a/browser/main/Detail/MarkdownNoteDetail.js +++ b/browser/main/Detail/MarkdownNoteDetail.js @@ -281,9 +281,9 @@ class MarkdownNoteDetail extends React.Component { onFocus={(e) => this.handleFocus(e)} onMouseDown={(e) => this.handleLockButtonMouseDown(e)} > - + - {this.state.isLocked ? 'Unlock' : 'Lock'} + {this.state.isLocked ? 'Unlock' : 'Lock'} return ( @@ -293,15 +293,15 @@ class MarkdownNoteDetail extends React.Component {
diff --git a/browser/main/Detail/SnippetNoteDetail.js b/browser/main/Detail/SnippetNoteDetail.js index 953c2e11..66c0b673 100644 --- a/browser/main/Detail/SnippetNoteDetail.js +++ b/browser/main/Detail/SnippetNoteDetail.js @@ -550,11 +550,11 @@ class SnippetNoteDetail extends React.Component {