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

fix: set setter of window.location

Browse source
This commit is contained in:
Cheng Zhao 2018-12-04 16:22:03 +09:00
parent e80e3a53e9
commit fc4e10b6c0
2 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/renderer/window-setup.js
View file

@ -103,7 +103,17 @@ function LocationProxy (ipcRenderer, guestId) {
function BrowserWindowProxy (ipcRenderer, guestId) { function BrowserWindowProxy (ipcRenderer, guestId) {
this.closed = false this.closed = false
this.location = new LocationProxy(ipcRenderer, guestId)
const location = new LocationProxy(ipcRenderer, guestId)
defineProperty(this, 'location', {
get: function () {
return location
},
set: function (url) {
url = resolveURL(url)
return ipcRenderer.sendSync('ELECTRON_GUEST_WINDOW_MANAGER_WEB_CONTENTS_METHOD_SYNC', guestId, 'loadURL', url)
}
})
ipcRenderer.once(`ELECTRON_GUEST_WINDOW_MANAGER_WINDOW_CLOSED_${guestId}`, () => { ipcRenderer.once(`ELECTRON_GUEST_WINDOW_MANAGER_WINDOW_CLOSED_${guestId}`, () => {
removeProxy(guestId) removeProxy(guestId)

2
spec/chromium-spec.js
View file

@ -515,7 +515,7 @@ describe('chromium feature', () => {
} }
app.once('browser-window-created', (event, window) => { app.once('browser-window-created', (event, window) => {
window.webContents.once('did-finish-load', () => { window.webContents.once('did-finish-load', () => {
assert.strictEqual(b.location, targetURL) assert.strictEqual(b.location.href, targetURL)
b.close() b.close()
done() done()
}) })