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

All: Fixed tests and minor fixes

Browse Source
This commit is contained in:
Laurent Cozic 2017-12-31 15:23:05 +01:00
parent e19c26fdd1
commit 6d0f60d9a1
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ReactNativeClient/lib/components/screen-header.js
View File

@ -458,7 +458,7 @@ class ScreenHeaderComponent extends Component {
return (
<View style={this.styles().container} >
<View style={{flexDirection:'row'}}>
<View style={{flexDirection:'row', alignItems: 'center'}}>
{ sideMenuComp }
{ backButtonComp }
{ saveButton(this.styles(), () => { if (this.props.onSaveButtonPress) this.props.onSaveButtonPress() }, this.props.saveButtonDisabled === true, this.props.showSaveButton === true) }

2
ReactNativeClient/lib/onedrive-api.js
View File

@ -216,7 +216,7 @@ class OneDriveApi {
this.logger().info(error);
await time.sleep((i + 1) * 3);
continue;
} else if (error && error.error && error.error.code === 'resourceModified') {
} else if (error && (error.code === 'resourceModified' || (error.error && error.error.code === 'resourceModified'))) {
// NOTE: not tested, very hard to reproduce and non-informative error message, but can be repeated
// Error: ETag does not match current item's value

2
ReactNativeClient/lib/services/DecryptionWorker.js
View File

@ -1,9 +1,11 @@
const BaseItem = require('lib/models/BaseItem');
const { Logger } = require('lib/logger.js');
class DecryptionWorker {
constructor() {
this.state_ = 'idle';
this.logger_ = new Logger();
this.dispatch = (action) => {
//console.warn('DecryptionWorker.dispatch is not defined');