Merge pull request #317 from BoostIO/feature-add-esilnt-rule

sota1235 · web-flow · commit 359f6734c563 · 2017-03-21T15:16:48.000+09:00
Add prefer-const rule and fix code
diff --git a/.eslintrc b/.eslintrc
@@ -1,6 +1,10 @@
 {
   "extends": ["standard", "standard-jsx"],
   "rules": {
-    "no-useless-escape": 0
+    "no-useless-escape": 0,
+    "prefer-const": "warn",
+    "no-unused-vars": "warn",
+    "no-undef": "warn",
+    "no-lone-blocks": "warn"
   }
 }
diff --git 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
@@ -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/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']
     }
@@ -333,7 +333,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
@@ -68,7 +68,7 @@ class FinderMain extends React.Component {
 
   handleWindowBlur (e) {
     this.setState({
-      search: '',
+      search: ''
     })
   }
 
diff --git a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/MarkdownNoteDetail.js
@@ -275,15 +275,15 @@ class MarkdownNoteDetail extends React.Component {
           </div>
           <div styleName='info-right'>
             {(() => {
-              const faClassName=`fa ${this.getToggleLockButton()}`
+              const faClassName = `fa ${this.getToggleLockButton()}`
               const lockButtonComponent =
                 <button styleName='control-lockButton'
                   onFocus={(e) => this.handleFocus(e)}
                   onMouseDown={(e) => this.handleLockButtonMouseDown(e)}
                 >
-                  <i className={faClassName} styleName='lock-button'/>
+                  <i className={faClassName} styleName='lock-button' />
                   <span styleName='control-lockButton-tooltip'>
-                  {this.state.isLocked ? 'Unlock' : 'Lock'}
+                    {this.state.isLocked ? 'Unlock' : 'Lock'}
                   </span>
                 </button>
               return (
@@ -293,15 +293,15 @@ class MarkdownNoteDetail extends React.Component {
             <button styleName='control-trashButton'
               onClick={(e) => this.handleContextButtonClick(e)}
             >
-              <svg height="17px" id="Capa_1" style={{"enableBackground":"new 0 0 753.23 753.23"}} width="17px" version="1.1" viewBox="0 0 753.23 753.23" x="0px" y="0px" xmlSpace="preserve">
-                 <g>
-                   <g id="_x34__19_">
-                     <g>
-                       <path d="M494.308,659.077c12.993,0,23.538-10.546,23.538-23.539V353.077c0-12.993-10.545-23.539-23.538-23.539&#xA;&#x9;&#x9;&#x9;&#x9;s-23.538,10.545-23.538,23.539v282.461C470.77,648.531,481.314,659.077,494.308,659.077z M635.538,94.154h-141.23V47.077&#xA;&#x9;&#x9;&#x9;&#x9;C494.308,21.067,473.24,0,447.23,0H306c-26.01,0-47.077,21.067-47.077,47.077v47.077h-141.23&#xA;&#x9;&#x9;&#x9;&#x9;c-26.01,0-47.077,21.067-47.077,47.077v47.077c0,25.986,21.067,47.077,47.077,47.077v423.692&#xA;&#x9;&#x9;&#x9;&#x9;c0,51.996,42.157,94.153,94.154,94.153h329.539c51.996,0,94.153-42.157,94.153-94.153V235.385&#xA;&#x9;&#x9;&#x9;&#x9;c26.01,0,47.077-21.091,47.077-47.077V141.23C682.615,115.221,661.548,94.154,635.538,94.154z M306,70.615&#xA;&#x9;&#x9;&#x9;&#x9;c0-12.993,10.545-23.539,23.538-23.539h94.154c12.993,0,23.538,10.545,23.538,23.539v23.539c-22.809,0-141.23,0-141.23,0V70.615z&#xA;&#x9;&#x9;&#x9;&#x9; M588.461,659.077c0,25.986-21.066,47.076-47.076,47.076H211.846c-26.01,0-47.077-21.09-47.077-47.076V235.385h423.692V659.077z&#xA;&#x9;&#x9;&#x9;&#x9; M612,188.308H141.23c-12.993,0-23.538-10.545-23.538-23.539s10.545-23.539,23.538-23.539H612&#xA;&#x9;&#x9;&#x9;&#x9;c12.993,0,23.538,10.545,23.538,23.539S624.993,188.308,612,188.308z M258.923,659.077c12.993,0,23.539-10.546,23.539-23.539&#xA;&#x9;&#x9;&#x9;&#x9;V353.077c0-12.993-10.545-23.539-23.539-23.539s-23.539,10.545-23.539,23.539v282.461&#xA;&#x9;&#x9;&#x9;&#x9;C235.384,648.531,245.93,659.077,258.923,659.077z M376.615,659.077c12.993,0,23.538-10.546,23.538-23.539V353.077&#xA;&#x9;&#x9;&#x9;&#x9;c0-12.993-10.545-23.539-23.538-23.539s-23.539,10.545-23.539,23.539v282.461C353.077,648.531,363.622,659.077,376.615,659.077z"/>
-                     </g>
-                   </g>
-                 </g>
-               </svg>
+              <svg height='17px' id='Capa_1' style={{enableBackground: 'new 0 0 753.23 753.23'}} width='17px' version='1.1' viewBox='0 0 753.23 753.23' x='0px' y='0px' xmlSpace='preserve'>
+                <g>
+                  <g id='_x34__19_'>
+                    <g>
+                      <path d='M494.308,659.077c12.993,0,23.538-10.546,23.538-23.539V353.077c0-12.993-10.545-23.539-23.538-23.539&#xA;&#x9;&#x9;&#x9;&#x9;s-23.538,10.545-23.538,23.539v282.461C470.77,648.531,481.314,659.077,494.308,659.077z M635.538,94.154h-141.23V47.077&#xA;&#x9;&#x9;&#x9;&#x9;C494.308,21.067,473.24,0,447.23,0H306c-26.01,0-47.077,21.067-47.077,47.077v47.077h-141.23&#xA;&#x9;&#x9;&#x9;&#x9;c-26.01,0-47.077,21.067-47.077,47.077v47.077c0,25.986,21.067,47.077,47.077,47.077v423.692&#xA;&#x9;&#x9;&#x9;&#x9;c0,51.996,42.157,94.153,94.154,94.153h329.539c51.996,0,94.153-42.157,94.153-94.153V235.385&#xA;&#x9;&#x9;&#x9;&#x9;c26.01,0,47.077-21.091,47.077-47.077V141.23C682.615,115.221,661.548,94.154,635.538,94.154z M306,70.615&#xA;&#x9;&#x9;&#x9;&#x9;c0-12.993,10.545-23.539,23.538-23.539h94.154c12.993,0,23.538,10.545,23.538,23.539v23.539c-22.809,0-141.23,0-141.23,0V70.615z&#xA;&#x9;&#x9;&#x9;&#x9; M588.461,659.077c0,25.986-21.066,47.076-47.076,47.076H211.846c-26.01,0-47.077-21.09-47.077-47.076V235.385h423.692V659.077z&#xA;&#x9;&#x9;&#x9;&#x9; M612,188.308H141.23c-12.993,0-23.538-10.545-23.538-23.539s10.545-23.539,23.538-23.539H612&#xA;&#x9;&#x9;&#x9;&#x9;c12.993,0,23.538,10.545,23.538,23.539S624.993,188.308,612,188.308z M258.923,659.077c12.993,0,23.539-10.546,23.539-23.539&#xA;&#x9;&#x9;&#x9;&#x9;V353.077c0-12.993-10.545-23.539-23.539-23.539s-23.539,10.545-23.539,23.539v282.461&#xA;&#x9;&#x9;&#x9;&#x9;C235.384,648.531,245.93,659.077,258.923,659.077z M376.615,659.077c12.993,0,23.538-10.546,23.538-23.539V353.077&#xA;&#x9;&#x9;&#x9;&#x9;c0-12.993-10.545-23.539-23.538-23.539s-23.539,10.545-23.539,23.539v282.461C353.077,648.531,363.622,659.077,376.615,659.077z' />
+                    </g>
+                  </g>
+                </g>
+              </svg>
             </button>
           </div>
         </div>
diff --git a/browser/main/Detail/SnippetNoteDetail.js b/browser/main/Detail/SnippetNoteDetail.js
@@ -550,11 +550,11 @@ class SnippetNoteDetail extends React.Component {
             <button styleName='control-trashButton'
               onClick={(e) => this.handleContextButtonClick(e)}
             >
-              <svg height="17px" id="Capa_1" style={{"enableBackground":"new 0 0 753.23 753.23"}} width="17px" version="1.1" viewBox="0 0 753.23 753.23" x="0px" y="0px" xmlSpace="preserve">
+              <svg height='17px' id='Capa_1' style={{enableBackground: 'new 0 0 753.23 753.23'}} width='17px' version='1.1' viewBox='0 0 753.23 753.23' x='0px' y='0px' xmlSpace='preserve'>
                 <g>
-                  <g id="_x34__19_">
+                  <g id='_x34__19_'>
                     <g>
-                      <path d="M494.308,659.077c12.993,0,23.538-10.546,23.538-23.539V353.077c0-12.993-10.545-23.539-23.538-23.539&#xA;&#x9;&#x9;&#x9;&#x9;s-23.538,10.545-23.538,23.539v282.461C470.77,648.531,481.314,659.077,494.308,659.077z M635.538,94.154h-141.23V47.077&#xA;&#x9;&#x9;&#x9;&#x9;C494.308,21.067,473.24,0,447.23,0H306c-26.01,0-47.077,21.067-47.077,47.077v47.077h-141.23&#xA;&#x9;&#x9;&#x9;&#x9;c-26.01,0-47.077,21.067-47.077,47.077v47.077c0,25.986,21.067,47.077,47.077,47.077v423.692&#xA;&#x9;&#x9;&#x9;&#x9;c0,51.996,42.157,94.153,94.154,94.153h329.539c51.996,0,94.153-42.157,94.153-94.153V235.385&#xA;&#x9;&#x9;&#x9;&#x9;c26.01,0,47.077-21.091,47.077-47.077V141.23C682.615,115.221,661.548,94.154,635.538,94.154z M306,70.615&#xA;&#x9;&#x9;&#x9;&#x9;c0-12.993,10.545-23.539,23.538-23.539h94.154c12.993,0,23.538,10.545,23.538,23.539v23.539c-22.809,0-141.23,0-141.23,0V70.615z&#xA;&#x9;&#x9;&#x9;&#x9; M588.461,659.077c0,25.986-21.066,47.076-47.076,47.076H211.846c-26.01,0-47.077-21.09-47.077-47.076V235.385h423.692V659.077z&#xA;&#x9;&#x9;&#x9;&#x9; M612,188.308H141.23c-12.993,0-23.538-10.545-23.538-23.539s10.545-23.539,23.538-23.539H612&#xA;&#x9;&#x9;&#x9;&#x9;c12.993,0,23.538,10.545,23.538,23.539S624.993,188.308,612,188.308z M258.923,659.077c12.993,0,23.539-10.546,23.539-23.539&#xA;&#x9;&#x9;&#x9;&#x9;V353.077c0-12.993-10.545-23.539-23.539-23.539s-23.539,10.545-23.539,23.539v282.461&#xA;&#x9;&#x9;&#x9;&#x9;C235.384,648.531,245.93,659.077,258.923,659.077z M376.615,659.077c12.993,0,23.538-10.546,23.538-23.539V353.077&#xA;&#x9;&#x9;&#x9;&#x9;c0-12.993-10.545-23.539-23.538-23.539s-23.539,10.545-23.539,23.539v282.461C353.077,648.531,363.622,659.077,376.615,659.077z"/>
+                      <path d='M494.308,659.077c12.993,0,23.538-10.546,23.538-23.539V353.077c0-12.993-10.545-23.539-23.538-23.539&#xA;&#x9;&#x9;&#x9;&#x9;s-23.538,10.545-23.538,23.539v282.461C470.77,648.531,481.314,659.077,494.308,659.077z M635.538,94.154h-141.23V47.077&#xA;&#x9;&#x9;&#x9;&#x9;C494.308,21.067,473.24,0,447.23,0H306c-26.01,0-47.077,21.067-47.077,47.077v47.077h-141.23&#xA;&#x9;&#x9;&#x9;&#x9;c-26.01,0-47.077,21.067-47.077,47.077v47.077c0,25.986,21.067,47.077,47.077,47.077v423.692&#xA;&#x9;&#x9;&#x9;&#x9;c0,51.996,42.157,94.153,94.154,94.153h329.539c51.996,0,94.153-42.157,94.153-94.153V235.385&#xA;&#x9;&#x9;&#x9;&#x9;c26.01,0,47.077-21.091,47.077-47.077V141.23C682.615,115.221,661.548,94.154,635.538,94.154z M306,70.615&#xA;&#x9;&#x9;&#x9;&#x9;c0-12.993,10.545-23.539,23.538-23.539h94.154c12.993,0,23.538,10.545,23.538,23.539v23.539c-22.809,0-141.23,0-141.23,0V70.615z&#xA;&#x9;&#x9;&#x9;&#x9; M588.461,659.077c0,25.986-21.066,47.076-47.076,47.076H211.846c-26.01,0-47.077-21.09-47.077-47.076V235.385h423.692V659.077z&#xA;&#x9;&#x9;&#x9;&#x9; M612,188.308H141.23c-12.993,0-23.538-10.545-23.538-23.539s10.545-23.539,23.538-23.539H612&#xA;&#x9;&#x9;&#x9;&#x9;c12.993,0,23.538,10.545,23.538,23.539S624.993,188.308,612,188.308z M258.923,659.077c12.993,0,23.539-10.546,23.539-23.539&#xA;&#x9;&#x9;&#x9;&#x9;V353.077c0-12.993-10.545-23.539-23.539-23.539s-23.539,10.545-23.539,23.539v282.461&#xA;&#x9;&#x9;&#x9;&#x9;C235.384,648.531,245.93,659.077,258.923,659.077z M376.615,659.077c12.993,0,23.538-10.546,23.538-23.539V353.077&#xA;&#x9;&#x9;&#x9;&#x9;c0-12.993-10.545-23.539-23.538-23.539s-23.539,10.545-23.539,23.539v282.461C353.077,648.531,363.622,659.077,376.615,659.077z' />
                     </g>
                   </g>
                 </g>
diff --git a/browser/main/NoteList/index.js b/browser/main/NoteList/index.js
@@ -318,7 +318,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
@@ -332,7 +332,7 @@ class NoteList extends React.Component {
     }
   }
 
-  jumpToTop() {
+  jumpToTop () {
     if (this.notes === null || this.notes.length === 0) {
       return
     }
diff --git 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
@@ -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()
   }
 
diff --git 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,
diff --git 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"

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,10 @@`
`1`	`1`	`{`
`2`	`2`	`"extends": ["standard", "standard-jsx"],`
`3`	`3`	`"rules": {`
`4`		`- "no-useless-escape": 0`
	`4`	`+ "no-useless-escape": 0,`
	`5`	`+ "prefer-const": "warn",`
	`6`	`+ "no-unused-vars": "warn",`
	`7`	`+ "no-undef": "warn",`
	`8`	`+ "no-lone-blocks": "warn"`
`5`	`9`	`}`
`6`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ export default class MarkdownPreview extends React.Component {`
`152`	`152`	`exportAsDocument (fileType) {`
`153`	`153`	`const options = {`
`154`	`154`	`filters: [`
`155`		`- { name: 'Documents', extensions: [fileType]}`
	`155`	`+ { name: 'Documents', extensions: [fileType] }`
`156`	`156`	`],`
`157`	`157`	`properties: ['openFile', 'createDirectory']`
`158`	`158`	`}`
`@@ -333,7 +333,7 @@ export default class MarkdownPreview extends React.Component {`
`333`	`333`	`}`
`334`	`334`	`}`
`335`	`335`
`336`		`- preventImageDroppedHandler(e) {`
	`336`	`+ preventImageDroppedHandler (e) {`
`337`	`337`	`e.preventDefault()`
`338`	`338`	`e.stopPropagation()`
`339`	`339`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ class FinderMain extends React.Component {`
`68`	`68`
`69`	`69`	`handleWindowBlur (e) {`
`70`	`70`	`this.setState({`
`71`		`- search: '',`
	`71`	`+ search: ''`
`72`	`72`	`})`
`73`	`73`	`}`
`74`	`74`
Original file line number	Diff line number	Diff line change
`@@ -318,7 +318,7 @@ class NoteList extends React.Component {`
`318`	`318`	`})`
`319`	`319`	`}`
`320`	`320`
`321`		`- alertIfSnippet() {`
	`321`	`+ alertIfSnippet () {`
`322`	`322`	`let { location } = this.props`
`323`	`323`	`const targetIndex = _.findIndex(this.notes, (note) => {`
`324`	`324`	return `${note.storage}-${note.key}` === location.query.key
`@@ -332,7 +332,7 @@ class NoteList extends React.Component {`
`332`	`332`	`}`
`333`	`333`	`}`
`334`	`334`
`335`		`- jumpToTop() {`
	`335`	`+ jumpToTop () {`
`336`	`336`	`if (this.notes === null \|\| this.notes.length === 0) {`
`337`	`337`	`return`
`338`	`338`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`import React, { PropTypes } from 'react'`
`2`	`2`	`import ReactDOM from 'react-dom'`
`3`		`-import store from '../store'`
`4`	`3`
`5`	`4`	`const electron = require('electron')`
`6`	`5`	`const ipc = electron.ipcRenderer`
`@@ -26,7 +25,6 @@ export default class DeleteArticleModal extends React.Component {`
`26`	`25`	`}`
`27`	`26`
`28`	`27`	`handleYesButtonClick (e) {`
`29`		`- // store.dispatch(destroyArticle(this.props.articleKey))`
`30`	`28`	`this.props.close()`
`31`	`29`	`}`
`32`	`30`