Skip to content

Commit 62037e8

Browse files
YukaiiYukaii
committed
Convert coding style
1 parent da9059e commit 62037e8

12 files changed

Lines changed: 1103 additions & 354 deletions

File tree

‎.editorconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
root = true
22

33
[*]
4-
indent_style = tab
4+
indent_style = space
55
indent_size = 2
66
trim_trailing_whitespace = true
77
insert_final_newline = true

‎constants.js‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
const Config = require('electron-config');
2-
const config = new Config();
3-
4-
const DEFAULT_SERVER_URL = 'https://hackmd.io';
1+
const DEFAULT_SERVER_URL = 'https://hackmd.io'
52

63
module.exports = {
7-
DEFAULT_SERVER_URL
4+
DEFAULT_SERVER_URL
85
}

‎ipc/client.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
const { ipcRenderer } = require('electron');
1+
const { ipcRenderer } = require('electron')
22

3-
module.exports = function(commandId, args) {
4-
ipcRenderer.send('main:command', { commandId, args });
3+
module.exports = function (commandId, args) {
4+
ipcRenderer.send('main:command', { commandId, args })
55
}

‎ipc/consumer.js‎

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,28 @@
1-
const {app, Menu, BrowserWindow, shell} = require('electron');
2-
const path = require('path');
1+
const {BrowserWindow, shell} = require('electron')
32

4-
const { createWindow } = require('../window');
3+
const { createWindow } = require('../window')
54

6-
module.exports = function(commandId, args={}) {
7-
switch(commandId) {
5+
module.exports = function (commandId, args = {}) {
6+
switch (commandId) {
87
case 'createWindow':
9-
createWindow(args);
10-
break;
8+
createWindow(args)
9+
break
1110
case 'refreshWindow':
12-
BrowserWindow.getFocusedWindow().webContents.send('web:refresh');
13-
break;
11+
BrowserWindow.getFocusedWindow().webContents.send('web:refresh')
12+
break
1413
case 'learnMore':
15-
shell.openExternal('https://hackmd.io');
16-
break;
17-
case 'goForward':
18-
BrowserWindow.getFocusedWindow().webContents.send('web:go-forward');
19-
break;
20-
case 'goBack':
21-
BrowserWindow.getFocusedWindow().webContents.send('web:go-back');
22-
break;
23-
case 'configServerUrl':
24-
BrowserWindow.getFocusedWindow().webContents.send('config-serverurl');
25-
break;
14+
shell.openExternal('https://hackmd.io')
15+
break
16+
case 'goForward':
17+
BrowserWindow.getFocusedWindow().webContents.send('web:go-forward')
18+
break
19+
case 'goBack':
20+
BrowserWindow.getFocusedWindow().webContents.send('web:go-back')
21+
break
22+
case 'configServerUrl':
23+
BrowserWindow.getFocusedWindow().webContents.send('config-serverurl')
24+
break
2625
default:
27-
break;
26+
break
2827
}
2928
}

‎ipc/server.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
const { ipcMain } = require('electron');
2-
const consumer = require('./consumer');
1+
const { ipcMain } = require('electron')
2+
const consumer = require('./consumer')
33

44
ipcMain.on('main:command', (event, { commandId, args }) => {
5-
consumer(commandId, args);
6-
});
5+
consumer(commandId, args)
6+
})

‎main.js‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,19 @@
1-
const { app, BrowserWindow, Menu } = require('electron');
2-
const os = require('os');
3-
const fs = require('fs');
4-
const path = require('path');
5-
const menu = require('./menu');
6-
const { createWindow } = require('./window');
1+
const { app, Menu } = require('electron')
2+
const path = require('path')
3+
const menu = require('./menu')
4+
const { createWindow } = require('./window')
75

8-
require('./ipc/server');
9-
10-
let mainWin;
6+
require('./ipc/server')
117

128
function initializeApp () {
13-
Menu.setApplicationMenu(menu);
9+
Menu.setApplicationMenu(menu)
1410

15-
mainWin = createWindow({url: `file://${path.join(__dirname, 'index.html')}`});
11+
createWindow({url: `file://${path.join(__dirname, 'index.html')}`})
1612
}
1713

1814
app.on('ready', () => {
19-
initializeApp();
20-
});
15+
initializeApp()
16+
})
2117

2218
app.on('window-all-closed', () => {
2319
if (process.platform !== 'darwin') {

‎menu.js‎

Lines changed: 72 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,43 @@
1-
const { ipcMain, ipcRenderer } = require('electron');
2-
const path = require('path');
3-
const os = require('os');
1+
const { ipcMain, ipcRenderer } = require('electron')
2+
const path = require('path')
3+
const os = require('os')
44

5-
const Menu = require('electron').Menu || require('electron').remote.Menu;
6-
const app = require('electron').app || require('electron').remote.app;
5+
const Menu = require('electron').Menu || require('electron').remote.Menu
6+
const app = require('electron').app || require('electron').remote.app
77

8-
const consumer = require('./ipc/consumer');
9-
const { getServerUrl } = require('./utils');
8+
const consumer = require('./ipc/consumer')
9+
const { getServerUrl } = require('./utils')
1010

11-
const isMainProcess = typeof ipcMain !== 'undefined';
11+
const isMainProcess = typeof ipcMain !== 'undefined'
1212

13-
function exec(commandId, args={}) {
13+
function exec (commandId, args = {}) {
1414
if (isMainProcess) {
15-
consumer(commandId, args);
15+
consumer(commandId, args)
1616
} else {
17-
ipcRenderer.send('main:command', { commandId, args });
17+
ipcRenderer.send('main:command', { commandId, args })
1818
}
1919
}
2020

2121
const template = [
22-
{
23-
label: 'File',
24-
submenu: [
25-
{
26-
label: 'New File',
27-
accelerator: 'CmdOrCtrl+N',
28-
click () {
22+
{
23+
label: 'File',
24+
submenu: [
25+
{
26+
label: 'New File',
27+
accelerator: 'CmdOrCtrl+N',
28+
click () {
2929
exec('createWindow', {url: `file://${path.join(__dirname, `index.html?target=${path.join(getServerUrl(), '/new')}`)}`})
30-
}
31-
},
32-
{
33-
label: 'New Window',
34-
accelerator: 'CmdOrCtrl+Shift+N',
35-
click () {
30+
}
31+
},
32+
{
33+
label: 'New Window',
34+
accelerator: 'CmdOrCtrl+Shift+N',
35+
click () {
3636
exec('createWindow', {url: `file://${path.join(__dirname, 'index.html')}`})
37-
}
38-
}
39-
]
40-
},
37+
}
38+
}
39+
]
40+
},
4141
{
4242
label: 'Edit',
4343
submenu: [
@@ -68,36 +68,36 @@ const template = [
6868
{
6969
role: 'selectall'
7070
},
71-
{
72-
type: 'separator',
73-
},
74-
{
75-
label: 'Customize HackMD server',
76-
click () {
77-
exec('configServerUrl');
78-
}
79-
}
71+
{
72+
type: 'separator'
73+
},
74+
{
75+
label: 'Customize HackMD server',
76+
click () {
77+
exec('configServerUrl')
78+
}
79+
}
80+
]
81+
},
82+
{
83+
label: 'History',
84+
submenu: [
85+
{
86+
label: 'Forward',
87+
accelerator: 'CmdOrCtrl+]',
88+
click () {
89+
exec('goForward')
90+
}
91+
},
92+
{
93+
label: 'Back',
94+
accelerator: 'CmdOrCtrl+[',
95+
click () {
96+
exec('goBack')
97+
}
98+
}
8099
]
81100
},
82-
{
83-
label: 'History',
84-
submenu: [
85-
{
86-
label: 'Forward',
87-
accelerator: 'CmdOrCtrl+]',
88-
click () {
89-
exec('goForward');
90-
}
91-
},
92-
{
93-
label: 'Back',
94-
accelerator: 'CmdOrCtrl+[',
95-
click () {
96-
exec('goBack');
97-
}
98-
},
99-
]
100-
},
101101
{
102102
role: 'window',
103103
submenu: [
@@ -107,25 +107,25 @@ const template = [
107107
{
108108
role: 'close'
109109
},
110-
{
111-
type: 'separator'
112-
},
113-
{
114-
label: 'Refresh',
115-
accelerator: 'CmdOrCtrl+R',
116-
click () {
117-
exec('refreshWindow');
118-
}
119-
},
120-
{
121-
type: 'separator'
122-
},
110+
{
111+
type: 'separator'
112+
},
113+
{
114+
label: 'Refresh',
115+
accelerator: 'CmdOrCtrl+R',
116+
click () {
117+
exec('refreshWindow')
118+
}
119+
},
120+
{
121+
type: 'separator'
122+
},
123123
{
124124
role: 'togglefullscreen'
125125
},
126126
{
127127
role: 'toggledevtools'
128-
},
128+
}
129129
]
130130
},
131131
{
@@ -134,7 +134,7 @@ const template = [
134134
{
135135
label: 'Learn More',
136136
click () {
137-
exec('learnMore');
137+
exec('learnMore')
138138
}
139139
}
140140
]
@@ -194,4 +194,4 @@ if (os.platform() === 'darwin') {
194194
)
195195
}
196196

197-
module.exports = Menu.buildFromTemplate(template);
197+
module.exports = Menu.buildFromTemplate(template)

‎package.json‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,30 @@
99
"start": "cross-env NODE_ENV=production electron .",
1010
"dist": "build -mw --linux deb",
1111
"dist:macos": "build -m",
12-
"dist:linux": "build --linux deb"
12+
"dist:linux": "build --linux deb",
13+
"lint": "standard"
1314
},
1415
"author": "HackMD <hackmdio@gmail.com> (https://hackmd.io)",
1516
"license": "MIT",
1617
"devDependencies": {
1718
"cross-env": "^3.1.4",
1819
"devtron": "^1.4.0",
1920
"electron": "^1.4.15",
20-
"electron-builder": "^11.4.4"
21+
"electron-builder": "^11.4.4",
22+
"standard": "^9.0.2"
2123
},
2224
"build": {
2325
"appId": "com.hackmd.desktop",
2426
"mac": {
2527
"category": "public.app-category.productivity"
2628
}
2729
},
30+
"standard": {
31+
"globals": [
32+
"$",
33+
"Notification"
34+
]
35+
},
2836
"dependencies": {
2937
"electron-config": "^0.2.1",
3038
"jquery": "^3.2.1",

0 commit comments

Comments
 (0)