self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-24 10:27:10 +02:00
Code Issues Releases Activity

Disabled back button handling on note screen for now

Browse Source
This commit is contained in:
Laurent Cozic 2017-07-31 19:02:21 +00:00
parent bc2fa8932a
commit 192dac0ca4
2 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
ReactNativeClient/lib/components/screens/note.js
View File

@ -82,21 +82,24 @@ class NoteScreenComponent extends BaseScreenComponent {
this.saveButtonHasBeenShown_ = false;
this.backHandler = () => {
if (!this.state.note.id) {
return false;
}
// Disabled for now because it doesn't work consistently and proabably interfer with the backHandler
// on root.js. Handling of the back button should be in one single place for this to work well.
if (this.state.mode == 'edit') {
this.setState({
note: Object.assign({}, this.state.lastSavedNote),
mode: 'view',
});
return true;
}
// this.backHandler = () => {
// if (!this.state.note.id) {
// return false;
// }
return false;
};
// if (this.state.mode == 'edit') {
// this.setState({
// note: Object.assign({}, this.state.lastSavedNote),
// mode: 'view',
// });
// return true;
// }
// return false;
// };
}
isModified() {
@ -107,7 +110,7 @@ class NoteScreenComponent extends BaseScreenComponent {
}
async componentWillMount() {
BackHandler.addEventListener('hardwareBackPress', this.backHandler);
// BackHandler.addEventListener('hardwareBackPress', this.backHandler);
let note = null;
let mode = 'view';
@ -132,7 +135,7 @@ class NoteScreenComponent extends BaseScreenComponent {
}
componentWillUnmount() {
BackHandler.removeEventListener('hardwareBackPress', this.backHandler);
// BackHandler.removeEventListener('hardwareBackPress', this.backHandler);
}
noteComponent_change(propName, propValue) {

2
ReactNativeClient/lib/models/setting.js
View File

@ -318,7 +318,7 @@ Setting.metadata_ = {
600: _('%d minutes', 10),
1800: _('%d minutes', 30),
3600: _('%d hour', 1),
43200: _('%d hour', 12),
43200: _('%d hours', 12),
86400: _('%d hours', 24),
};
}},