github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

webContents: fix executejavascript when called before page load

Browse Source
This commit is contained in:
deepak1556
2016-04-28 01:54:08 +05:30
parent 0fa92923da
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)
})
}
}

8
spec/api-browser-window-spec.js
View File

@@ -870,6 +870,14 @@ describe('browser-window module', function () {
})
w.loadURL(server.url)
})
it('executes after page load', function (done) {
w.webContents.executeJavaScript(code, function(result) {
assert.equal(result, expected)
done()
})
w.loadURL(server.url)
})
})
describe('deprecated options', function () {