From d6655c7ce044467096e2f79e0462012995f8249c Mon Sep 17 00:00:00 2001 From: Benjamin Auzanneau Date: Wed, 3 Jan 2018 13:45:19 +0100 Subject: [PATCH 1/2] Correction of a word. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ffb84c8af..80b7f82b2 100644 --- a/README.md +++ b/README.md @@ -75,7 +75,7 @@ Your built files are in the /dist folder. |Command|Description| |--|--| -|`npm run start:web`| Execute the app in the brower | +|`npm run start:web`| Execute the app in the browser | |`npm run electron:linux`| Builds your application and creates an app consumable on linux system | |`npm run electron:windows`| On a Windows OS, builds your application and creates an app consumable in windows 32/64 bit systems | |`npm run electron:mac`| On a MAC OS, builds your application and generates a `.app` file of your application that can be run on Mac | From 136344b1cb96ea9947a080394c2280721ff45667 Mon Sep 17 00:00:00 2001 From: Steve Porter Date: Wed, 10 Jan 2018 20:37:46 +0000 Subject: [PATCH 2/2] fix: fixes maximegris/angular-electron#98 --- main.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/main.ts b/main.ts index a11862af5..aa09abb51 100644 --- a/main.ts +++ b/main.ts @@ -4,6 +4,7 @@ import * as path from 'path'; let win, serve; const args = process.argv.slice(1); serve = args.some(val => val === '--serve'); +import * as url from 'url'; if (serve) { require('electron-reload')(__dirname, { @@ -24,7 +25,11 @@ function createWindow() { }); // and load the index.html of the app. - win.loadURL('file://' + __dirname + '/index.html'); + win.loadURL(url.format({ + protocol: 'file:', + pathname: path.join(__dirname, '/index.html'), + slashes: true + })); // Open the DevTools. if (serve) {