scratchfoundation/scratch-desktop
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-desktop.git synced 2025-01-08 21:51:55 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix "about" window in dev mode

Browse source
This commit is contained in:
Christopher Willis-Ford 2019-08-05 14:57:29 -07:00
parent 8b2cdb0086
commit 232f2f4310
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/main/index.js
View file

@ -42,16 +42,22 @@ const createWindow = ({search = null, url = 'index.html', ...browserWindowOption
});
});
if (isDevelopment) {
window.loadURL(`http://localhost:${process.env.ELECTRON_WEBPACK_WDS_PORT}/${url}`);
} else {
window.loadURL(formatUrl({
const fullUrl = formatUrl(isDevelopment ?
{ // Webpack Dev Server
hostname: 'localhost',
pathname: url,
port: process.env.ELECTRON_WEBPACK_WDS_PORT,
protocol: 'http',
search,
slashes: true
} : { // production / bundled
pathname: path.join(__dirname, url),
protocol: 'file',
search,
slashes: true
}));
}
}
);
window.loadURL(fullUrl);
return window;
};