mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix: handle asynchronous URL loading in bw proxy (#23776)

Browse source
This commit is contained in:
Shelley Vohr 2020-05-27 13:50:54 -07:00 committed by GitHub
parent ca6a415626
commit f78504515b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
docs/api/web-contents.md
View file

@ -907,10 +907,10 @@ Returns `String` - The URL of the current web page.
```javascript ```javascript
const { BrowserWindow } = require('electron') const { BrowserWindow } = require('electron')
let win = new BrowserWindow({ width: 800, height: 600 }) let win = new BrowserWindow({ width: 800, height: 600 })
win.loadURL('http://github.com') win.loadURL('http://github.com').then(() => {
const currentURL = win.webContents.getURL()
let currentURL = win.webContents.getURL() console.log(currentURL)
console.log(currentURL) })
``` ```
#### `contents.getTitle()` #### `contents.getTitle()`

6
lib/renderer/window-setup.ts
View file

@ -125,7 +125,11 @@ class LocationProxy {
} }
private getGuestURL (): URL | null { private getGuestURL (): URL | null {
const urlString = this._invokeWebContentsMethodSync('getURL') as string; const maybeURL = this._invokeWebContentsMethodSync('getURL') as string;
// When there's no previous frame the url will be blank, so accountfor that here
// to prevent url parsing errors on an empty string.
const urlString = maybeURL !== '' ? maybeURL : 'about:blank';
try { try {
return new URL(urlString); return new URL(urlString);
} catch (e) { } catch (e) {

2
spec-main/api-browser-window-spec.ts
View file

@ -4128,7 +4128,7 @@ describe('BrowserWindow module', () => {
window.postMessage({openedLocation}, '*') window.postMessage({openedLocation}, '*')
`); `);
const [, data] = await p; const [, data] = await p;
expect(data.pageContext.openedLocation).to.equal(''); expect(data.pageContext.openedLocation).to.equal('about:blank');
}); });
}); });