Browse Source

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

Milan Burda 4 years ago
parent
commit
0c2e2bca92

+ 1 - 1
lib/browser/api/web-contents.ts

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

+ 1 - 1
lib/renderer/api/ipc-renderer.ts

@@ -10,7 +10,7 @@ ipcRenderer.send = 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) {

+ 1 - 1
lib/renderer/ipc-renderer-internal.ts

@@ -10,7 +10,7 @@ ipcRendererInternal.send = 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) {

+ 1 - 1
spec-main/chromium-spec.ts

@@ -790,7 +790,7 @@ describe('chromium features', () => {
         });
         expect(await w.webContents.executeJavaScript(`(${function () {
           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();
         const exception = await uncaughtException;
         expect(exception.message).to.match(/denied: expected native window\.open/);