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

Merge pull request #9834 from shubham2892/input-type-file-treating-packaged-app-as-directory

Browse source 
Fix treat packaged app as directory
This commit is contained in:
Kevin Sawicki 2017-07-18 10:21:07 -07:00 committed by GitHub
commit 959231f766
4 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
atom/browser/ui/file_dialog.h
View file

@ -30,6 +30,7 @@ enum FileDialogProperty {
FILE_DIALOG_SHOW_HIDDEN_FILES = 1 << 4, FILE_DIALOG_SHOW_HIDDEN_FILES = 1 << 4,
FILE_DIALOG_PROMPT_TO_CREATE = 1 << 5, FILE_DIALOG_PROMPT_TO_CREATE = 1 << 5,
FILE_DIALOG_NO_RESOLVE_ALIASES = 1 << 6, FILE_DIALOG_NO_RESOLVE_ALIASES = 1 << 6,
FILE_DIALOG_TREAT_PACKAGE_APP_AS_DIRECTORY = 1 << 7,
}; };
typedef base::Callback<void( typedef base::Callback<void(

2
atom/browser/ui/file_dialog_mac.mm
View file

@ -103,6 +103,8 @@ void SetupDialogForProperties(NSOpenPanel* dialog, int properties) {
[dialog setShowsHiddenFiles:YES]; [dialog setShowsHiddenFiles:YES];
if (properties & FILE_DIALOG_NO_RESOLVE_ALIASES) if (properties & FILE_DIALOG_NO_RESOLVE_ALIASES)
[dialog setResolvesAliases:NO]; [dialog setResolvesAliases:NO];
if (properties & FILE_DIALOG_TREAT_PACKAGE_APP_AS_DIRECTORY)
[dialog setTreatsFilePackagesAsDirectories:YES];
} }
// Run modal dialog with parent window and return user's choice. // Run modal dialog with parent window and return user's choice.

2
docs/api/dialog.md
View file

@ -46,6 +46,8 @@ The `dialog` module has the following methods:
* `noResolveAliases` - Disable the automatic alias (symlink) path * `noResolveAliases` - Disable the automatic alias (symlink) path
resolution. Selected aliases will now return the alias path instead of resolution. Selected aliases will now return the alias path instead of
their target path. _macOS_ their target path. _macOS_
* `treatPackageAsDirectory` - Treat packages, such as `.app` folders,
as a directory instead of a file. _macOS_
* `message` String (optional) _macOS_ - Message to display above input * `message` String (optional) _macOS_ - Message to display above input
boxes. boxes.
* `callback` Function (optional) * `callback` Function (optional)

3
lib/browser/api/dialog.js
View file

@ -11,7 +11,8 @@ const fileDialogProperties = {
createDirectory: 1 << 3, createDirectory: 1 << 3,
showHiddenFiles: 1 << 4, showHiddenFiles: 1 << 4,
promptToCreate: 1 << 5, promptToCreate: 1 << 5,
noResolveAliases: 1 << 6 noResolveAliases: 1 << 6,
treatPackageAsDirectory: 1 << 7
} }
const messageBoxTypes = ['none', 'info', 'warning', 'error', 'question'] const messageBoxTypes = ['none', 'info', 'warning', 'error', 'question']