development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 13:00:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

unify file/folder picker path under one storage key

Browse source
This commit is contained in:
Benjamin Pasero 2015-11-19 18:53:33 +01:00
parent 48e3c937c8
commit 321ccd5a32
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/vs/workbench/electron-main/windows.ts
View file

@ -90,8 +90,7 @@ export class WindowsManager {
public static autoSaveDelayStorageKey = 'autoSaveDelay';
public static openedPathsListStorageKey = 'openedPathsList';
private static workingDirFilePickerStorageKey = 'filePickerWorkingDir';
private static workingDirFolderPickerStorageKey = 'folderPickerWorkingDir';
private static workingDirPickerStorageKey = 'pickerWorkingDir';
private static windowsStateStorageKey = 'windowsState';
private static themeStorageKey = 'theme'; // TODO@Ben this key is only used to find out if a window can be shown instantly because of light theme, remove once we have support for bg color
@ -777,8 +776,7 @@ export class WindowsManager {
}
private getFileOrFolderPaths(isFolder: boolean, clb: (paths: string[]) => void): void {
let storageKey = isFolder ? WindowsManager.workingDirFolderPickerStorageKey : WindowsManager.workingDirFilePickerStorageKey;
let workingDir = storage.getItem<string>(storageKey);
let workingDir = storage.getItem<string>(WindowsManager.workingDirPickerStorageKey);
let focussedWindow = this.getFocusedWindow();
let pickerProperties: string[];
@ -795,8 +793,8 @@ export class WindowsManager {
if (paths && paths.length > 0) {
// Remember path in storage for next time
let selectedPath = paths[0];
storage.setItem(storageKey, isFolder ? path.dirname(selectedPath) : selectedPath);
let pathToRemember = isFolder ? paths[0] : path.dirname(paths[0]);
storage.setItem(WindowsManager.workingDirPickerStorageKey, pathToRemember);
// Return
clb(paths);