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

Use ES6 template strings, fix docs and remove _ERROR_ IPC event

Browse source
This commit is contained in:
Samuel Attard 2016-10-24 18:19:45 +11:00 committed by Kevin Sawicki
parent 857e1da6a3
commit 9f18a6e65c
4 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -621,7 +621,7 @@ Injects CSS into the current web page.
* `result` Any * `result` Any
Returns `Promise` - A promise that resolves with the result of the executed code Returns `Promise` - A promise that resolves with the result of the executed code
or is rejected if the result of the code is a rejected promise or is rejected if the result of the code is a rejected promise.
Evaluates `code` in page. Evaluates `code` in page.

10
lib/browser/api/web-contents.js
View file

@ -112,12 +112,10 @@ const webFrameMethodsWithResult = [
const asyncWebFrameMethods = function (requestId, method, callback, ...args) { const asyncWebFrameMethods = function (requestId, method, callback, ...args) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
this.send('ELECTRON_INTERNAL_RENDERER_ASYNC_WEB_FRAME_METHOD', requestId, method, args) this.send('ELECTRON_INTERNAL_RENDERER_ASYNC_WEB_FRAME_METHOD', requestId, method, args)
ipcMain.once(`ELECTRON_INTERNAL_BROWSER_ASYNC_WEB_FRAME_RESPONSE_${requestId}`, function (event, result) { ipcMain.once(`ELECTRON_INTERNAL_BROWSER_ASYNC_WEB_FRAME_RESPONSE_${requestId}`, function (event, error, result) {
if (callback) callback(result) if (callback && !error) callback(result)
resolve(result) if (error) return reject(error)
}) return resolve(result)
ipcMain.once(`ELECTRON_INTERNAL_BROWSER_ASYNC_WEB_FRAME_ERROR_${requestId}`, (event, error) => {
reject(error)
}) })
}) })
} }

4
lib/renderer/init.js
View file

@ -41,10 +41,10 @@ electron.ipcRenderer.on('ELECTRON_INTERNAL_RENDERER_ASYNC_WEB_FRAME_METHOD', (ev
const responseCallback = function (result) { const responseCallback = function (result) {
Promise.resolve(result) Promise.resolve(result)
.then((resolvedResult) => { .then((resolvedResult) => {
event.sender.send(`ELECTRON_INTERNAL_BROWSER_ASYNC_WEB_FRAME_RESPONSE_${requestId}`, resolvedResult) event.sender.send(`ELECTRON_INTERNAL_BROWSER_ASYNC_WEB_FRAME_RESPONSE_${requestId}`, null, resolvedResult)
}) })
.catch((resolvedError) => { .catch((resolvedError) => {
event.sender.send(`ELECTRON_INTERNAL_BROWSER_ASYNC_WEB_FRAME_ERROR_${requestId}`, resolvedError) event.sender.send(`ELECTRON_INTERNAL_BROWSER_ASYNC_WEB_FRAME_RESPONSE_${requestId}`, resolvedError)
}) })
} }
args.push(responseCallback) args.push(responseCallback)

6
spec/api-browser-window-spec.js
View file

@ -1463,9 +1463,9 @@ describe('browser-window module', function () {
describe('window.webContents.executeJavaScript', function () { describe('window.webContents.executeJavaScript', function () {
var expected = 'hello, world!' var expected = 'hello, world!'
var expectedErrorMsg = 'woops!' var expectedErrorMsg = 'woops!'
var code = '(() => "' + expected + '")()' var code = `(() => "${expected}")()`
var asyncCode = '(() => new Promise(r => setTimeout(() => r("' + expected + '"), 500)))()' var asyncCode = `(() => new Promise(r => setTimeout(() => r("${expected}"), 500)))()`
var badAsyncCode = '(() => new Promise((r, e) => setTimeout(() => e("' + expectedErrorMsg + '"), 500)))()' var badAsyncCode = `(() => new Promise((r, e) => setTimeout(() => e("${expectedErrorMsg}"), 500)))()`
it('doesnt throw when no calback is provided', function () { it('doesnt throw when no calback is provided', function () {
const result = ipcRenderer.sendSync('executeJavaScript', code, false) const result = ipcRenderer.sendSync('executeJavaScript', code, false)