self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-06-15 23:00:36 +02:00
Code Issues Releases Activity

Various fixes

Browse Source
This commit is contained in:
Laurent Cozic
2017-07-30 21:51:18 +02:00
parent b81111743f
commit ad1fbba78d
9 changed files with 238 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ReactNativeClient/lib/synchronizer.js
View File

@ -154,7 +154,9 @@ class Synchronizer {
error.code = 'alreadyStarted';
throw error;
return;
}
}
this.state_ = 'in_progress';
this.onProgress_ = options.onProgress ? options.onProgress : function(o) {};
this.progressReport_ = { errors: [] };
@ -175,7 +177,6 @@ class Synchronizer {
let outputContext = Object.assign({}, lastContext);
this.state_ = 'in_progress';
this.dispatch({ type: 'SYNC_STARTED' });
@ -463,7 +464,6 @@ class Synchronizer {
this.cancelling_ = false;
}
this.state_ = 'idle';
this.progressReport_.completedTime = time.unixMs();
@ -475,6 +475,8 @@ class Synchronizer {
this.progressReport_ = {};
this.dispatch({ type: 'SYNC_COMPLETED' });
this.state_ = 'idle';
return outputContext;
}