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

fix: coerce executeJavaScript arguments (#24396)

Browse source
This commit is contained in:
Jeremy Rose 2020-07-08 16:13:50 -07:00 • committed by GitHub
parent 7dd365784d
commit 80a6adb597
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -204,11 +204,11 @@ const waitTillCanExecuteJavaScript = async (webContents: WebContentsInternal) =>
// WebContents has been loaded. // WebContents has been loaded.
WebContents.prototype.executeJavaScript = async function (code, hasUserGesture) { WebContents.prototype.executeJavaScript = async function (code, hasUserGesture) {
await waitTillCanExecuteJavaScript(this); await waitTillCanExecuteJavaScript(this);
return ipcMainUtils.invokeInWebContents(this, false, 'ELECTRON_INTERNAL_RENDERER_WEB_FRAME_METHOD', 'executeJavaScript', code, hasUserGesture); return ipcMainUtils.invokeInWebContents(this, false, 'ELECTRON_INTERNAL_RENDERER_WEB_FRAME_METHOD', 'executeJavaScript', String(code), !!hasUserGesture);
}; };
WebContents.prototype.executeJavaScriptInIsolatedWorld = async function (code, hasUserGesture) { WebContents.prototype.executeJavaScriptInIsolatedWorld = async function (worldId, code, hasUserGesture) {
await waitTillCanExecuteJavaScript(this); await waitTillCanExecuteJavaScript(this);
return ipcMainUtils.invokeInWebContents(this, false, 'ELECTRON_INTERNAL_RENDERER_WEB_FRAME_METHOD', 'executeJavaScriptInIsolatedWorld', code, hasUserGesture); return ipcMainUtils.invokeInWebContents(this, false, 'ELECTRON_INTERNAL_RENDERER_WEB_FRAME_METHOD', 'executeJavaScriptInIsolatedWorld', worldId, code, !!hasUserGesture);
}; };
// Translate the options of printToPDF. // Translate the options of printToPDF.