self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-11-29 22:48:10 +02:00
Code Issues Releases Activity

Improved item list and implemented delete

Browse Source
This commit is contained in:
Laurent Cozic
2017-10-23 22:48:29 +01:00
parent 01d01b76cd
commit b89746f6d3
11 changed files with 265 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
ReactNativeClient/lib/reducer.js
View File

@@ -66,6 +66,20 @@ function updateOneTagOrFolder(state, action) {
return newState;
}
function defaultNotesParentType(state, exclusion) {
let newNotesParentType = null;
if (exclusion !== 'Folder' && state.selectedFolderId) {
newNotesParentType = 'Folder';
} else if (exclusion !== 'Tag' && state.selectedTagId) {
newNotesParentType = 'Tag';
} else if (exclusion !== 'Search' && state.selectedSearchId) {
newNotesParentType = 'Search';
}
return newNotesParentType;
}
const reducer = (state = defaultState, action) => {
let newState = state;
let historyGoingBack = false;
@@ -156,8 +170,12 @@ const reducer = (state = defaultState, action) => {
case 'FOLDERS_SELECT':
newState = Object.assign({}, state);
newState.selectedFolderId = action.folderId;
newState.notesParentType = 'Folder';
newState.selectedFolderId = action.id;
if (!action.id) {
newState.notesParentType = defaultNotesParentType(state, 'Folder');
} else {
newState.notesParentType = 'Folder';
}
break;
case 'SETTINGS_UPDATE_ALL':
@@ -264,8 +282,12 @@ const reducer = (state = defaultState, action) => {
case 'TAGS_SELECT':
newState = Object.assign({}, state);
newState.selectedTagId = action.tagId;
newState.notesParentType = 'Tag';
newState.selectedTagId = action.id;
if (!action.id) {
newState.notesParentType = defaultNotesParentType(state, 'Tag');
} else {
newState.notesParentType = 'Tag';
}
break;
case 'TAGS_UPDATE_ONE':
@@ -376,7 +398,7 @@ const reducer = (state = defaultState, action) => {
let foundIndex = -1;
for (let i = 0; i < state.searches.length; i++) {
if (state.searches[i].id === action.searchId) {
if (state.searches[i].id === action.id) {
foundIndex = i;
break;
}
@@ -393,8 +415,12 @@ const reducer = (state = defaultState, action) => {
case 'SEARCH_SELECT':
newState = Object.assign({}, state);
newState.selectedSearchId = action.searchId;
newState.notesParentType = 'Search';
newState.selectedSearchId = action.id;
if (!action.id) {
newState.notesParentType = defaultNotesParentType(state, 'Search');
} else {
newState.notesParentType = 'Search';
}
break;
case 'SET_APP_STATE':