replicateStorage: fix confict handling keep local

ceeeab4a · Vincent Bechu · a7ee771f · ceeeab4a
Commit ceeeab4a authored Dec 08, 2016 by Vincent Bechu
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

src/jio.storage/replicatestorage.js src/jio.storage/replicatestorage.js +4 -2

No files found.
--- a/src/jio.storage/replicatestorage.js
+++ b/src/jio.storage/replicatestorage.js
@@ -494,8 +494,10 @@
              use_bulk_get: use_bulk_get,
              conflict_force: (context._conflict_handling ===
                               CONFLICT_KEEP_REMOTE),
-              conflict_ignore: (context._conflict_handling ===
+              conflict_ignore: ((context._conflict_handling ===
-                                CONFLICT_CONTINUE),
+                                 CONFLICT_CONTINUE) ||
+                                (context._conflict_handling ===
+                                 CONFLICT_KEEP_LOCAL)),
              check_modification: context._check_remote_modification,
              check_creation: context._check_remote_creation,
              check_deletion: context._check_remote_deletion