From 8925f7c381dadc6386b90204cb0a1c4c7cb9127e Mon Sep 17 00:00:00 2001 From: Hung Nguyen Date: Fri, 20 Apr 2018 23:58:52 +0700 Subject: [PATCH] fixed eslint error --- browser/main/lib/dataApi/createSnippet.js | 8 +++----- browser/main/lib/dataApi/deleteSnippet.js | 10 ++++------ browser/main/lib/dataApi/updateSnippet.js | 5 ++--- .../modals/PreferencesModal/SnippetEditor.js | 5 +---- .../modals/PreferencesModal/SnippetTab.js | 20 +++++++++---------- 5 files changed, 19 insertions(+), 29 deletions(-) diff --git a/browser/main/lib/dataApi/createSnippet.js b/browser/main/lib/dataApi/createSnippet.js index 366a1bb1..d2847ae4 100644 --- a/browser/main/lib/dataApi/createSnippet.js +++ b/browser/main/lib/dataApi/createSnippet.js @@ -1,13 +1,11 @@ -const { remote } = require('electron') import fs from 'fs' -import path from 'path' import crypto from 'crypto' import consts from 'browser/lib/consts' -function createSnippet(snippets) { +function createSnippet (snippets) { return new Promise((resolve, reject) => { - const newSnippet = { - id: crypto.randomBytes(16).toString('hex'), + const newSnippet = { + id: crypto.randomBytes(16).toString('hex'), name: 'Unnamed snippet', prefix: [], content: '' diff --git a/browser/main/lib/dataApi/deleteSnippet.js b/browser/main/lib/dataApi/deleteSnippet.js index e988fd55..17587b5f 100644 --- a/browser/main/lib/dataApi/deleteSnippet.js +++ b/browser/main/lib/dataApi/deleteSnippet.js @@ -1,20 +1,18 @@ -const { remote } = require('electron') import fs from 'fs' -import path from 'path' import consts from 'browser/lib/consts' function deleteSnippet (snippets, snippetId) { return new Promise((resolve, reject) => { - for(let i = 0; i < snippets.length; i++) { + for (let i = 0; i < snippets.length; i++) { if (snippets[i].id === snippetId) { - snippets.splice(i, 1); + snippets.splice(i, 1) fs.writeFile(consts.SNIPPET_FILE, JSON.stringify(snippets, null, 4), (err) => { if (err) reject(err) resolve(snippets) }) } } - }) + }) } -module.exports = deleteSnippet \ No newline at end of file +module.exports = deleteSnippet diff --git a/browser/main/lib/dataApi/updateSnippet.js b/browser/main/lib/dataApi/updateSnippet.js index 07a3ea98..60677bb8 100644 --- a/browser/main/lib/dataApi/updateSnippet.js +++ b/browser/main/lib/dataApi/updateSnippet.js @@ -3,10 +3,10 @@ import consts from 'browser/lib/consts' function updateSnippet (snippet) { return new Promise((resolve, reject) => { - let snippets = JSON.parse(fs.readFileSync(consts.SNIPPET_FILE, 'utf-8')) + const snippets = JSON.parse(fs.readFileSync(consts.SNIPPET_FILE, 'utf-8')) for (let i = 0; i < snippets.length; i++) { - let currentSnippet = snippets[i] + const currentSnippet = snippets[i] if (currentSnippet.id === snippet.id) { if ( @@ -20,7 +20,6 @@ function updateSnippet (snippet) { currentSnippet.name = snippet.name currentSnippet.prefix = snippet.prefix currentSnippet.content = snippet.content - fs.writeFile(consts.SNIPPET_FILE, JSON.stringify(snippets, null, 4), (err) => { if (err) reject(err) resolve(snippets) diff --git a/browser/main/modals/PreferencesModal/SnippetEditor.js b/browser/main/modals/PreferencesModal/SnippetEditor.js index e72c2b46..20b1f66a 100644 --- a/browser/main/modals/PreferencesModal/SnippetEditor.js +++ b/browser/main/modals/PreferencesModal/SnippetEditor.js @@ -2,12 +2,9 @@ import CodeMirror from 'codemirror' import React from 'react' import _ from 'lodash' import fs from 'fs' -import path from 'path' import consts from 'browser/lib/consts' import dataApi from 'browser/main/lib/dataApi' -const { remote } = require('electron') - const defaultEditorFontFamily = ['Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'source-code-pro', 'monospace'] const buildCMRulers = (rulers, enableRulers) => enableRulers ? rulers.map(ruler => ({ column: ruler })) : [] @@ -48,7 +45,7 @@ export default class SnippetEditor extends React.Component { } saveSnippet () { - dataApi.updateSnippet(this.snippet).catch((err) => {throw err}) + dataApi.updateSnippet(this.snippet).catch((err) => { throw err }) } loadSnippet (snippetId) { diff --git a/browser/main/modals/PreferencesModal/SnippetTab.js b/browser/main/modals/PreferencesModal/SnippetTab.js index 30fbb099..f72f9a4d 100644 --- a/browser/main/modals/PreferencesModal/SnippetTab.js +++ b/browser/main/modals/PreferencesModal/SnippetTab.js @@ -4,7 +4,6 @@ import styles from './SnippetTab.styl' import fs from 'fs' import SnippetEditor from './SnippetEditor' import i18n from 'browser/lib/i18n' -import path from 'path' import dataApi from 'browser/main/lib/dataApi' import consts from 'browser/lib/consts' @@ -29,13 +28,13 @@ class SnippetTab extends React.Component { } handleSnippetClick (snippet) { - let currentSnippet = Object.assign({}, snippet) + const currentSnippet = Object.assign({}, snippet) currentSnippet.prefix = currentSnippet.prefix.join(', ') this.setState({currentSnippet}) } - handleSnippetContextMenu(snippet) { - let menu = new Menu() + handleSnippetContextMenu (snippet) { + const menu = new Menu() menu.append(new MenuItem({ label: 'Delete', click: () => { @@ -45,21 +44,21 @@ class SnippetTab extends React.Component { menu.popup() } - deleteSnippet(id) { + deleteSnippet (id) { dataApi.deleteSnippet(this.snippets, id).then((snippets) => { this.snippets = snippets this.setState(this.snippets) - }).catch(err => {throw err}) + }).catch(err => { throw err }) } - createSnippet() { + createSnippet () { dataApi.createSnippet(this.snippets).then((snippets) => { this.snippets = snippets this.setState(this.snippets) // scroll to end of list when added new snippet - let snippetList = document.getElementById("snippets") + const snippetList = document.getElementById('snippets') snippetList.scrollTop = snippetList.scrollHeight - }).catch(err => {throw err}) + }).catch(err => { throw err }) } renderSnippetList () { @@ -72,8 +71,7 @@ class SnippetTab extends React.Component { styleName='snippet-item' key={snippet.id} onContextMenu={() => this.handleSnippetContextMenu(snippet)} - onClick={() => { - this.handleSnippetClick(snippet)}}> + onClick={() => this.handleSnippetClick(snippet)}> {snippet.name} ))