Code cleanup

sindresorhus · sindresorhus · commit df3d73e51a18 · 2018-05-29T01:10:36.000+07:00
diff --git a/index.js b/index.js
@@ -8,38 +8,30 @@ const isMacOS = process.platform === 'darwin';
 
 const devToolsOptions = {};
 
-function toggleDevTools(win) {
-	win = win || BrowserWindow.getFocusedWindow();
-
+function toggleDevTools(win = BrowserWindow.getFocusedWindow()) {
 	if (win) {
-		const contents = win.webContents;
-		if (contents.isDevToolsOpened()) {
-			contents.closeDevTools();
+		const {webContents} = win;
+		if (webContents.isDevToolsOpened()) {
+			webContents.closeDevTools();
 		} else {
-			contents.openDevTools(devToolsOptions);
+			webContents.openDevTools(devToolsOptions);
 		}
 	}
 }
 
-function devTools(win) {
-	win = win || BrowserWindow.getFocusedWindow();
-
+function devTools(win = BrowserWindow.getFocusedWindow()) {
 	if (win) {
 		toggleDevTools(win);
 	}
 }
 
-function openDevTools(win) {
-	win = win || BrowserWindow.getFocusedWindow();
-
+function openDevTools(win = BrowserWindow.getFocusedWindow()) {
 	if (win) {
 		win.webContents.openDevTools(devToolsOptions);
 	}
 }
 
-function refresh(win) {
-	win = win || BrowserWindow.getFocusedWindow();
-
+function refresh(win = BrowserWindow.getFocusedWindow()) {
 	if (win) {
 		win.webContents.reloadIgnoringCache();
 	}
@@ -71,7 +63,7 @@ const addExtensionIfInstalled = (name, getPath) => {
 		if (!isExtensionInstalled(name)) {
 			BrowserWindow.addDevToolsExtension(getPath(name));
 		}
-	} catch (err) {}
+	} catch (_) {}
 };
 
 module.exports = opts => {
diff --git a/package.json b/package.json
@@ -31,7 +31,7 @@
 	},
 	"devDependencies": {
 		"devtron": "^1.1.0",
-		"electron": "^1.6.12",
+		"electron": "^2.0.2",
 		"electron-react-devtools": "^0.5.3",
 		"xo": "*"
 	},
diff --git a/readme.md b/readme.md
@@ -2,8 +2,6 @@
 
 > Adds useful debug features to your [Electron](https://electronjs.org) app
 
-Ideas for more debug features [welcome!](https://github.com/sindresorhus/electron-debug/issues/new)
-
 
 ## Features
 
@@ -45,6 +43,8 @@ Just install any of these extension and they'll be activated for you:
 $ npm install electron-debug
 ```
 
+*Requires Electron 2.0.0 or later.*
+
 
 ## Usage
 

Original file line number	Diff line number	Diff line change
`@@ -8,38 +8,30 @@ const isMacOS = process.platform === 'darwin';`
`8`	`8`
`9`	`9`	`const devToolsOptions = {};`
`10`	`10`
`11`		`-function toggleDevTools(win) {`
`12`		`- win = win \|\| BrowserWindow.getFocusedWindow();`
`13`		`-`
	`11`	`+function toggleDevTools(win = BrowserWindow.getFocusedWindow()) {`
`14`	`12`	`if (win) {`
`15`		`- const contents = win.webContents;`
`16`		`- if (contents.isDevToolsOpened()) {`
`17`		`- contents.closeDevTools();`
	`13`	`+ const {webContents} = win;`
	`14`	`+ if (webContents.isDevToolsOpened()) {`
	`15`	`+ webContents.closeDevTools();`
`18`	`16`	`} else {`
`19`		`- contents.openDevTools(devToolsOptions);`
	`17`	`+ webContents.openDevTools(devToolsOptions);`
`20`	`18`	`}`
`21`	`19`	`}`
`22`	`20`	`}`
`23`	`21`
`24`		`-function devTools(win) {`
`25`		`- win = win \|\| BrowserWindow.getFocusedWindow();`
`26`		`-`
	`22`	`+function devTools(win = BrowserWindow.getFocusedWindow()) {`
`27`	`23`	`if (win) {`
`28`	`24`	`toggleDevTools(win);`
`29`	`25`	`}`
`30`	`26`	`}`
`31`	`27`
`32`		`-function openDevTools(win) {`
`33`		`- win = win \|\| BrowserWindow.getFocusedWindow();`
`34`		`-`
	`28`	`+function openDevTools(win = BrowserWindow.getFocusedWindow()) {`
`35`	`29`	`if (win) {`
`36`	`30`	`win.webContents.openDevTools(devToolsOptions);`
`37`	`31`	`}`
`38`	`32`	`}`
`39`	`33`
`40`		`-function refresh(win) {`
`41`		`- win = win \|\| BrowserWindow.getFocusedWindow();`
`42`		`-`
	`34`	`+function refresh(win = BrowserWindow.getFocusedWindow()) {`
`43`	`35`	`if (win) {`
`44`	`36`	`win.webContents.reloadIgnoringCache();`
`45`	`37`	`}`
`@@ -71,7 +63,7 @@ const addExtensionIfInstalled = (name, getPath) => {`
`71`	`63`	`if (!isExtensionInstalled(name)) {`
`72`	`64`	`BrowserWindow.addDevToolsExtension(getPath(name));`
`73`	`65`	`}`
`74`		`- } catch (err) {}`
	`66`	`+ } catch (_) {}`
`75`	`67`	`};`
`76`	`68`
`77`	`69`	`module.exports = opts => {`