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

Default hasUserGesture to false when null

Browse source
This commit is contained in:
Kevin Sawicki 2017-03-06 10:51:17 -08:00
parent 6fcb784f6e
commit 6240e30be1
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -115,8 +115,8 @@ const asyncWebFrameMethods = function (requestId, method, callback, ...args) {
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, error, result) { ipcMain.once(`ELECTRON_INTERNAL_BROWSER_ASYNC_WEB_FRAME_RESPONSE_${requestId}`, function (event, error, result) {
if (error == null) { if (error == null) {
resolve(result)
if (typeof callback === 'function') callback(result) if (typeof callback === 'function') callback(result)
resolve(result)
} else { } else {
reject(error) reject(error)
} }
@ -149,10 +149,17 @@ for (const method of webFrameMethodsWithResult) {
// WebContents has been loaded. // WebContents has been loaded.
WebContents.prototype.executeJavaScript = function (code, hasUserGesture, callback) { WebContents.prototype.executeJavaScript = function (code, hasUserGesture, callback) {
const requestId = getNextId() const requestId = getNextId()
if (typeof hasUserGesture === 'function') { if (typeof hasUserGesture === 'function') {
// Shift.
callback = hasUserGesture callback = hasUserGesture
hasUserGesture = null
}
if (hasUserGesture == null) {
hasUserGesture = false hasUserGesture = false
} }
if (this.getURL() && !this.isLoadingMainFrame()) { if (this.getURL() && !this.isLoadingMainFrame()) {
return asyncWebFrameMethods.call(this, requestId, 'executeJavaScript', callback, code, hasUserGesture) return asyncWebFrameMethods.call(this, requestId, 'executeJavaScript', callback, code, hasUserGesture)
} else { } else {