Fix url resolving

Yukaii · Yukaii · commit 574bd1cfd954 · 2017-03-23T12:00:13.000+08:00
diff --git a/menu.js b/menu.js
@@ -1,5 +1,6 @@
 const { ipcMain, ipcRenderer } = require('electron')
 const path = require('path')
+const url = require('url')
 const os = require('os')
 
 const Menu = require('electron').Menu || require('electron').remote.Menu
@@ -26,7 +27,7 @@ const template = [
         label: 'New File',
         accelerator: 'CmdOrCtrl+N',
         click () {
-          exec('createWindow', {url: `file://${path.join(__dirname, `index.html?target=${path.join(getServerUrl(), '/new')}`)}`})
+          exec('createWindow', {url: `file://${path.join(__dirname, `index.html?target=${url.resolve(getServerUrl(), '/new')}`)}`})
         }
       },
       {

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`const { ipcMain, ipcRenderer } = require('electron')`
`2`	`2`	`const path = require('path')`
	`3`	`+const url = require('url')`
`3`	`4`	`const os = require('os')`
`4`	`5`
`5`	`6`	`const Menu = require('electron').Menu \|\| require('electron').remote.Menu`
`@@ -26,7 +27,7 @@ const template = [`
`26`	`27`	`label: 'New File',`
`27`	`28`	`accelerator: 'CmdOrCtrl+N',`
`28`	`29`	`click () {`
`29`		- exec('createWindow', {url: `file://${path.join(__dirname, `index.html?target=${path.join(getServerUrl(), '/new')}`)}`})
	`30`	+ exec('createWindow', {url: `file://${path.join(__dirname, `index.html?target=${url.resolve(getServerUrl(), '/new')}`)}`})
`30`	`31`	`}`
`31`	`32`	`},`
`32`	`33`	`{`