self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-11-27 08:21:03 +02:00
Code Issues Releases Activity

handle saving notes and folders in a uniform way

Browse Source
This commit is contained in:
Laurent Cozic 2017-05-23 20:39:01 +00:00
parent a88e729812
commit c01d850b2d
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ReactNativeClient/src/components/screens/folder.js
View File

@ -4,6 +4,7 @@ import { connect } from 'react-redux'
import { Log } from 'src/log.js'
import { Folder } from 'src/models/folder.js'
import { ScreenHeader } from 'src/components/screen-header.js';
import { NoteFolderService } from 'src/services/note-folder-service.js';
class FolderScreenComponent extends React.Component {
@ -13,11 +14,19 @@ class FolderScreenComponent extends React.Component {
constructor() {
super();
this.state = { folder: Folder.newFolder() }
this.state = { folder: Folder.new() };
this.originalFolder = null;
}
componentWillMount() {
this.setState({ folder: this.props.folder });
if (!this.props.folderId) {
this.setState({ folder: Folder.new() });
} else {
Folder.load(this.props.folderId).then((folder) => {
this.originalFolder = Object.assign({}, folder);
this.setState({ folder: folder });
});
}
}
folderComponent_change = (propName, propValue) => {
@ -33,13 +42,9 @@ class FolderScreenComponent extends React.Component {
}
saveFolderButton_press = () => {
Folder.save(this.state.folder).then((folder) => {
this.props.dispatch({
type: 'FOLDERS_UPDATE_ONE',
folder: folder,
});
}).catch((error) => {
Log.warn('Cannot save folder', error);
NoteFolderService.save('folder', this.state.folder, this.originalFolder).then((folder) => {
this.originalFolder = Object.assign({}, folder);
this.setState({ folder: folder });
});
}
@ -58,7 +63,8 @@ class FolderScreenComponent extends React.Component {
const FolderScreen = connect(
(state) => {
return {
folder: state.selectedFolderId ? Folder.byId(state.folders, state.selectedFolderId) : Folder.newFolder(),
folderId: state.selectedFolderId,
//folder: state.selectedFolderId ? Folder.byId(state.folders, state.selectedFolderId) : Folder.newFolder(),
};
}
)(FolderScreenComponent)