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

Minor improvments

Browse Source
This commit is contained in:
Laurent Cozic
2018-10-30 00:17:50 +00:00
parent 7b85c33213
commit 990591cc80
5 changed files with 43 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ReactNativeClient/lib/synchronizer.js
View File

@ -248,7 +248,7 @@ class Synchronizer {
reason = "remote does not exist, and local is new and has never been synced";
} else {
// Note or item was modified after having been deleted remotely
// "itemConflict" if for all the items except the notes, which are dealt with in a special way
// "itemConflict" is for all the items except the notes, which are dealt with in a special way
action = local.type_ == BaseModel.TYPE_NOTE ? "noteConflict" : "itemConflict";
reason = "remote has been deleted, but local has changes";
}
@ -440,7 +440,7 @@ class Synchronizer {
// 3. DELTA
// ------------------------------------------------------------------------
// Loop through all the remote items, find those that
// have been updated, and apply the changes to local.
// have been created or updated, and apply the changes to local.
// ------------------------------------------------------------------------
if (syncSteps.indexOf("delta") >= 0) {
@ -525,6 +525,7 @@ class Synchronizer {
this.logger().warn('Rejected by target: ' + path + ': ' + error.message);
action = null;
} else {
error.message = 'On file ' + path + ': ' + error.message;
throw error;
}
}