diff --git a/docs/api/browser/ipc-browser.md b/docs/api/browser/ipc-browser.md index 34ebda8a4dca..2edaa29463ae 100644 --- a/docs/api/browser/ipc-browser.md +++ b/docs/api/browser/ipc-browser.md @@ -18,7 +18,7 @@ Emitted when renderer sent a message to the browser. * `routingId` Integer Emitted when renderer sent a synchronous message to the browser. The receiver -should store the result in `event.result`. +should store the result in `event.returnValue`. **Note:** Due to the limitation of `EventEmitter`, returning value in the event handler has no effect, so we have to store the result by using the diff --git a/docs/api/renderer/ipc-renderer.md b/docs/api/renderer/ipc-renderer.md index cdeadf39f680..4076b93b395e 100644 --- a/docs/api/renderer/ipc-renderer.md +++ b/docs/api/renderer/ipc-renderer.md @@ -30,7 +30,7 @@ An example of sending synchronous message from renderer to browser: // In browser: var ipc = require('ipc'); ipc.on('browser-data-request', function(event, processId, routingId, message) { - event.result = 'THIS SOME DATA FROM THE BROWSER'; + event.returnValue = 'THIS SOME DATA FROM THE BROWSER'; }); ``` diff --git a/renderer/api/lib/ipc.coffee b/renderer/api/lib/ipc.coffee index 28b9a9692d04..88b8c1c41585 100644 --- a/renderer/api/lib/ipc.coffee +++ b/renderer/api/lib/ipc.coffee @@ -16,9 +16,11 @@ class Ipc extends EventEmitter ipc.send('ATOM_INTERNAL_MESSAGE', args...) sendSync: (args...) -> - ipc.sendSync('ATOM_INTERNAL_MESSAGE_SYNC', 'sync-message', args...).result + msg = ipc.sendSync('ATOM_INTERNAL_MESSAGE_SYNC', 'sync-message', args...) + msg.returnValue ? msg.result sendChannelSync: (args...) -> - ipc.sendSync('ATOM_INTERNAL_MESSAGE_SYNC', args...).result + msg = ipc.sendSync('ATOM_INTERNAL_MESSAGE_SYNC', args...) + msg.returnValue ? msg.result module.exports = new Ipc