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

Load resources in WebView and put todos on top

Browse Source
This commit is contained in:
Laurent Cozic
2017-07-26 19:36:16 +01:00
parent 76914d6c28
commit f80263ab71
10 changed files with 156 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,8 +26,7 @@ class NotesScreenComponent extends BaseScreenComponent {
}
async componentWillReceiveProps(newProps) {
if (newProps.notesOrder.orderBy != this.props.notesOrder.orderBy ||
newProps.notesOrder.orderByDir != this.props.notesOrder.orderByDir ||
if (newProps.notesOrder !== this.props.notesOrder ||
newProps.selectedFolderId != this.props.selectedFolderId ||
newProps.selectedTagId != this.props.selectedTagId ||
newProps.notesParentType != this.props.notesParentType) {
@ -39,8 +38,8 @@ class NotesScreenComponent extends BaseScreenComponent {
if (props === null) props = this.props;
let options = {
orderBy: props.notesOrder.orderBy,
orderByDir: props.notesOrder.orderByDir,
order: props.notesOrder,
uncompletedTodosOnTop: props.uncompletedTodosOnTop,
};
const parent = this.parentItem(props);
@ -153,6 +152,7 @@ const NotesScreen = connect(
notes: state.notes,
notesOrder: state.notesOrder,
notesSource: state.notesSource,
uncompletedTodosOnTop: state.settings.uncompletedTodosOnTop,
};
}
)(NotesScreenComponent)