self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-12-02 22:49:09 +02:00
Code Issues Releases Activity

Various improvements

Browse Source
This commit is contained in:
Laurent Cozic
2017-07-15 23:47:11 +01:00
parent 472dee05ea
commit 22cb2fdfbe
11 changed files with 34 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ReactNativeClient/lib/components/screens/notes.js
View File

@@ -23,7 +23,6 @@ class NotesScreenComponent extends BaseScreenComponent {
dialogs.confirm(this, _('Delete notebook?')).then((ok) => {
if (!ok) return;
Folder.delete(folderId).then(() => {
return NotesScreenUtils.openDefaultNoteList();
}).catch((error) => {
@@ -51,6 +50,12 @@ class NotesScreenComponent extends BaseScreenComponent {
render() {
let folder = Folder.byId(this.props.folders, this.props.selectedFolderId);
if (!folder) {
NotesScreenUtils.openDefaultNoteList();
return null;
}
let title = folder ? folder.title : null;
const addFolderNoteButtons = folder.id != Folder.conflictFolderId();