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

webContents: fix executejavascript when called before page load

Browse source
This commit is contained in:
deepak1556 2016-04-28 01:54:08 +05:30
commit 4e6b148eaa
2 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -117,9 +117,11 @@ let wrapWebContents = function (webContents) {
hasUserGesture = false
}
if (this.getURL() && !this.isLoadingMainFrame()) {
return asyncWebFrameMethods.call(this, requestId, 'executeJavaScript', callback, code, hasUserGesture)
asyncWebFrameMethods.call(this, requestId, 'executeJavaScript', callback, code, hasUserGesture)
} else {
return this.once('did-finish-load', asyncWebFrameMethods.bind(this, requestId, 'executeJavaScript', callback, code, hasUserGesture))
this.once('did-finish-load', () => {
asyncWebFrameMethods.call(this, requestId, 'executeJavaScript', callback, code, hasUserGesture)
})
}
}