Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: reject the executeJavaScript promise when it fails to execute the script #18714

Merged
merged 4 commits into from Jun 13, 2019
Merged

fix: reject the executeJavaScript promise when it fails to execute the script #18714

merged 4 commits into from Jun 13, 2019

Conversation

trop[bot]
Copy link
Contributor

@trop trop bot commented Jun 10, 2019

Backport of #18635

See that PR for details.

Notes: .executeJavaScript will never leave a promise dangling now, scripts that fail to execute will correctly be rejected

MarshallOfSound and others added 3 commits June 10, 2019 17:09
@MarshallOfSound @electron-bot
fix: reject the executeJavaScript promise when it fails to execute th…
5e37eee 
…e script

Closes #9102
@MarshallOfSound @nornagon @electron-bot
Update atom/renderer/api/atom_api_web_frame.cc
037296b 
Co-Authored-By: Jeremy Apthorp <nornagon@nornagon.net>
@MarshallOfSound @nornagon @electron-bot
Update atom/renderer/api/atom_api_web_frame.cc
22096e1 
Co-Authored-By: Jeremy Apthorp <nornagon@nornagon.net>
@trop trop bot mentioned this pull request Jun 10, 2019
Merged
@electron-cation electron-cation bot added the new-pr 🌱 PR opened in the last 24 hours label Jun 10, 2019
@trop trop bot added 6-0-x backport This is a backport PR labels Jun 10, 2019
@electron-cation electron-cation bot removed the new-pr 🌱 PR opened in the last 24 hours label Jun 10, 2019
@codebytere codebytere force-pushed the trop/6-0-x-bp-fix-reject-the-executejavascript-promise-when-it-fails-to-execute-the-script-1560186540863 branch from a94b706 to 1507c78 Compare June 10, 2019 18:00
@codebytere codebytere mentioned this pull request Jun 10, 2019
Merged
3 tasks
@MarshallOfSound MarshallOfSound merged commit 33d860b into 6-0-x Jun 13, 2019
@release-clerk
Copy link

release-clerk bot commented Jun 13, 2019

Release Notes Persisted

.executeJavaScript will never leave a promise dangling now, scripts that fail to execute will correctly be rejected

@MarshallOfSound MarshallOfSound deleted the trop/6-0-x-bp-fix-reject-the-executejavascript-promise-when-it-fails-to-execute-the-script-1560186540863 branch June 13, 2019 23:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@codebytere codebytere codebytere approved these changes

Assignees
No one assigned
Labels
6-0-x backport This is a backport PR
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@codebytere @MarshallOfSound