diff options
author | 2021-05-10 11:42:47 +0530 | |
---|---|---|
committer | 2021-05-12 05:09:03 +0530 | |
commit | 49be66ce0cf9391487451d1e0e3e63bc689300c5 (patch) | |
tree | e86227b3a9f7ee1ce2ac33ff9640426975d0a230 /src/index.js | |
parent | Method reuse (#1379) (diff) | |
download | ferdium-app-49be66ce0cf9391487451d1e0e3e63bc689300c5.tar.gz ferdium-app-49be66ce0cf9391487451d1e0e3e63bc689300c5.tar.zst ferdium-app-49be66ce0cf9391487451d1e0e3e63bc689300c5.zip |
Remove duplicated lines (probably introduced in a bad conflict-resolution step).
Added TODOs for other duplicated code that is more involved in fixing.
Diffstat (limited to 'src/index.js')
-rw-r--r-- | src/index.js | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/index.js b/src/index.js index 0fac386df..9c0506f53 100644 --- a/src/index.js +++ b/src/index.js | |||
@@ -11,6 +11,7 @@ import path from 'path'; | |||
11 | import windowStateKeeper from 'electron-window-state'; | 11 | import windowStateKeeper from 'electron-window-state'; |
12 | import { enforceMacOSAppLocation } from 'electron-util'; | 12 | import { enforceMacOSAppLocation } from 'electron-util'; |
13 | 13 | ||
14 | // TODO: This seems to be duplicated between here and 'config.js' | ||
14 | // Set app directory before loading user modules | 15 | // Set app directory before loading user modules |
15 | if (process.env.FERDI_APPDATA_DIR != null) { | 16 | if (process.env.FERDI_APPDATA_DIR != null) { |
16 | app.setPath('appData', process.env.FERDI_APPDATA_DIR); | 17 | app.setPath('appData', process.env.FERDI_APPDATA_DIR); |
@@ -65,10 +66,6 @@ app.allowRendererProcessReuse = false; | |||
65 | debug('Set userAgent to ', userAgent()); | 66 | debug('Set userAgent to ', userAgent()); |
66 | app.userAgentFallback = userAgent(); | 67 | app.userAgentFallback = userAgent(); |
67 | 68 | ||
68 | // Globally set useragent to fix user agent override in service workers | ||
69 | debug('Set userAgent to ', userAgent()); | ||
70 | app.userAgentFallback = userAgent(); | ||
71 | |||
72 | // Keep a global reference of the window object, if you don't, the window will | 69 | // Keep a global reference of the window object, if you don't, the window will |
73 | // be closed automatically when the JavaScript object is garbage collected. | 70 | // be closed automatically when the JavaScript object is garbage collected. |
74 | let mainWindow; | 71 | let mainWindow; |