Fix some open file/folder issues

- "Open folder" now says "open folder" instead of "open file"
- "Open folder" won't allow you to open files
- "Open file" won't allow you to open directories

Fixes #249.
This commit is contained in:
Asher
2019-04-11 14:55:06 -05:00
parent 2785e2219a
commit 7047be859c
4 changed files with 80 additions and 13 deletions

View File

@@ -47,9 +47,9 @@ export class WindowsService implements IWindowsService {
private readonly window = new electron.BrowserWindow();
// Dialogs
public async pickFileFolderAndOpen(_options: INativeOpenDialogOptions): Promise<void> {
public async pickFileFolderAndOpen(options: INativeOpenDialogOptions): Promise<void> {
showOpenDialog({
...(_options.dialogOptions || {}),
...(options.dialogOptions || {}),
properties: {
openFile: true,
openDirectory: true,
@@ -66,9 +66,9 @@ export class WindowsService implements IWindowsService {
});
}
public async pickFileAndOpen(_options: INativeOpenDialogOptions): Promise<void> {
public async pickFileAndOpen(options: INativeOpenDialogOptions): Promise<void> {
showOpenDialog({
...(_options.dialogOptions || {}),
...(options.dialogOptions || {}),
properties: {
openFile: true,
},
@@ -84,9 +84,15 @@ export class WindowsService implements IWindowsService {
});
}
public async pickFolderAndOpen(_options: INativeOpenDialogOptions): Promise<void> {
public async pickFolderAndOpen(options: INativeOpenDialogOptions): Promise<void> {
if (!options.dialogOptions) {
options.dialogOptions = {};
}
if (!options.dialogOptions.title) {
options.dialogOptions.title = "Open Folder";
}
showOpenDialog({
...(_options.dialogOptions || {}),
...(options.dialogOptions || {}),
properties: {
openDirectory: true,
},
@@ -97,9 +103,9 @@ export class WindowsService implements IWindowsService {
});
}
public async pickWorkspaceAndOpen(_options: INativeOpenDialogOptions): Promise<void> {
public async pickWorkspaceAndOpen(options: INativeOpenDialogOptions): Promise<void> {
showOpenDialog({
...(_options.dialogOptions || {}),
...(options.dialogOptions || {}),
properties: {
openDirectory: true,
},