self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-01-11 18:24:43 +02:00
Code Issues Releases Activity

Fixed handling of current folder

Browse Source
This commit is contained in:
Laurent Cozic 2017-10-24 18:09:01 +00:00
parent 3f56404c25
commit 218405503d
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
CliClient/app/app.js
View File

@ -36,6 +36,11 @@ class Application {
this.showStackTraces_ = false;
this.gui_ = null;
this.eventEmitter_ = new EventEmitter();
// Note: this is basically a cache of state.selectedFolderId. It should *only*
// be derived from the state and not set directly since that would make the
// state and UI out of sync.
this.currentFolder_ = null;
}
gui() {
@ -68,9 +73,6 @@ class Application {
}
switchCurrentFolder(folder) {
this.currentFolder_ = folder;
Setting.setValue('activeFolderId', folder ? folder.id : '');
this.dispatch({
type: 'FOLDERS_SELECT',
id: folder ? folder.id : '',
@ -489,6 +491,7 @@ class Application {
if (action.type == 'FOLDERS_SELECT') {
Setting.setValue('activeFolderId', newState.selectedFolderId);
this.currentFolder_ = newState.selectedFolderId ? await Folder.load(newState.selectedFolderId) : null;
await this.refreshNotes(Folder.modelType(), newState.selectedFolderId);
}
@ -586,10 +589,14 @@ class Application {
setLocale(Setting.value('locale'));
let currentFolderId = Setting.value('activeFolderId');
this.currentFolder_ = null;
if (currentFolderId) this.currentFolder_ = await Folder.load(currentFolderId);
if (!this.currentFolder_) this.currentFolder_ = await Folder.defaultFolder();
Setting.setValue('activeFolderId', this.currentFolder_ ? this.currentFolder_.id : '');
let currentFolder = null;
if (currentFolderId) currentFolder = await Folder.load(currentFolderId);
if (!currentFolder) currentFolder = await Folder.defaultFolder();
Setting.setValue('activeFolderId', currentFolder ? currentFolder.id : '');
setInterval(() => {
this.logger().debug(Setting.value('activeFolderId'), this.store().getState().settings.activeFolderId, this.store().getState().selectedFolderId);
}, 1000);
// If we have some arguments left at this point, it's a command
// so execute it.

4
CliClient/app/gui/FolderListWidget.js
View File

@ -31,7 +31,9 @@ class FolderListWidget extends ListWidget {
output.push(_('Search:'));
output.push(item.title);
}
// output.push(item.id.substr(0, 5));
if (item && item.id) output.push(item.id.substr(0, 5));
return output.join(' ');
};
}