8000 feat: promisify dialog.showOpenDialog() by codebytere · Pull Request #16973 · electron/electron · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

feat: promisify dialog.showOpenDialog() #16973

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
Merged
merged 3 commits into from
Mar 5, 2019
Merged

feat: promisify dialog.showOpenDialog() #16973

merged 3 commits into from
Mar 5, 2019

Conversation

codebytere
Copy link
Member
@codebytere codebytere commented Feb 14, 2019 •
edited
Loading

Description of Change

Promisifies dialog.showOpenDialog().

cc @ckerr @MarshallOfSound @deepak1556

Checklist

Release Notes

Notes: Split dialog.showOpenDialog() into a synchronous version and a version that returns a Promise

@codebytere codebytere requested review from a team February 14, 2019 20:07
@codebytere codebytere changed the title [wip] feat: promisify dialog.showOpenDialog() feat: promisify dialog.showOpenDialog() Feb 14, 2019
@codebytere codebytere force-pushed the promisify-showopendialog branch from 4bcec77 to bb9cbc7 Compare February 14, 2019 23:36
@codebytere codebytere changed the title feat: promisify dialog.showOpenDialog() [wip] feat: promisify dialog.showOpenDialog() Feb 15, 2019
@codebytere codebytere added the semver/major incompatible API changes label Feb 15, 2019
@codebytere codebytere force-pushed the promisify-showopendialog branch 2 times, most recently from f0169e8 to 0cca779 Compare February 15, 2019 16:47
@codebytere codebytere changed the title [wip] feat: promisify dialog.showOpenDialog() feat: promisify dialog.showOpenDialog() Feb 15, 2019
@codebytere codebytere changed the title feat: promisify dialog.showOpenDialog() [wip] feat: promisify dialog.showOpenDialog() Feb 16, 2019
@codebytere codebytere force-pushed the promisify-showopendialog branch from 4fd58e0 to c056a03 Compare February 16, 2019 16:45
@codebytere codebytere changed the title [wip] feat: promisify dialog.showOpenDialog() feat: promisify dialog.showOpenDialog() Feb 16, 2019
@codebytere codebytere force-pushed the promisify-showopendialog branch from c056a03 to 10cc766 Compare February 19, 2019 13:44
@codebytere
Copy link
Member Author
codebytere commented Feb 19, 2019 •
edited
Loading

Needs rebase on #17050 once it's merged.

@codebytere codebytere force-pushed the promisify-showopendialog branch 2 times, most recently from d3f91d1 to 2bca51f Compare February 25, 2019 08:27
zcbenz
zcbenz suggested changes Feb 25, 2019
View reviewed changes
@zcbenz zcbenz mentioned this pull request Feb 25, 2019
Merged
6 tasks
@codebytere codebytere force-pushed the promisify-showopendialog branch from f517b0e to 271d772 Compare February 26, 2019 12:27
zcbenz
zcbenz reviewed Feb 26, 2019
View reviewed changes
@codebytere codebytere force-pushed the promisify-showopendialog branch 3 times, most recently from ac6dc6e to 6f4ba16 Compare February 27, 2019 09:01
@codebytere codebytere force-pushed the promisify-showopendialog branch from 6f4ba16 to 9d9098a Compare March 1, 2019 08:37
miniak
miniak requested changes Mar 3, 2019
View reviewed changes
Copy link
Contributor
@miniak miniak left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you please include this change as well a757e25?
it refactors the ELECTRON_INSPECTOR_SELECT_FILE IPC handler to use the promisified version of dialog.showOpenDialog()

zcbenz
zcbenz suggested changes Mar 3, 2019
View reviewed changes
@codebytere
Copy link
Member Author
codebytere commented Mar 4, 2019 •
edited
Loading

@miniak i'd rather that be a separate PR once this gets merged so they can be reviewed separately and not create scope creep

@codebytere codebytere force-pushed the promisify-showopendialog branch from 0efad7d to 674cb11 Compare March 4, 2019 06:31
@miniak
Copy link
Contributor
miniak commented Mar 4, 2019

@codebytere ok

miniak
miniak requested changes Mar 4, 2019
View reviewed changes
miniak
miniak requested changes Mar 4, 2019
View reviewed changes
miniak
miniak requested changes Mar 4, 2019
View reviewed changes
miniak
miniak requested changes Mar 4, 2019
View reviewed changes
Copy link
Contributor
@miniak miniak left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this fix needs to be included to avoid breaking devtools

diff --git a/lib/browser/chrome-devtools.js b/lib/browser/chrome-devtools.js
index f2db33344..b3aa84f0f 100644
--- a/lib/browser/chrome-devtools.js
+++ b/lib/browser/chrome-devtools.js
@@ -86,9 +86,9 @@ ipcMainUtils.handle('ELECTRON_INSPECTOR_SELECT_FILE', function (event) {
   return new Promise((resolve, reject) => {
     assertChromeDevTools(event.sender, 'window.UI.createFileSelectorElement()')
 
-    dialog.showOpenDialog({}, function (files) {
-      if (files) {
-        const path = files[0]
+    dialog.showOpenDialog({}, function (result) {
+      if (!result.canceled) {
+        const path = result.filePaths[0]
         fs.readFile(path, (error, data) => {
           if (error) {
             reject(error)

@codebytere codebytere merged commit e059851 into master Mar 5, 2019
@release-clerk
Copy link
release-clerk bot commented Mar 5, 2019

Release Notes Persisted

Split dialog.showOpenDialog() into a synchronous version and a version that returns a Promise

@codebytere codebytere deleted the promisify-showopendialog branch March 5, 2019 13:54
@miniak miniak mentioned this pull request Mar 5, 2019
Merged
3 tasks
kiku-jw pushed a commit to kiku-jw/electron that referenced this pull request May 16, 2019
@codebytere @kiku-jw
feat: promisify dialog.showOpenDialog() (electron#16973)
fe9a043 
* feat: promisify dialog.showOpenDialog()

* address feedback from review

* address feedback from review
briandk added a commit to briandk/transcriptase that referenced this pull request Oct 11, 2019
@briandk
Make promptUserToSelectFile synchronous
d62c660 
Ref: electron/electron#16973
@kuychaco kuychaco mentioned this pull request Jan 29, 2020
Merged
jtojnar added a commit to jtojnar/markdown-image-insertion that referenced this pull request Apr 14, 2021
@jtojnar
Fix for async dialog.showOpenDialog
af2909d 
Electron 6 used by Atom 1.54 splits the methods:
- electron/electron#17298
- electron/electron#16973

Fixes: #5
@bstein bstein mentioned this pull request Aug 3, 2022
Closed
36 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zcbenz zcbenz zcbenz approved these changes

@miniak miniak miniak approved these changes

Assignees
No one assigned
Labels
semver/major incompatible API changes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@codebytere @miniak @zcbenz
0