Avoid reimporting the same stuff

yikuansun · Mar 31, 2021 · 9cda258 · 9cda258
1 parent ce124ae
commit 9cda258
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 15 deletions.
diff --git a/window/app.js b/window/app.js
@@ -1,12 +1,9 @@
-const { ipcRenderer, remote } = require('electron');
+const { app, ipcRenderer, remote } = require('electron');
 const { BrowserWindow, Menu } = remote;
 const fs = require('fs');
 const ioHook = require('iohook');
 const os = require('os');
-const electron = require('electron');
-const userDataPath = (electron.app || electron.remote.app).getPath(
-    'userData'
-);
+const userDataPath = (app || remote.app).getPath("userData");
 
 var keycodeNames = JSON.parse(fs.readFileSync(__dirname + "/keycodenames/" + os.platform() + ".json", "utf-8"));
 

diff --git a/window/settings.js b/window/settings.js
@@ -1,10 +1,7 @@
 const fs = require('fs');
-const { ipcRenderer } = require('electron');
+const { app, ipcRenderer, remote } = require('electron');
 const customTitlebar = require('custom-electron-titlebar');
-const electron = require('electron');
-const userDataPath = (electron.app || electron.remote.app).getPath(
-    'userData'
-);
+const userDataPath = (app || remote.app).getPath("userData");
 
 new customTitlebar.Titlebar({
 	backgroundColor: customTitlebar.Color.fromHex('#141414')

diff --git a/window/splitsmanager/editsplits.js b/window/splitsmanager/editsplits.js
@@ -1,10 +1,7 @@
 const fs = require('fs');
-const { ipcRenderer } = require('electron');
+const { app, ipcRenderer, remote } = require('electron');
 const customTitlebar = require('custom-electron-titlebar');
-const electron = require('electron');
-const userDataPath = (electron.app || electron.remote.app).getPath(
-    'userData'
-);
+const userDataPath = (app || remote.app).getPath("userData");
 
 new customTitlebar.Titlebar({
 	backgroundColor: customTitlebar.Color.fromHex('#002F63')