From 49be66ce0cf9391487451d1e0e3e63bc689300c5 Mon Sep 17 00:00:00 2001 From: Vijay A Date: Mon, 10 May 2021 11:42:47 +0530 Subject: Remove duplicated lines (probably introduced in a bad conflict-resolution step). Added TODOs for other duplicated code that is more involved in fixing. --- src/config.js | 1 + src/index.js | 5 +---- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/config.js b/src/config.js index 62bbaac12..e6bd83e06 100644 --- a/src/config.js +++ b/src/config.js @@ -171,6 +171,7 @@ export const FILE_SYSTEM_SETTINGS_TYPES = [ export const LOCAL_SERVER = 'You are using Ferdi without a server'; export const SERVER_NOT_LOADED = 'Ferdi::SERVER_NOT_LOADED'; +// TODO: This seems to be duplicated between here and 'index.js' // Set app directory before loading user modules if (process.env.FERDI_APPDATA_DIR != null) { app.setPath('appData', process.env.FERDI_APPDATA_DIR); 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'; import windowStateKeeper from 'electron-window-state'; import { enforceMacOSAppLocation } from 'electron-util'; +// TODO: This seems to be duplicated between here and 'config.js' // Set app directory before loading user modules if (process.env.FERDI_APPDATA_DIR != null) { app.setPath('appData', process.env.FERDI_APPDATA_DIR); @@ -65,10 +66,6 @@ app.allowRendererProcessReuse = false; debug('Set userAgent to ', userAgent()); app.userAgentFallback = userAgent(); -// Globally set useragent to fix user agent override in service workers -debug('Set userAgent to ', userAgent()); -app.userAgentFallback = userAgent(); - // Keep a global reference of the window object, if you don't, the window will // be closed automatically when the JavaScript object is garbage collected. let mainWindow; -- cgit v1.2.3-70-g09d2