gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove more origin migrator bits

This commit is contained in:
David Baker 2019-12-09 15:01:10 +00:00
parent bd57ff793f
commit 04402b325a
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
electron_app/src/electron-main.js
View File

@ -35,7 +35,6 @@ const tray = require('./tray');
const vectorMenu = require('./vectormenu'); const vectorMenu = require('./vectormenu');
const webContentsHandler = require('./webcontents-handler'); const webContentsHandler = require('./webcontents-handler');
const updater = require('./updater'); const updater = require('./updater');
const { migrateFromOldOrigin } = require('./originMigrator');
const windowStateKeeper = require('electron-window-state'); const windowStateKeeper = require('electron-window-state');
const Store = require('electron-store'); const Store = require('electron-store');
@ -467,13 +466,7 @@ app.on('ready', () => {
let baseDir; let baseDir;
// first part of the path determines where we serve from // first part of the path determines where we serve from
if (migratingOrigin && target[1] === 'origin_migrator_dest') { if (target[1] === 'webapp') {
// 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') {
baseDir = __dirname + "/../../webapp"; baseDir = __dirname + "/../../webapp";
} else { } else {
callback({error: -6}); // FILE_NOT_FOUND callback({error: -6}); // FILE_NOT_FOUND