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.

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

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

Conversation

@trop
Copy link
Contributor

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 some commits Jun 5, 2019

Update atom/renderer/api/atom_api_web_frame.cc
Co-Authored-By: Jeremy Apthorp <nornagon@nornagon.net>
Update atom/renderer/api/atom_api_web_frame.cc
Co-Authored-By: Jeremy Apthorp <nornagon@nornagon.net>

@electron-cation electron-cation bot removed the new-pr 🌱 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 Jun 10, 2019

@codebytere codebytere referenced this pull request Jun 10, 2019

Merged

chore: fix duplicate error string #18713

3 of 3 tasks complete

@MarshallOfSound MarshallOfSound merged commit 33d860b into 6-0-x Jun 13, 2019

12 of 14 checks passed

electron-arm-testing Build #20190610.19 failed
Details
electron-arm64-testing Build #20190610.19 failed
Details
Artifact Comparison No Changes
Details
Semantic Pull Request ready to be squashed
Details
Valid Backport Valid Backport
Details
WIP Ready for review
Details
appveyor: win-ia32-testing AppVeyor build succeeded
Details
appveyor: win-ia32-testing-pr AppVeyor build succeeded
Details
appveyor: win-x64-testing AppVeyor build succeeded
Details
appveyor: win-x64-testing-pr AppVeyor build succeeded
Details
build-linux Workflow: build-linux
Details
build-mac Workflow: build-mac
Details
lint Workflow: lint
Details
release-notes Release notes found
@release-clerk

This comment has been minimized.

Copy link

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 Jun 13, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.