From 04402b325a5d2de9f2164656c13b6a8da07ba803 Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 9 Dec 2019 15:01:10 +0000 Subject: [PATCH] Remove more origin migrator bits --- electron_app/src/electron-main.js | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/electron_app/src/electron-main.js b/electron_app/src/electron-main.js index 31a0d143e7..deb20a1a3c 100644 --- a/electron_app/src/electron-main.js +++ b/electron_app/src/electron-main.js @@ -35,7 +35,6 @@ const tray = require('./tray'); const vectorMenu = require('./vectormenu'); const webContentsHandler = require('./webcontents-handler'); const updater = require('./updater'); -const { migrateFromOldOrigin } = require('./originMigrator'); const windowStateKeeper = require('electron-window-state'); const Store = require('electron-store'); @@ -467,13 +466,7 @@ app.on('ready', () => { let baseDir; // first part of the path determines where we serve from - if (migratingOrigin && target[1] === 'origin_migrator_dest') { - // the origin migrator destination page - // (only the destination script needs to come from the - // custom protocol: the source part is loaded from a - // file:// as that's the origin we're migrating from). - baseDir = __dirname + "/../../origin_migrator/dest"; - } else if (target[1] === 'webapp') { + if (target[1] === 'webapp') { baseDir = __dirname + "/../../webapp"; } else { callback({error: -6}); // FILE_NOT_FOUND