From 6099c9121640b96a618fde6515deea2dcef06459 Mon Sep 17 00:00:00 2001 From: Rokt33r Date: Thu, 21 Apr 2016 21:07:09 +0900 Subject: [PATCH] standarded --- browser/finder/index.js | 2 +- browser/lib/hljsThemes.js | 148 +++++++++--------- browser/lib/markdown.js | 8 +- browser/main/index.js | 2 +- browser/main/modal/Preference/FolderRow.js | 24 +-- .../main/modal/Preference/FolderSettingTab.js | 4 +- browser/main/modal/Preferences.js | 3 - browser/main/modal/Tutorial.js | 8 +- browser/main/reducer.js | 10 +- lib/finder-menu.js | 2 +- lib/main-menu.js | 2 +- package.json | 6 +- 12 files changed, 109 insertions(+), 110 deletions(-) diff --git a/browser/finder/index.js b/browser/finder/index.js index 839b2f48..8012346a 100644 --- a/browser/finder/index.js +++ b/browser/finder/index.js @@ -22,7 +22,7 @@ ipcRenderer.on('config-apply', function (e, newConfig) { applyConfig(config) }) -function applyConfig(){ +function applyConfig () { let body = document.body body.setAttribute('data-theme', config['theme-ui']) diff --git a/browser/lib/hljsThemes.js b/browser/lib/hljsThemes.js index 689e47fc..3a288c47 100644 --- a/browser/lib/hljsThemes.js +++ b/browser/lib/hljsThemes.js @@ -1,78 +1,78 @@ -const hljsThemeList =[ - {caption: "Default", name: "default"}, - {caption: "Agate", name: "agate"}, - {caption: "Androidstudio", name: "androidstudio"}, - {caption: "Arduino Light", name: "arduino-light"}, - {caption: "Arta", name: "arta"}, - {caption: "Ascetic", name: "ascetic"}, - {caption: "Atelier Cave Dark", name: "atelier-cave-dark"}, - {caption: "Atelier Cave Light", name: "atelier-cave-light"}, - {caption: "Atelier Dune Dark", name: "atelier-dune-dark"}, - {caption: "Atelier Dune Light", name: "atelier-dune-light"}, - {caption: "Atelier Estuary Dark", name: "atelier-estuary-dark"}, - {caption: "Atelier Estuary Light", name: "atelier-estuary-light"}, - {caption: "Atelier Forest Dark", name: "atelier-forest-dark"}, - {caption: "Atelier Forest Light", name: "atelier-forest-light"}, - {caption: "Atelier Heath Dark", name: "atelier-heath-dark"}, - {caption: "Atelier Heath Light", name: "atelier-heath-light"}, - {caption: "Atelier Lakeside Dark", name: "atelier-lakeside-dark"}, - {caption: "Atelier Lakeside Light", name: "atelier-lakeside-light"}, - {caption: "Atelier Plateau Dark", name: "atelier-plateau-dark"}, - {caption: "Atelier Plateau Light", name: "atelier-plateau-light"}, - {caption: "Atelier Savanna Dark", name: "atelier-savanna-dark"}, - {caption: "Atelier Savanna Light", name: "atelier-savanna-light"}, - {caption: "Atelier Seaside Dark", name: "atelier-seaside-dark"}, - {caption: "Atelier Seaside Light", name: "atelier-seaside-light"}, - {caption: "Atelier Sulphurpool Dark", name: "atelier-sulphurpool-dark"}, - {caption: "Atelier Sulphurpool Light", name: "atelier-sulphurpool-light"}, - {caption: "Brown Paper", name: "brown-paper"}, - {caption: "Codepen Embed", name: "codepen-embed"}, - {caption: "Color Brewer", name: "color-brewer"}, - {caption: "Dark", name: "dark"}, - {caption: "Darkula", name: "darkula"}, - {caption: "Docco", name: "docco"}, - {caption: "Dracula", name: "dracula"}, - {caption: "Far", name: "far"}, - {caption: "Foundation", name: "foundation"}, - {caption: "Github Gist", name: "github-gist"}, - {caption: "Github", name: "github"}, - {caption: "Googlecode", name: "googlecode"}, - {caption: "Grayscale", name: "grayscale"}, - {caption: "Gruvbox Dark", name: "gruvbox.dark"}, - {caption: "Gruvbox Light", name: "gruvbox.light"}, - {caption: "Hopscotch", name: "hopscotch"}, - {caption: "Hybrid", name: "hybrid"}, - {caption: "Idea", name: "idea"}, - {caption: "Ir Black", name: "ir-black"}, - {caption: "Kimbie Dark", name: "kimbie.dark"}, - {caption: "Kimbie Light", name: "kimbie.light"}, - {caption: "Magula", name: "magula"}, - {caption: "Mono Blue", name: "mono-blue"}, - {caption: "Monokai Sublime", name: "monokai-sublime"}, - {caption: "Monokai", name: "monokai"}, - {caption: "Obsidian", name: "obsidian"}, - {caption: "Paraiso Dark", name: "paraiso-dark"}, - {caption: "Paraiso Light", name: "paraiso-light"}, - {caption: "Pojoaque", name: "pojoaque"}, - {caption: "Qtcreator Dark", name: "qtcreator_dark"}, - {caption: "Qtcreator Light", name: "qtcreator_light"}, - {caption: "Railscasts", name: "railscasts"}, - {caption: "Rainbow", name: "rainbow"}, - {caption: "School Book", name: "school-book"}, - {caption: "Solarized Dark", name: "solarized-dark"}, - {caption: "Solarized Light", name: "solarized-light"}, - {caption: "Sunburst", name: "sunburst"}, - {caption: "Tomorrow Night Blue", name: "tomorrow-night-blue"}, - {caption: "Tomorrow Night Bright", name: "tomorrow-night-bright"}, - {caption: "Tomorrow Night Eighties", name: "tomorrow-night-eighties"}, - {caption: "Tomorrow Night", name: "tomorrow-night"}, - {caption: "Tomorrow", name: "tomorrow"}, - {caption: "Vs", name: "vs"}, - {caption: "Xcode", name: "xcode"}, - {caption: "Xt 256", name: "xt256"}, - {caption: "Zenburn", name: "zenburn"} +const hljsThemeList = [ + {caption: 'Default', name: 'default'}, + {caption: 'Agate', name: 'agate'}, + {caption: 'Androidstudio', name: 'androidstudio'}, + {caption: 'Arduino Light', name: 'arduino-light'}, + {caption: 'Arta', name: 'arta'}, + {caption: 'Ascetic', name: 'ascetic'}, + {caption: 'Atelier Cave Dark', name: 'atelier-cave-dark'}, + {caption: 'Atelier Cave Light', name: 'atelier-cave-light'}, + {caption: 'Atelier Dune Dark', name: 'atelier-dune-dark'}, + {caption: 'Atelier Dune Light', name: 'atelier-dune-light'}, + {caption: 'Atelier Estuary Dark', name: 'atelier-estuary-dark'}, + {caption: 'Atelier Estuary Light', name: 'atelier-estuary-light'}, + {caption: 'Atelier Forest Dark', name: 'atelier-forest-dark'}, + {caption: 'Atelier Forest Light', name: 'atelier-forest-light'}, + {caption: 'Atelier Heath Dark', name: 'atelier-heath-dark'}, + {caption: 'Atelier Heath Light', name: 'atelier-heath-light'}, + {caption: 'Atelier Lakeside Dark', name: 'atelier-lakeside-dark'}, + {caption: 'Atelier Lakeside Light', name: 'atelier-lakeside-light'}, + {caption: 'Atelier Plateau Dark', name: 'atelier-plateau-dark'}, + {caption: 'Atelier Plateau Light', name: 'atelier-plateau-light'}, + {caption: 'Atelier Savanna Dark', name: 'atelier-savanna-dark'}, + {caption: 'Atelier Savanna Light', name: 'atelier-savanna-light'}, + {caption: 'Atelier Seaside Dark', name: 'atelier-seaside-dark'}, + {caption: 'Atelier Seaside Light', name: 'atelier-seaside-light'}, + {caption: 'Atelier Sulphurpool Dark', name: 'atelier-sulphurpool-dark'}, + {caption: 'Atelier Sulphurpool Light', name: 'atelier-sulphurpool-light'}, + {caption: 'Brown Paper', name: 'brown-paper'}, + {caption: 'Codepen Embed', name: 'codepen-embed'}, + {caption: 'Color Brewer', name: 'color-brewer'}, + {caption: 'Dark', name: 'dark'}, + {caption: 'Darkula', name: 'darkula'}, + {caption: 'Docco', name: 'docco'}, + {caption: 'Dracula', name: 'dracula'}, + {caption: 'Far', name: 'far'}, + {caption: 'Foundation', name: 'foundation'}, + {caption: 'Github Gist', name: 'github-gist'}, + {caption: 'Github', name: 'github'}, + {caption: 'Googlecode', name: 'googlecode'}, + {caption: 'Grayscale', name: 'grayscale'}, + {caption: 'Gruvbox Dark', name: 'gruvbox.dark'}, + {caption: 'Gruvbox Light', name: 'gruvbox.light'}, + {caption: 'Hopscotch', name: 'hopscotch'}, + {caption: 'Hybrid', name: 'hybrid'}, + {caption: 'Idea', name: 'idea'}, + {caption: 'Ir Black', name: 'ir-black'}, + {caption: 'Kimbie Dark', name: 'kimbie.dark'}, + {caption: 'Kimbie Light', name: 'kimbie.light'}, + {caption: 'Magula', name: 'magula'}, + {caption: 'Mono Blue', name: 'mono-blue'}, + {caption: 'Monokai Sublime', name: 'monokai-sublime'}, + {caption: 'Monokai', name: 'monokai'}, + {caption: 'Obsidian', name: 'obsidian'}, + {caption: 'Paraiso Dark', name: 'paraiso-dark'}, + {caption: 'Paraiso Light', name: 'paraiso-light'}, + {caption: 'Pojoaque', name: 'pojoaque'}, + {caption: 'Qtcreator Dark', name: 'qtcreator_dark'}, + {caption: 'Qtcreator Light', name: 'qtcreator_light'}, + {caption: 'Railscasts', name: 'railscasts'}, + {caption: 'Rainbow', name: 'rainbow'}, + {caption: 'School Book', name: 'school-book'}, + {caption: 'Solarized Dark', name: 'solarized-dark'}, + {caption: 'Solarized Light', name: 'solarized-light'}, + {caption: 'Sunburst', name: 'sunburst'}, + {caption: 'Tomorrow Night Blue', name: 'tomorrow-night-blue'}, + {caption: 'Tomorrow Night Bright', name: 'tomorrow-night-bright'}, + {caption: 'Tomorrow Night Eighties', name: 'tomorrow-night-eighties'}, + {caption: 'Tomorrow Night', name: 'tomorrow-night'}, + {caption: 'Tomorrow', name: 'tomorrow'}, + {caption: 'Vs', name: 'vs'}, + {caption: 'Xcode', name: 'xcode'}, + {caption: 'Xt 256', name: 'xt256'}, + {caption: 'Zenburn', name: 'zenburn'} ] -export default function hljsTheme() { +export default function hljsTheme () { return hljsThemeList } diff --git a/browser/lib/markdown.js b/browser/lib/markdown.js index 0a4ddb13..72326dba 100644 --- a/browser/lib/markdown.js +++ b/browser/lib/markdown.js @@ -12,13 +12,13 @@ var md = markdownit({ if (lang && hljs.getLanguage(lang)) { try { return '
' +
-               hljs.highlight(lang, str).value +
-               '
'; + hljs.highlight(lang, str).value + + '' } catch (e) {} } return '
' +
-           str.replace(/\&/g, '&').replace(/\/g, '>').replace(/\"/g, '"') +
-           '
'; + str.replace(/\&/g, '&').replace(/\/g, '>').replace(/\"/g, '"') + + '' } }) md.use(emoji, { diff --git a/browser/main/index.js b/browser/main/index.js index 718cd503..1bc6f297 100644 --- a/browser/main/index.js +++ b/browser/main/index.js @@ -21,7 +21,7 @@ ipc.on('config-apply', function (e, newConfig) { applyConfig(config) }) -function applyConfig(config) { +function applyConfig (config) { let body = document.body body.setAttribute('data-theme', config['theme-ui']) diff --git a/browser/main/modal/Preference/FolderRow.js b/browser/main/modal/Preference/FolderRow.js index b3cd72ad..f836e9d1 100644 --- a/browser/main/modal/Preference/FolderRow.js +++ b/browser/main/modal/Preference/FolderRow.js @@ -63,7 +63,7 @@ export default class FolderRow extends React.Component { } handleColorButtonClick (index) { - return e => { + return (e) => { this.setState({ color: index, isColorEditing: false @@ -116,7 +116,7 @@ export default class FolderRow extends React.Component { ? 'active' : null return ( - ) @@ -125,7 +125,7 @@ export default class FolderRow extends React.Component { return (
- {this.state.isColorEditing @@ -139,11 +139,11 @@ export default class FolderRow extends React.Component { }
- this.handleNameInputKeyDown(e)} valueLink={this.linkState('name')} type='text'/> + this.handleNameInputKeyDown(e)} valueLink={this.linkState('name')} type='text'/>
- - + +
) @@ -152,8 +152,8 @@ export default class FolderRow extends React.Component {
Are you sure to delete {folder.name} folder?
- - + +
) @@ -162,14 +162,14 @@ export default class FolderRow extends React.Component { return (
- - + +
{folder.name}
- - + +
) diff --git a/browser/main/modal/Preference/FolderSettingTab.js b/browser/main/modal/Preference/FolderSettingTab.js index a466dbe7..2337aa32 100644 --- a/browser/main/modal/Preference/FolderSettingTab.js +++ b/browser/main/modal/Preference/FolderSettingTab.js @@ -75,10 +75,10 @@ export default class FolderSettingTab extends React.Component { {folderElements}
- this.handleNewFolderNameKeyDown(e)} valueLink={this.linkState('name')} type='text' placeholder='New Folder'/> + this.handleNewFolderNameKeyDown(e)} valueLink={this.linkState('name')} type='text' placeholder='New Folder'/>
- +
{alertElement} diff --git a/browser/main/modal/Preferences.js b/browser/main/modal/Preferences.js index 8bea2f3f..01b7ac22 100644 --- a/browser/main/modal/Preferences.js +++ b/browser/main/modal/Preferences.js @@ -8,7 +8,6 @@ import ContactTab from './Preference/ContactTab' import { closeModal } from 'browser/lib/modal' const APP = 'APP' -const HELP = 'HELP' const FOLDER = 'FOLDER' const CONTACT = 'CONTACT' @@ -64,8 +63,6 @@ class Preferences extends React.Component { let { user, folders, dispatch } = this.props switch (this.state.currentTab) { - case HELP: - return () case FOLDER: return ( - - {content} @@ -80,7 +80,7 @@ export default class Tutorial extends React.Component { Boost supports code syntax highlighting.
There are more than 100 different type of language.
- +
) @@ -101,7 +101,7 @@ export default class Tutorial extends React.Component { return (
Are you ready?
- +
) default: diff --git a/browser/main/reducer.js b/browser/main/reducer.js index 8f7afd10..281b3d47 100644 --- a/browser/main/reducer.js +++ b/browser/main/reducer.js @@ -74,7 +74,7 @@ function folders (state = initialFolders, action) { if (newFolder.name == null || newFolder.name.length === 0) throw new Error('Folder name is required') if (newFolder.name.match(/\//)) throw new Error('`/` is not available for folder name') - let conflictFolder = _.find(state, folder => folder.name.toLowerCase() === newFolder.name.toLowerCase()) + let conflictFolder = _.find(state, (folder) => folder.name.toLowerCase() === newFolder.name.toLowerCase()) if (conflictFolder != null) throw new Error(`${conflictFolder.name} already exists!`) state.push(newFolder) @@ -96,7 +96,7 @@ function folders (state = initialFolders, action) { if (targetFolder == null) throw new Error('Folder doesnt exist') // Name conflict check if (targetFolder.name !== folder.name) { - let conflictFolder = _.find(state, _folder => { + let conflictFolder = _.find(state, (_folder) => { return folder.name.toLowerCase() === _folder.name.toLowerCase() && folder.key !== _folder.key }) if (conflictFolder != null) throw new Error('Name conflicted') @@ -114,7 +114,7 @@ function folders (state = initialFolders, action) { if (state.length < 2) throw new Error('Folder must exist more than one') let targetKey = action.data.key - let targetIndex = _.findIndex(state, folder => folder.key === targetKey) + let targetIndex = _.findIndex(state, (folder) => folder.key === targetKey) if (targetIndex >= 0) { state.splice(targetIndex, 1) } @@ -159,9 +159,9 @@ function articles (state = initialArticles, action) { { let modified = action.data.article let targetKey = action.data.key - let originalIndex = _.findIndex(state.data, _article => targetKey === _article.key) + let originalIndex = _.findIndex(state.data, (_article) => targetKey === _article.key) if (originalIndex === -1) return state - let modifiedIndex = _.findIndex(state.modified, _article => targetKey === _article.key) + let modifiedIndex = _.findIndex(state.modified, (_article) => targetKey === _article.key) modified = compareArticle(state.data[originalIndex], modified) if (modified == null) { diff --git a/lib/finder-menu.js b/lib/finder-menu.js index bce97da0..dbc743f6 100644 --- a/lib/finder-menu.js +++ b/lib/finder-menu.js @@ -2,7 +2,7 @@ const electron = require('electron') const BrowserWindow = electron.BrowserWindow const OSX = process.platform === 'darwin' -const WIN = process.platform === 'win32' +// const WIN = process.platform === 'win32' var edit = { label: 'Edit', diff --git a/lib/main-menu.js b/lib/main-menu.js index 678dfaa9..256ef63d 100644 --- a/lib/main-menu.js +++ b/lib/main-menu.js @@ -4,7 +4,7 @@ const shell = electron.shell const mainWindow = require('./main-window') const OSX = process.platform === 'darwin' -const WIN = process.platform === 'win32' +// const WIN = process.platform === 'win32' const LINUX = process.platform === 'linux' var boost = { diff --git a/package.json b/package.json index 72a439ce..818b77cf 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "react-dom": "^0.14.3", "react-redux": "^4.0.6", "redux": "^3.0.5", - "standard": "^5.3.1", + "standard": "^6.0.8", "style-loader": "^0.12.4", "stylus": "^0.52.4", "stylus-loader": "^1.3.1", @@ -76,7 +76,9 @@ }, "optional": false, "standard": { - "ignore": [], + "ignore": [ + "submodules" + ], "globals": [ "localStorage" ]