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

Add failing spec for no callback

Browse source
This commit is contained in:
Kevin Sawicki 2017-03-06 10:49:23 -08:00
parent 095e79b043
commit 6fcb784f6e
2 changed files with 22 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
spec/static/main.js
View file

@ -193,16 +193,23 @@ app.on('ready', function () {
})
ipcMain.on('executeJavaScript', function (event, code, hasCallback) {
let promise
if (hasCallback) {
window.webContents.executeJavaScript(code, (result) => {
promise = window.webContents.executeJavaScript(code, (result) => {
window.webContents.send('executeJavaScript-response', result)
}).then((result) => {
window.webContents.send('executeJavaScript-promise-response', result)
}).catch((err) => {
window.webContents.send('executeJavaScript-promise-error', err)
})
} else {
window.webContents.executeJavaScript(code)
promise = window.webContents.executeJavaScript(code)
}
promise.then((result) => {
window.webContents.send('executeJavaScript-promise-response', result)
}).catch((error) => {
window.webContents.send('executeJavaScript-promise-error', error)
})
if (!hasCallback) {
event.returnValue = 'success'
}
})