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

refactor: don't send ipcRenderer.sendSync() returnValue as an array (#26178)

Browse source
This commit is contained in:
Milan Burda 2020-10-28 16:48:20 +01:00 • committed by GitHub
parent 83747ad21c
commit 0c2e2bca92
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/browser/api/web-contents.ts
View file

@ -457,7 +457,7 @@ const addReplyInternalToEvent = (event: any) => {
const addReturnValueToEvent = (event: any) => { const addReturnValueToEvent = (event: any) => {
Object.defineProperty(event, 'returnValue', { Object.defineProperty(event, 'returnValue', {
set: (value) => event.sendReply([value]), set: (value) => event.sendReply(value),
get: () => {} get: () => {}
}); });
}; };

2
lib/renderer/api/ipc-renderer.ts
View file

@ -10,7 +10,7 @@ ipcRenderer.send = function (channel, ...args) {
}; };
ipcRenderer.sendSync = function (channel, ...args) { ipcRenderer.sendSync = function (channel, ...args) {
return ipc.sendSync(internal, channel, args)[0]; return ipc.sendSync(internal, channel, args);
}; };
ipcRenderer.sendToHost = function (channel, ...args) { ipcRenderer.sendToHost = function (channel, ...args) {

2
lib/renderer/ipc-renderer-internal.ts
View file

@ -10,7 +10,7 @@ ipcRendererInternal.send = function (channel, ...args) {
}; };
ipcRendererInternal.sendSync = function (channel, ...args) { ipcRendererInternal.sendSync = function (channel, ...args) {
return ipc.sendSync(internal, channel, args)[0]; return ipc.sendSync(internal, channel, args);
}; };
ipcRendererInternal.sendTo = function (webContentsId, channel, ...args) { ipcRendererInternal.sendTo = function (webContentsId, channel, ...args) {

2
spec-main/chromium-spec.ts
View file

@ -790,7 +790,7 @@ describe('chromium features', () => {
}); });
expect(await w.webContents.executeJavaScript(`(${function () { expect(await w.webContents.executeJavaScript(`(${function () {
const { ipc } = process._linkedBinding('electron_renderer_ipc'); const { ipc } = process._linkedBinding('electron_renderer_ipc');
return ipc.sendSync(true, 'GUEST_WINDOW_MANAGER_WINDOW_OPEN', ['', '', ''])[0]; return ipc.sendSync(true, 'GUEST_WINDOW_MANAGER_WINDOW_OPEN', ['', '', '']);
}})()`)).to.be.null(); }})()`)).to.be.null();
const exception = await uncaughtException; const exception = await uncaughtException;
expect(exception.message).to.match(/denied: expected native window\.open/); expect(exception.message).to.match(/denied: expected native window\.open/);