deadcxap/liberama
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Поправки багов

Browse Source
This commit is contained in:
Book Pauk
2019-03-28 14:45:42 +07:00
parent f648bcda13
commit c29ffc3fcd
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
client/components/Reader/ServerStorage/ServerStorage.vue
View File

@@ -412,9 +412,11 @@ class ServerStorage extends Vue {
if (recentLastDiff.rev == 0) if (recentLastDiff.rev == 0)
recentLastDiff.data = {}; recentLastDiff.data = {};
this.oldRecentLastDiff = _.cloneDeep(recentLastDiff.data);
this.oldRecentLast = _.cloneDeep(recentLast.data);
recentLast.data = utils.applyObjDiff(recentLast.data, recentLastDiff.data); recentLast.data = utils.applyObjDiff(recentLast.data, recentLastDiff.data);
this.oldRecentLast = _.cloneDeep(recentLast.data);
await bookManager.setRecentLast(recentLast.data); await bookManager.setRecentLast(recentLast.data);
await bookManager.setRecentLastRev(recentLast.rev); await bookManager.setRecentLastRev(recentLast.rev);
await bookManager.setRecentLastDiffRev(recentLastDiff.rev); await bookManager.setRecentLastDiffRev(recentLastDiff.rev);
@@ -485,7 +487,7 @@ class ServerStorage extends Vue {
if (utils.isEmptyObjDiff(diff)) if (utils.isEmptyObjDiff(diff))
return; return;
if (JSON.stringify(recentLast) > JSON.stringify(diff)) { if (this.oldRecentLast.key == recentLast.key && JSON.stringify(recentLast) > JSON.stringify(diff)) {
await this.saveRecentLastDiff(diff, force); await this.saveRecentLastDiff(diff, force);
return; return;
} }
@@ -529,6 +531,7 @@ class ServerStorage extends Vue {
} else { } else {
this.oldRecentLast = _.cloneDeep(recentLast); this.oldRecentLast = _.cloneDeep(recentLast);
await bm.setRecentLastRev(lastRev + 1); await bm.setRecentLastRev(lastRev + 1);
await this.saveRecentLastDiff({}, true);
} }
} finally { } finally {
this.savingRecentLast = false; this.savingRecentLast = false;