1
0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-24 10:27:10 +02:00

Merge branch 'master' of github.com:laurent22/joplin

This commit is contained in:
Laurent Cozic 2019-04-04 08:14:36 +01:00
commit be2b2b7836

View File

@ -218,6 +218,7 @@ function changeSelectedFolder(state, action, options = null) {
if (newState.selectedFolderId === state.selectedFolderId && newState.notesParentType === state.notesParentType) return state; if (newState.selectedFolderId === state.selectedFolderId && newState.notesParentType === state.notesParentType) return state;
if (options.clearNoteHistory) newState.historyNotes = []; if (options.clearNoteHistory) newState.historyNotes = [];
if (options.clearSelectedNoteIds) newState.selectedNoteIds = [];
return newState; return newState;
} }
@ -348,7 +349,7 @@ const reducer = (state = defaultState, action) => {
case 'FOLDER_SELECT': case 'FOLDER_SELECT':
newState = changeSelectedFolder(state, action); newState = changeSelectedFolder(state, action, { clearSelectedNoteIds: true });
break; break;
case 'FOLDER_AND_NOTE_SELECT': case 'FOLDER_AND_NOTE_SELECT':